diff --git a/options/custom/programs/firefox.nix b/options/custom/programs/firefox.nix
index a81862f..329ec10 100644
--- a/options/custom/programs/firefox.nix
+++ b/options/custom/programs/firefox.nix
@@ -549,10 +549,11 @@ in
       ".mozilla/firefox/default/chrome/firefox-gnome-theme".source = inputs.firefox-gnome-theme;
 
       # Imperative symlinks intended to be synced
-      "Downloads/stg".source = mkIf config.custom.full (
-        config.home-manager.users.${config.custom.username}.lib.file.mkOutOfStoreSymlink
-          "/home/myned/SYNC/common/config/extensions/Simple Tab Groups"
-      );
+      "Downloads/stg" = mkIf config.custom.full {
+        source =
+          config.home-manager.users.${config.custom.username}.lib.file.mkOutOfStoreSymlink
+            "/home/myned/SYNC/common/config/extensions/Simple Tab Groups";
+      };
 
       # Work around icon dissociation due to missing --name flag in actions
       # https://github.com/micheleg/dash-to-dock/issues/1968
diff --git a/options/custom/programs/gnome-shell.nix b/options/custom/programs/gnome-shell.nix
index a87472f..8244541 100644
--- a/options/custom/programs/gnome-shell.nix
+++ b/options/custom/programs/gnome-shell.nix
@@ -22,7 +22,6 @@ in
         with pkgs.gnomeExtensions;
         optionals config.custom.default [
           { package = appindicator; } # https://github.com/ubuntu/gnome-shell-extension-appindicator
-
         ]
         ++ optionals config.custom.minimal [
           { package = caffeine; } # https://github.com/eonpatapon/gnome-shell-extension-caffeine
@@ -30,8 +29,8 @@ in
           #// { package = dash2dock-lite; } # https://github.com/icedman/dash2dock-lite
           { package = gsconnect; } # https://github.com/GSConnect/gnome-shell-extension-gsconnect
           { package = just-perfection; } # https://gitlab.gnome.org/jrahmatzadeh/just-perfection
+          { package = rounded-window-corners-reborn; } # https://github.com/flexagoon/rounded-window-corners
           #// { package = user-themes; } # https://gitlab.gnome.org/GNOME/gnome-shell-extensions
-
         ]
         ++ optionals config.custom.full [
           #// { package = auto-move-windows; } # https://gitlab.gnome.org/GNOME/gnome-shell-extensions
@@ -44,17 +43,5 @@ in
           { package = tiling-assistant; } # https://github.com/Leleat/Tiling-Assistant
         ];
     };
-
-    #!! Installed to user directory until packaged into nixpkgs
-    # https://github.com/flexagoon/rounded-window-corners
-    # TODO: Use extension store version when published
-    # https://extensions.gnome.org/review/55303
-    home.file.".local/share/gnome-shell/extensions/rounded-window-corners@fxgn".source =
-      mkIf config.custom.full pkgs.fetchzip
-        {
-          stripRoot = false;
-          url = "https://extensions.gnome.org/review/download/55303.shell-extension.zip";
-          sha256 = "sha256-cg4/Y0irl5X2D2P/ncYJM0fRbeAgRSfBXmdRoVBY7jo=";
-        };
   };
 }
diff --git a/options/custom/settings/boot.nix b/options/custom/settings/boot.nix
index 8ccf2a6..2033a27 100644
--- a/options/custom/settings/boot.nix
+++ b/options/custom/settings/boot.nix
@@ -49,7 +49,7 @@ in
         systemd-boot = mkIf cfg.systemd-boot {
           enable = true;
           configurationLimit = 15;
-          consoleMode = cfg.console-mode;
+          consoleMode = mkIf (!isInt cfg.console-mode || cfg.console-mode <= 2) cfg.console-mode;
           editor = false; # Disable cmdline
 
           # HACK: consoleMode does not accept undocumented device modes (e.g. 3 4 5)
diff --git a/profiles/console/default.nix b/profiles/console/default.nix
index b97656c..1544ca9 100644
--- a/profiles/console/default.nix
+++ b/profiles/console/default.nix
@@ -33,7 +33,7 @@
       folders = lib.getAttrs [
         "SYNC/.ignore"
         "SYNC/game"
-      ] options.custom.syncthing.folders.default;
+      ] options.custom.services.syncthing.folders.default;
     };
 
     settings = {