diff --git a/base/absolution/configuration.nix b/base/absolution/configuration.nix
index c4e4e90..3cb50b9 100644
--- a/base/absolution/configuration.nix
+++ b/base/absolution/configuration.nix
@@ -23,6 +23,8 @@
 
   security.sudo.package = pkgs.sudo.override { withInsults = true; };
 
+  programs.steam.extraCompatPackages = with pkgs; [ proton-ge-rtsp-bin ];
+
   programs = {
     adb.enable = true;
     gamescope = {
diff --git a/base/apollo/configuration.nix b/base/apollo/configuration.nix
index c13fe1e..b5cffe2 100644
--- a/base/apollo/configuration.nix
+++ b/base/apollo/configuration.nix
@@ -21,6 +21,7 @@
   services.wivrn.enable = true;
   services.wivrn.openFirewall = true;
   services.wivrn.defaultRuntime = true;
+  programs.steam.extraCompatPackages = with pkgs; [ proton-ge-rtsp-bin ];
 
   powerManagement.cpuFreqGovernor = "performance";
   # Bootloader.
diff --git a/base/callisto/configuration.nix b/base/callisto/configuration.nix
index 1486764..0ccc9a7 100644
--- a/base/callisto/configuration.nix
+++ b/base/callisto/configuration.nix
@@ -2,7 +2,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ config, pkgs, inputs, ... }:
+{ config, pkgs, ... }:
 
 {
   imports =
@@ -86,10 +86,6 @@
     NetworkManager.requires = ["ModemManager.service"];
   };
 
-  programs.niri = {
-    enable = true;
-    package = inputs.niri.packages.${pkgs.stdenv.hostPlatform.system}.niri-unstable;
-  };
   services.tlp.enable = true;
   services.tlp.settings = {
     CPU_SCALING_GOVERNOR_ON_BAT = "ondemand";
diff --git a/base/callisto/keymap.kbd b/base/callisto/keymap.kbd
new file mode 100644
index 0000000..874a016
--- /dev/null
+++ b/base/callisto/keymap.kbd
@@ -0,0 +1,24 @@
+(defsrc
+  grv  1    2    3    4    5    6    7    8    9    0    -    =    bspc
+  tab  q    w    e    r    t    y    u    i    o    p    [    ]    \
+  caps a    s    d    f    g    h    j    k    l    ;    '    ret
+  lsft z    x    c    v    b    n    m    ,    .    /    rsft
+  lctl lmet lalt           spc            ralt rmet cmp  rctl
+)
+(deflayer qwerty
+  grv  1    2    3    4    5    6    7    8    9    0    -    =    bspc
+  tab  q    w    e    r    t    y    u    i    o    p    [    ]    \
+  @ext a    s    d    f    g    h    j    k    l    ;    '    ret
+  lsft z    x    c    v    b    n    m    ,    .    /    rsft
+  lctl lmet lalt           spc            ralt rmet cmp rctl
+)
+(defalias 
+  ext (layer-toggle extend)
+)
+(deflayer extend
+  grv  1    2    3    4    5    6    7    8    9    0    -    =    bspc
+  tab  q   up    e    ~    t    y    u    i    o    p    [    ]    \
+  caps left  down   right    f    g    h    j    k    l    ;    '    ret
+  lsft z    x    c    v    b    n    m    ,    .    /    rsft
+  lctl lmet KeyPreviousSong           KeyPlayPause            KeyNextSong rmet cmp rctl
+)
diff --git a/base/overrides.nix b/base/overrides.nix
index 4eb63e7..89ee086 100644
--- a/base/overrides.nix
+++ b/base/overrides.nix
@@ -59,7 +59,6 @@
     ] ++ config.fonts.packages;
     extraCompatPackages = with pkgs; [
       steamtinkerlaunch
-      proton-ge-rtsp-bin
       proton-ge-bin
     ];
     remotePlay.openFirewall = true; # Open ports in the fire>
diff --git a/flake.nix b/flake.nix
index 9a8d3ec..c4f0c40 100644
--- a/flake.nix
+++ b/flake.nix
@@ -109,7 +109,7 @@
     nixosConfigurations."hassie" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       modules = [
-        ./base/Katara
+        ./base/hassie
         home-manager.nixosModules.home-manager {
           #imports = [ inputs.nix-index-database.hmModules.nix-index ];
           home-manager.backupFileExtension = "hm-backup";
@@ -118,6 +118,7 @@
             vars = {
               isNixOS = true;
               isTough = true;
+              useSyncthing = false;
               class = "laptop";
               user = "alyx"; #cursed way of setting username
             };
@@ -137,6 +138,7 @@
             inherit inputs;
             vars = {
               isNixOS = true;
+              isTough = true;
               class = "lowspec";
               user = "maya";
               useSyncthing = true;
@@ -151,7 +153,7 @@
     nixosConfigurations."patio" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       modules = [
-        ./base/Ishima
+        ./base/patio
         nixpkgs-xr.nixosModules.nixpkgs-xr
         jovian.nixosModules.jovian
         home-manager.nixosModules.home-manager {
@@ -162,6 +164,7 @@
             vars = {
               isNixOS = true;
               isTough = false;
+              useSyncthing = false;
               class = "handheld";
               user = "alyx"; #cursed way of setting username
             };
@@ -175,7 +178,7 @@
     nixosConfigurations."umbriel" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       modules = [
-        ./base/Umbriel
+        ./base/umbriel
         home-manager.nixosModules.home-manager {
           #imports = [ inputs.nix-index-database.hmModules.nix-index ];
           home-manager.backupFileExtension = "hm-backup";
@@ -184,6 +187,7 @@
             vars = {
               isNixOS = true;
               isTough = false;
+              useSyncthing = false;
               class = "laptop";
               user = "alyx"; #cursed way of setting username
             };
diff --git a/home/niri.nix b/home/niri.nix
index a343202..3615956 100644
--- a/home/niri.nix
+++ b/home/niri.nix
@@ -2,6 +2,10 @@
   xdg.portal = {
     enable = true;
     config.niri = {
+      default = ["gnome" "gtk"];
+      "org.freedesktop.impl.portal.Access" = [ "gtk" ];
+      "org.freedesktop.impl.portal.Notification" = [ "gtk" ];
+      "org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ];
       "org.freedesktop.impl.portal.FileChooser" = [ "gtk" ];
     };
     extraPortals = with pkgs; [