diff --git a/home-manager/modules/de2u.nix b/home-manager/modules/de2u.nix
index b24ee7b..5460763 100644
--- a/home-manager/modules/de2u.nix
+++ b/home-manager/modules/de2u.nix
@@ -78,6 +78,7 @@ in {
       gnomeExtensions.sound-output-device-chooser
       gnomeExtensions.bluetooth-quick-connect
       gnomeExtensions.burn-my-windows
+      gnomeExtensions.forge
     ];
 
     systemd.user.sessionVariables = {
@@ -178,15 +179,36 @@ in {
     };
 
     dconf.settings = with lib.hm.gvariant; {
+      "org/gnome/shell/extensions/forge" = {
+        stacked-tiling-mode-enabled = false;
+        tabbed-tiling-mode-enabled = false;
+        window-gap-hidden-on-single = true;
+      };
+      "org/gnome/shell/extensions/forge/keybindings" = {
+        window-focus-down = ["<Super>j" "<Super>Down"];
+        window-focus-left = ["<Super>h" "<Super>Left"];
+        window-focus-right = ["<Super>l" "<Super>Right"];
+        window-focus-up = ["<Super>k" "<Super>Up"];
+
+        window-move-down = ["<Shift><Super>j" "<Shift><Super>Down"];
+        window-move-left = ["<Shift><Super>h" "<Shift><Super>Left"];
+        window-move-right = ["<Shift><Super>l" "<Shift><Super>Right"];
+        window-move-up = ["<Shift><Super>k" "<Shift><Super>Up"];
+
+        window-swap-down = ["<Ctrl><Super>j" "<Ctrl><Super>Down"];
+        window-swap-left = ["<Ctrl><Super>h" "<Ctrl><Super>Left"];
+        window-swap-right = ["<Ctrl><Super>l" "<Ctrl><Super>Right"];
+        window-swap-up = ["<Ctrl><Super>k" "<Ctrl><Super>Up"];
+      };
       "org/gnome/desktop/interface" = {
         enable-hot-corners = !cfg.tiling;
         show-battery-percentage = true;
       };
-      "org/gnome/shell/extensions/pop-shell" = {
-        tile-by-default = cfg.tiling;
-        show-title = !cfg.tiling;
-        active-hint = false;
-      };
+      # "org/gnome/shell/extensions/pop-shell" = {
+      #   tile-by-default = cfg.tiling;
+      #   show-title = !cfg.tiling;
+      #   active-hint = false;
+      # };
       "org/gnome/shell/extensions/improved-workspace-indicator" = {
         panel-position = "left";
       };
@@ -218,7 +240,7 @@ in {
         disable-user-extensions = false;
         disabled-extensions = [""];
         enabled-extensions = [
-          "pop-shell@system76.com"
+          # "pop-shell@system76.com"
           "rrc@ogarcia.me"
           "native-window-placement@gnome-shell-extensions.gcampax.github.com"
           "user-theme@gnome-shell-extensions.gcampax.github.com"
@@ -237,6 +259,7 @@ in {
           "sound-output-device-chooser@kgshank.net"
           # "blur-my-shell@aunetx"
           # "burn-my-windows@schneegans.github.com"
+          "forge@jmmaranan.com"
         ];
       };
       "org/gnome/desktop/peripherals/touchpad" = {
@@ -319,6 +342,7 @@ in {
           switch-to-workspace-down = ["<Primary><Super>Down" "<Primary><Super>j"];
           switch-to-workspace-up = ["<Primary><Super>Up" "<Primary><Super>k"];
           toggle-maximized = ["<Super>m"];
+          toggle-fullscreen = ["<Super>f"];
           close = ["<Super>q"];
           cycle-windows = [""];
           panel-run-dialog = ["<Super>d"];
@@ -326,6 +350,7 @@ in {
           move-to-workspace-left = [""];
           switch-to-workspace-right = [""];
           switch-to-workspace-left = [""];
+          toggle-on-all-workspaces = ["<Super>a"];
 
           # And deal with the remaining alt keys, screw alt keys
           cycle-windows-backward = [""];
@@ -340,7 +365,7 @@ in {
           cycle-group-backward = [""];
           switch-group = [""];
           switch-group-backward = [""];
-          begin-resize = [""];
+          begin-resize = ["<Super>r"];
           begin-move = [""];
         };
       "org/gnome/mutter/keybindings" = {
@@ -353,6 +378,7 @@ in {
       "org/gnome/shell/keybindings" =
         lib.listToAttrs (map (n: lib.nameValuePair "switch-to-application-${toString n}" [""]) (lib.range 1 9))
         // {
+          toggle-application-view = [""];
           open-application-menu = [""];
           toggle-message-tray = ["<Super>v"];
           toggle-overview = [""];
@@ -366,7 +392,7 @@ in {
         volume-up = ["<Super>equal"];
 
         screensaver = ["<Super>Escape"];
-        home = ["<Super>f"];
+        home = [""];
         email = ["<Super>e"];
         www = ["<Super>b"];
 
diff --git a/modules/de2.nix b/modules/de2.nix
index 913108b..904aa09 100644
--- a/modules/de2.nix
+++ b/modules/de2.nix
@@ -10,6 +10,12 @@ in {
   options.de2.enable = mkEnableOption "Enable de2 system stuff";
 
   config = mkIf cfg.enable {
+    xdg.portal.enable = lib.mkDefault true;
+    xdg.portal.extraPortals = lib.mkDefault (with pkgs; [
+      xdg-desktop-portal-gnome
+      xdg-desktop-portal-gtk
+    ]);
+
     environment.gnome.excludePackages = with pkgs; [
       gnome.gnome-music
       gnome.epiphany