diff --git a/hosts/common/home.nix b/hosts/common/home.nix
index 5a2380b..4561653 100644
--- a/hosts/common/home.nix
+++ b/hosts/common/home.nix
@@ -50,6 +50,7 @@ in
       obsidian
       beeper
       bitwarden-desktop
+      jellyfin-desktop
       kitty # Terminal emulator but needs a GUI
 
       # Go
@@ -63,7 +64,6 @@ in
 
       # C/C++
       clang-tools # The main compiler
-      cmake
       vcpkg # The package manager
 
       # Python
diff --git a/hosts/framework/configuration.nix b/hosts/framework/configuration.nix
index 21cbc46..0e60d47 100644
--- a/hosts/framework/configuration.nix
+++ b/hosts/framework/configuration.nix
@@ -13,11 +13,11 @@
   };
 
   # Flatpak
-  services = {
-    flatpak = {
-      enable = true;
-    };
-  };
+  #services = {
+  #  flatpak = {
+  #    enable = true;
+  #  };
+  #};
 
   # Todo -> Display server for all nixos machines (lightdm or smth else)
   
diff --git a/hosts/framework/modules.nix b/hosts/framework/modules.nix
index 9bf4297..3834a2f 100644
--- a/hosts/framework/modules.nix
+++ b/hosts/framework/modules.nix
@@ -11,7 +11,7 @@ in
     modules.nixos.gaming.amd
     modules.nixos.gaming.starCitizen
     modules.nixos.gaming.steam
-    #modules.nixos.gaming.vr
+    modules.nixos.gaming.vr
     modules.common.spotify
   ];
 }
diff --git a/modules/home-manager/Hyprland/hyprland.nix b/modules/home-manager/Hyprland/hyprland.nix
index 14993ec..5725237 100644
--- a/modules/home-manager/Hyprland/hyprland.nix
+++ b/modules/home-manager/Hyprland/hyprland.nix
@@ -26,7 +26,7 @@ in
       "$launcher2"  = "hyprlauncher";
       "fileManager" = "dolphin";
       "$browser"    = "zen";
-      "$screenShot" = "hyprshot -m region";
+      "$screenShot" = "hyprshot -m region -o ~/Pictures/Screenshots";
       # Todo : Add a notification daemon
 
       exec-once = [
@@ -41,6 +41,9 @@ in
 	      numlock_by_default = true;
 	      accel_profile = "flat";
 	      follow_mouse = "1";
+        touchpad = {
+          disable_while_typing = false;
+        };
       };
 
       # Monitor config
diff --git a/modules/nixos/bootloader.nix b/modules/nixos/bootloader.nix
index d9f069d..4c3520d 100644
--- a/modules/nixos/bootloader.nix
+++ b/modules/nixos/bootloader.nix
@@ -15,5 +15,6 @@
        "fs.file-max" = 524288;
       };
     };
-  };
+  }; #End of "boot"
+# EOF
 }
diff --git a/modules/nixos/gaming/vr.nix b/modules/nixos/gaming/vr.nix
index 45bd36f..25ef204 100644
--- a/modules/nixos/gaming/vr.nix
+++ b/modules/nixos/gaming/vr.nix
@@ -1,7 +1,20 @@
 {pkgs, ...}:
 
 {
-  environment.systemPackages = with pkgs; [ alvr ];
+  environment.systemPackages = with pkgs; [ wivrn ];
+
+  services.avahi = {
+    enable = true;
+    publish = {
+      enable = true;
+      userServices = true;
+    };
+  };
+
+  networking.firewall = {
+    allowedTCPPorts = [ 9757 ];
+    allowedUDPPorts = [ 9757 ];
+  };
 
 # EOF
 }