diff --git a/home_manager/modules/kitty.nix b/home_manager/modules/kitty.nix
index a26e960..82d806e 100644
--- a/home_manager/modules/kitty.nix
+++ b/home_manager/modules/kitty.nix
@@ -37,6 +37,7 @@ in
     keybindings = {
       "ctrl+shift+t" = "new_tab_with_cwd";
       "ctrl+shift+enter" = "new_window_with_cwd";
+      "ctrl+shift+n" = "new_os_window_with_cwd";
     };
     font = pkgs.rice.font.monospace;
   };
diff --git a/home_manager/odin.nix b/home_manager/odin.nix
index 3d0b940..a042a04 100644
--- a/home_manager/odin.nix
+++ b/home_manager/odin.nix
@@ -2,55 +2,66 @@
 {
   home = {
     packages = with pkgs; [
-      # pulseaudio
-      easyeffects
-      tex2nix
-
-      kubectl
-      docker-compose
-      docker-machine
-
       arandr
       ark
       authy
       bitwarden
+      btop
       catgirl # IRC
       cava
       discord
+      docker-compose
+      docker-machine
       droidcam
+      easyeffects
+      # electrum
+      # element-desktop
       # element-desktop # matrix client
       # evolution
+      evolution
+      file
       filelight
       # firefox
+      freecad
       gallery-dl
       # gnome.dconf-editor
       # gnome.eog
       # gnome.evince
-      gnome.geary
-      gnome.gnome-calendar
       # gnomeExtensions.appindicator
       # gnomeExtensions.caffeine
       # gnomeExtensions.dash-to-dock
+      # # gnomeExtensions.dynamic-panel-transparency
       # gnomeExtensions.dynamic-panel-transparency
       # gnomeExtensions.gtile
       # gnomeExtensions.just-perfection
       # gnomeExtensions.vitals
       # gnome.file-roller
+      gnome.geary
+      gnome.gnome-calendar
       # gnome.gnome-screenshot
       # gnome.gnome-sound-recorder
+      gnome.gnome-sound-recorder
       # gnome.gnome-sudoku
+      gnome.gnome-sudoku
       # gnome.gnome-system-monitor
       # gnome.gnome-tweaks
       # gnome.nautilus
       # gnome.quadrapassel
       # gnome.seahorse
       # gnome.sushi
-      google-chrome
+      (google-chrome.override { commandLineArgs = [ "--password-store=gnome" ]; })
       gucharmap
+      handbrake
+      htop
       httpie
       # hyperspace-cli
       inkscape
       jetbrains.datagrip
+      kcolorchooser
+      kdiff3
+      # keepassxc
+      kgpg
+      # kid3 # tag mp3
       kmail
       kompare
       kontact
@@ -59,18 +70,11 @@
       ksystemlog
       kubectl
       lutris
-      kcolorchooser
-      kompare
-      korganizer
-      # keepassxc
-      kgpg
-      # kid3 # tag mp3
-      krita
-      ksystemlog
-      lutris
       meld
+      minecraft
       mmv-go
       mpv
+      mycrypto
       neofetch
       nixos-option
       nix-prefetch-scripts
@@ -83,14 +87,20 @@
       pcmanfm
       pentablet-driver
       procps
+      # pulseaudio
+      retroarchFull
       ripgrep
       skypeforlinux
+      # slack
       spotify
-      unstable.tdesktop
       teams
+      tex2nix
       tracker
       transmission-gtk
       unrar
+      # (unstable.blender.override { cudaSupport = true; })
+      unstable.tdesktop
+      unstable.zotero
       unzip
       virt-manager
       wget
@@ -101,10 +111,11 @@
       yq
       zip
       zoom-us
-      unstable.zotero
     ];
   };
 
+  services = { gnome-keyring.enable = true; };
+
   imports = [
     ./basic_env.nix
 
@@ -117,8 +128,8 @@
     ./modules/rust.nix
 
     ./modules/alacritty.nix
-    # ./modules/bspwm.nix
-    # ./modules/dunst.nix
+    ./modules/bspwm.nix
+    ./modules/dunst.nix
     # ./modules/grobi.nix
     ./modules/gtk_theme.nix
     ./modules/joystickwake.nix
@@ -132,19 +143,19 @@
     ./modules/obs-studio.nix
     ./modules/office.nix
     ./modules/onedrive.nix
-    # ./modules/picom.nix
-    # ./modules/polybar.nix
+    ./modules/picom.nix
+    ./modules/polybar.nix
     ./modules/pro_audio.nix
     # ./modules/pycharm.nix
     ./modules/rofimoji.nix
     ./modules/rofi.nix
-    # ./modules/screen_locker.nix
+    ./modules/screen_locker.nix
     # ./modules/security.nix
-    # ./modules/sxhkd.nix
+    ./modules/sxhkd.nix
     ./modules/syncthing.nix
     ./modules/terminator.nix
-    # ./modules/update_background.nix
+    ./modules/update_background.nix
     ./modules/webapp.nix
-    # ./modules/xidlehook.nix
+    ./modules/xidlehook.nix
   ];
 }
diff --git a/home_manager/thor.nix b/home_manager/thor.nix
index 96c272a..b7513c3 100644
--- a/home_manager/thor.nix
+++ b/home_manager/thor.nix
@@ -145,7 +145,7 @@
     ./modules/alacritty.nix
     ./modules/autorandr.nix
     ./modules/bspwm.nix
-    # ./modules/dunst.nix
+    ./modules/dunst.nix
     # ./modules/grobi.nix
     ./modules/gtk_theme.nix
     ./modules/joystickwake.nix
diff --git a/odin/common_configuration.nix b/odin/common_configuration.nix
index 456e0ae..37af0a8 100644
--- a/odin/common_configuration.nix
+++ b/odin/common_configuration.nix
@@ -65,7 +65,7 @@
       enable = true;
       runUsingSystemd = true;
     };
-    # windowManager.bspwm.enable = true;
+    windowManager.bspwm.enable = true;
 
     # Configure keymap in X11
     layout = "it";
@@ -208,7 +208,7 @@
     kvmgt.enable = true;
     libvirtd.enable = true;
     podman.enable = true;
-    virtualbox.host.enable = true;
+    # virtualbox.host.enable = true;
   };
 
   # Allow completion for system packages
diff --git a/odin/configuration-intel.nix b/odin/configuration-intel.nix
index 240bdaf..9504ec0 100644
--- a/odin/configuration-intel.nix
+++ b/odin/configuration-intel.nix
@@ -18,9 +18,14 @@
   ];
 
   services.xserver = {
-    displayManager.gdm = {
+    # displayManager.gdm = {
+    #   enable = true;
+    #   wayland = true;
+    # };
+    displayManager.sddm = {
       enable = true;
-      wayland = true;
+      autoNumlock = true;
+      # enableHidpi = true;
     };
   };