diff --git a/modules/nixos/workflows/a-happy-gnome/config/dconf/db/a-happy-gnome-conf.d/10-desktop.conf b/modules/nixos/workflows/a-happy-gnome/config/dconf/db/a-happy-gnome-conf.d/10-desktop.conf
index ec20f146..79cc6747 100644
--- a/modules/nixos/workflows/a-happy-gnome/config/dconf/db/a-happy-gnome-conf.d/10-desktop.conf
+++ b/modules/nixos/workflows/a-happy-gnome/config/dconf/db/a-happy-gnome-conf.d/10-desktop.conf
@@ -9,7 +9,7 @@ color-scheme = 'prefer-dark'
 current-workspace-only = true
 
 # Input sources that are expected to be installed in the theme.
-[org/gnome/desktop/input-sources/sources]
+[org/gnome/desktop/input-sources]
 sources = [ ('xkb', 'us'), ('ibus', 'mozc-jp'), ('ibus', 'rime'), ('ibus', 'hangul'), ('ibus', 'table:mathwriter-ibus') ]
 
 [org/gnome/desktop/notifications]
diff --git a/modules/nixos/workflows/a-happy-gnome/config/dconf/db/a-happy-gnome-conf.d/30-shell-extensions.conf b/modules/nixos/workflows/a-happy-gnome/config/dconf/db/a-happy-gnome-conf.d/30-shell-extensions.conf
index f9329145..4435b9c7 100644
--- a/modules/nixos/workflows/a-happy-gnome/config/dconf/db/a-happy-gnome-conf.d/30-shell-extensions.conf
+++ b/modules/nixos/workflows/a-happy-gnome/config/dconf/db/a-happy-gnome-conf.d/30-shell-extensions.conf
@@ -64,13 +64,19 @@ folder-order-position = 'start'
 
 # PaperWM for an alternative shell.
 [org/gnome/shell/extensions/paperwm]
-horizontal-margin = 5
-vertical-margin = 5
-vertical-margin-bottom = 5
-window-gap = 5
-override-hot-corner = false
-cycle-width-steps = [0.38195, 0.5, 0.61804, 0.75]
 cycle-height-steps = [0.38195, 0.5, 0.61804, 0.75]
+cycle-width-steps = [0.38195, 0.5, 0.61804, 0.75]
+disable-topbar-styling = true
+horizontal-margin = 0
+override-hot-corner = false
+restore-workspaces-only-on-primary = true
+show-focus-mode-icon = false
+show-window-position-bar = false
+show-workspace-indicator = false
+use-default-background = true
+vertical-margin = 0
+vertical-margin-bottom = 0
+window-gap = 10
 
 # The shortcuts are closely tied to my shell keybindings to make it easier to follow.
 [org/gnome/shell/extensions/paperwm/keybindings]
@@ -110,3 +116,13 @@ switch-up-workspace = ['<Super><Control>k', '<Super><Control>Up']
 switch-down-workspace = ['<Super><Control>j', '<Super><Control>Down']
 move-up-workspace = ['<Super><Control><Shift>k', '<Super><Control><Shift>Up']
 move-down-workspace = ['<Super><Control><Shift>j', '<Super><Control><Shift>Down']
+
+# There's not much point to these as it is pretty rare.
+switch-monitor-above = @as []
+switch-monitor-below = @as []
+switch-monitor-left = @as []
+switch-monitor-right = @as []
+move-monitor-above = @as []
+move-monitor-below = @as []
+move-monitor-left = @as []
+move-monitor-right = @as []
diff --git a/modules/nixos/workflows/a-happy-gnome/default.nix b/modules/nixos/workflows/a-happy-gnome/default.nix
index 67ff894f..4ae72243 100644
--- a/modules/nixos/workflows/a-happy-gnome/default.nix
+++ b/modules/nixos/workflows/a-happy-gnome/default.nix
@@ -35,11 +35,11 @@ in
         burn-my-windows
         caffeine
         desktop-cube
+        fly-pie
         gsconnect
         just-perfection
         kimpanel
         paperwm
-        pop-shell
         runcat
       ];
       example = lib.literalExpression ''