diff --git a/dotfiles/config/picom.conf b/dotfiles/config/picom.conf
index 82f8ba1f..8f9eb809 100644
--- a/dotfiles/config/picom.conf
+++ b/dotfiles/config/picom.conf
@@ -158,6 +158,7 @@ fade-exclude = [ ];
 #################################
 
 corner-radius: 10
+rounded-corners-exclude = [ "class_g = 'xmonad'" ];
 
 #################################
 #
diff --git a/dotfiles/config/taffybar/taffybar b/dotfiles/config/taffybar/taffybar
index dd3d0555..437f7307 160000
--- a/dotfiles/config/taffybar/taffybar
+++ b/dotfiles/config/taffybar/taffybar
@@ -1 +1 @@
-Subproject commit dd3d05555fb997d0a558cfc28bb34680f25ad9a1
+Subproject commit 437f73075261f5e0a018aa190f49d2f50d371aed
diff --git a/dotfiles/config/taffybar/taffybar.css b/dotfiles/config/taffybar/taffybar.css
index 8da31007..fa2c22bb 100644
--- a/dotfiles/config/taffybar/taffybar.css
+++ b/dotfiles/config/taffybar/taffybar.css
@@ -38,6 +38,9 @@
 .workspaces .contents {
 	box-shadow: none;
 	border-radius: 4px;
+	border-width: 1px;
+	border-style: solid;
+	border-color: @transparent;
 }
 
 .workspace-label {
diff --git a/dotfiles/config/taffybar/taffybar.hs b/dotfiles/config/taffybar/taffybar.hs
index 42e1594b..bb4894fb 100644
--- a/dotfiles/config/taffybar/taffybar.hs
+++ b/dotfiles/config/taffybar/taffybar.hs
@@ -131,9 +131,12 @@ cssFilesByHostname =
   , ("imalison-home", ["taffybar.css"])
   , ("ivanm-dfinity-razer", ["taffybar.css"])
   , ("ryzen-shine", ["taffybar.css"])
+  , ("stevie-nixos", ["taffybar.css"])
   ]
 
 main = do
+  enableLogger "Graphics.UI.GIGtkStrut" DEBUG
+
   hostName <- getHostName
   homeDirectory <- getHomeDirectory
   let relativeFiles = fromMaybe ["taffybar.css"] $ lookup hostName cssFilesByHostname
@@ -203,7 +206,7 @@ main = do
         , barPosition = Top
         , widgetSpacing = 0
         , barPadding = 0
-        , barHeight = 50
+        , barHeight = ScreenRatio $ 1/27
         , cssPaths = cssFiles
         , startupHook = void $ setCMCAPIKey "f9e66366-9d42-4c6e-8d40-4194a0aaa329"
         }
@@ -213,16 +216,19 @@ main = do
             , baseConfig { endWidgets = laptopEndWidgets }
             )
           , ( "imalison-home"
-            , baseConfig { endWidgets = fullEndWidgets, barHeight = 42 }
+            , baseConfig { endWidgets = fullEndWidgets }
             )
           , ( "ryzen-shine"
-            , baseConfig { endWidgets = fullEndWidgets, barHeight = 50 }
+            , baseConfig { endWidgets = fullEndWidgets }
             )
           , ( "ivanm-dfinity-razer"
-            , baseConfig { endWidgets = laptopEndWidgets, barHeight = 42 }
+            , baseConfig { endWidgets = laptopEndWidgets }
             )
           , ( "adele"
-            , baseConfig { endWidgets = laptopEndWidgets, barHeight = 45 }
+            , baseConfig { endWidgets = laptopEndWidgets }
+            )
+          , ( "stevie-nixos"
+            , baseConfig { endWidgets = laptopEndWidgets }
             )
           ]
       simpleTaffyConfig = selectedConfig
@@ -231,7 +237,7 @@ main = do
         -- , startWidgets = []
         }
   startTaffybar $
-    appendHook (void $ getHost False) $
+    appendHook (void $ getTrayHost False) $
     withLogServer $
     withToggleServer $
     toTaffyConfig simpleTaffyConfig
diff --git a/dotfiles/config/xmonad/xmonad b/dotfiles/config/xmonad/xmonad
index aa18707c..485a0ad5 160000
--- a/dotfiles/config/xmonad/xmonad
+++ b/dotfiles/config/xmonad/xmonad
@@ -1 +1 @@
-Subproject commit aa18707c3ef96db88208509c2a18c6670e831661
+Subproject commit 485a0ad506b8fb4a93a01a7cdd437121ecf5e40c
diff --git a/dotfiles/config/xmonad/xmonad.hs b/dotfiles/config/xmonad/xmonad.hs
index 8ce40170..c405c489 100644
--- a/dotfiles/config/xmonad/xmonad.hs
+++ b/dotfiles/config/xmonad/xmonad.hs
@@ -66,6 +66,7 @@ import           XMonad.Layout.Accordion
 import           XMonad.Layout.BoringWindows
 import           XMonad.Layout.ConditionalLayout
 import           XMonad.Layout.Cross
+import           XMonad.Layout.Decoration
 import           XMonad.Layout.Grid
 import           XMonad.Layout.LayoutCombinators
 import           XMonad.Layout.LayoutModifier
@@ -90,7 +91,6 @@ import           XMonad.Util.Minimize
 import           XMonad.Util.NamedScratchpad as NS
 import           XMonad.Util.NamedWindows (getName)
 import           XMonad.Util.Run
-import           XMonad.Util.Themes
 import           XMonad.Util.WorkspaceCompare
 
 myConfig = def
@@ -100,8 +100,6 @@ myConfig = def
     = namedScratchpadManageHook scratchpads
   , layoutHook = myLayoutHook
   , borderWidth = 0
-  , normalBorderColor = "#0096ff"
-  , focusedBorderColor = "#ffff00"
   , logHook
   = updatePointer (0.5, 0.5) (0, 0)
   <> toggleFadeInactiveLogHook 0.9
@@ -112,12 +110,24 @@ myConfig = def
   , handleEventHook
   =  followIfNoMagicFocus
   <> minimizeEventHook
-  <> restartEventHook
+  -- <> restartEventHook
   <> myScratchPadEventHook
   , startupHook = myStartup
   , keys = customKeys (const []) addKeys
   }
 
+gothamTheme =
+  def
+  { inactiveBorderColor = "#000"
+  , activeBorderColor = "#edb443"
+  , activeColor = "#edb443"
+  , inactiveColor = "#091f2e"
+  , inactiveTextColor = "#edb443"
+  , activeTextColor = "#091f2e"
+  , fontName = "xft:Source Code Pro:style=Semibold"
+  , decoHeight = 25
+  }
+
 restartEventHook e@ClientMessageEvent { ev_message_type = mt } = do
   a <- getAtom "XMONAD_RESTART"
   if mt == a
@@ -127,14 +137,13 @@ restartEventHook _ = return $ All True
 
 myNavigation2DConfig = def { defaultTiledNavigation = centerNavigation }
 
-main = do
-  dirs <- getDirectories
-  (`launch` dirs)
-       . docks
-       . pagerHints
-       . ewmh
-       . ewmhFullscreen
-       . withNavigation2DConfig myNavigation2DConfig $ myConfig
+main =
+  xmonad
+      . docks
+      . pagerHints
+      . ewmh
+      . ewmhFullscreen
+      . withNavigation2DConfig myNavigation2DConfig $ myConfig
 
 -- Utility functions
 
@@ -306,7 +315,7 @@ instance Transformer MyToggles Window where
   transform AVOIDSTRUTS x k = k (avoidStruts x) unmodifyLayout
 
 myToggles = [LIMIT, GAPS, MAGICFOCUS, MAGNIFY, AVOIDSTRUTS]
-otherToggles = [NBFULL, MIRROR, NOBORDERS, SMARTBORDERS]
+otherToggles = [NBFULL, NOBORDERS, MIRROR, SMARTBORDERS]
 toggleHandlers =
   [ (Toggle GAPS, toggleAll)
   , (Toggle MAGNIFY, toggleAll)
@@ -406,7 +415,7 @@ layoutInfo =
   rename "2 Columns" (Tall 1 (3 / 100) (1 / 2)) |||!
   Accordion |||! simpleCross |||! myTabbed
     where
-      myTabbed = rename "Tabbed" $ tabbed shrinkText (theme robertTheme)
+      myTabbed = rename "Tabbed" $ tabbed shrinkText gothamTheme
 
 layoutList = snd layoutInfo
 
diff --git a/dotfiles/emacs.d/README.org b/dotfiles/emacs.d/README.org
index 3853f090..7e5d7ae2 100644
--- a/dotfiles/emacs.d/README.org
+++ b/dotfiles/emacs.d/README.org
@@ -5043,7 +5043,7 @@ load-theme hook (See the heading below).
 ** After ~load-theme~ hook
 #+BEGIN_SRC emacs-lisp
 (defvar imalison:light-theme 'solarized-light)
-(defvar imalison:dark-theme 'flatland)
+(defvar imalison:dark-theme 'gotham)
 
 (defun imalison:after-load-theme (&rest _args)
   (when (fboundp 'powerline-reset)
diff --git a/dotfiles/gitconfig b/dotfiles/gitconfig
index 5495b292..e623a49b 100644
--- a/dotfiles/gitconfig
+++ b/dotfiles/gitconfig
@@ -98,3 +98,6 @@
 [user]
 	email = IvanMalison@gmail.com
 	name = Ivan Malison
+
+[init]
+	defaultBranch = master
diff --git a/dotfiles/xkb/keymap/stevie-nixos b/dotfiles/xkb/keymap/stevie-nixos
new file mode 100644
index 00000000..e4458964
--- /dev/null
+++ b/dotfiles/xkb/keymap/stevie-nixos
@@ -0,0 +1,7 @@
+xkb_keymap {
+	xkb_keycodes  { include "evdev+aliases(qwerty)"	};
+	xkb_types     { include "complete"	};
+	xkb_compat    { include "complete"	};
+	xkb_symbols   { include "pc+us+inet(evdev)+altwin(swap_lalt_lwin)+imalison(ralt_as_hyper)+capslock(ctrl_modifier)"	};
+	xkb_geometry  { include "pc(pc105)"	};
+};
diff --git a/nixos/environment.nix b/nixos/environment.nix
index b64cec91..dd68e310 100644
--- a/nixos/environment.nix
+++ b/nixos/environment.nix
@@ -38,8 +38,11 @@ with lib;
     environment = {
       homeBinInPath = true;
       localBinInPath = true;
+      shellAliases = {
+        df_ssh = "TERM='xterm-256color ssh -o StrictHostKeyChecking=no'";
+      };
       interactiveShellInit = ''
-                vterm_printf(){
+        vterm_printf(){
             if [ -n "$TMUX" ] && ([ "''${TERM%%-*}" = "tmux" ] || [ "''${TERM%%-*}" = "screen" ] ); then
                 # Tell tmux to pass the escape sequences through
                 printf "\ePtmux;\e\e]%s\007\e\\" "$1"
diff --git a/nixos/essential.nix b/nixos/essential.nix
index 2bde7fca..065f5f46 100644
--- a/nixos/essential.nix
+++ b/nixos/essential.nix
@@ -31,6 +31,7 @@ in
     dolphin
     element-desktop
     gpick
+    torbrowser
 
     # Appearance
     numix-icon-theme-circle
diff --git a/nixos/home-manager.nix b/nixos/home-manager.nix
index 54288744..de480f00 100644
--- a/nixos/home-manager.nix
+++ b/nixos/home-manager.nix
@@ -73,15 +73,15 @@
     enable = true;
     repositories = {
       config = {
-        path = "/home/imalison/config";
+        path = config.home.homeDirectory + "/config";
         uri = "git@github.com:IvanMalison/config.git";
       };
       org = {
-        path = "/home/imalison/org";
+        path = config.home.homeDirectory + "/org";
         uri = "git@github.com:IvanMalison/org.git";
       };
       password-store = {
-        path = "/home/imalison/.password-store";
+        path = config.home.homeDirectory + "/.password-store";
         uri = "git@github.com:IvanMalison/.password-store.git";
       };
     };
diff --git a/nixos/machines/adele.nix b/nixos/machines/adele.nix
index a5145dc6..15d12cd3 100644
--- a/nixos/machines/adele.nix
+++ b/nixos/machines/adele.nix
@@ -1,6 +1,3 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
 { config, lib, pkgs, inputs, ... }:
 
 {
diff --git a/nixos/machines/ryzen-shine.nix b/nixos/machines/ryzen-shine.nix
index 54b71ccc..e1df5da6 100644
--- a/nixos/machines/ryzen-shine.nix
+++ b/nixos/machines/ryzen-shine.nix
@@ -5,6 +5,7 @@
     ../users.nix
     ../full.nix
     ../dfinity.nix
+    ../games.nix
   ];
 
   hardware.enableRedistributableFirmware = true;
diff --git a/nixos/machines/stevie-nixos.nix b/nixos/machines/stevie-nixos.nix
new file mode 100644
index 00000000..1a63275f
--- /dev/null
+++ b/nixos/machines/stevie-nixos.nix
@@ -0,0 +1,46 @@
+{ config, lib, pkgs, inputs, ... }:
+
+{
+  imports = [
+    ../full.nix
+    ../base.nix
+    inputs.nixos-hardware.nixosModules.dell-xps-17-9700-nvidia
+  ];
+
+  hardware.enableRedistributableFirmware = true;
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = with config.boot.kernelPackages; [ ];
+
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  services.xserver.libinput.enable = true;
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/7c999009-1ff1-42f7-a64a-3fa91fc777a8";
+      fsType = "ext4";
+    };
+
+  boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/97c1eee7-b161-4186-9c14-6b1771d49afb";
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-label/ESP";
+      fsType = "vfat";
+    };
+
+
+  swapDevices = [ ];
+
+  networking.hostName = "stevie-nixos";
+
+  nix.maxJobs = lib.mkDefault 16;
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+
+  hardware.video.hidpi.enable = true;
+
+  system.stateVersion = "21.05";
+}
diff --git a/nixos/nixpkgs b/nixos/nixpkgs
index c159b9d5..022c300d 160000
--- a/nixos/nixpkgs
+++ b/nixos/nixpkgs
@@ -1 +1 @@
-Subproject commit c159b9d51e4bd7a3d29744ab1c6baa78c71bf93b
+Subproject commit 022c300df10d5e90ea9738441fd3d978b80596e5
diff --git a/nixos/users.nix b/nixos/users.nix
index cf9d03ff..402e04eb 100644
--- a/nixos/users.nix
+++ b/nixos/users.nix
@@ -27,6 +27,7 @@
       openssh.authorizedKeys.keys = [
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICzGkqGJm+nrMvsrfuWOLVxXHvi0UL1ULJmyfzS9sKpy imalison@biskcomp.local"
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOuO/tc728fKyctlufiehZQuKsD0XDiS/5x7TImk0Ip4 imalison@ivanm-dfinity-razer"
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDt/rcYuGGlXBcRUJvzUCgOW8PNVkJJ5TwEOha1/KGM4 imalison@stevie-nixos"
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIiZd2FiyTJvuvDh5hH0L3BqZV3E/kwwyau57QD7pz7C cardno:000614590850" # Dfinity Admin
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHOEt0T+Hxxat5tbkD9mSu8T271QjRrLr2EA0rIDXUNL cardno:000614590748" # Dfinity Read-Only
         "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDUSkj7587e+MAUNyU/KRpw9Vk++53Wv5nB+0V1QgiTO3rMQe6HJt0Tm2wi/o/T8GNjueT2D69YgkqOIF1FQwsj2EFLObcMzeBgs5gTSglqggA2I91BIc1vvgjCDpogOMAzAQGlTxRnqrEXhqG0jJtw8KIzLr9WrvWLdTT4rHtWS8RoOBgkQ8oxbggZ4vtbMBIwoIAYGRr70KBRNCsLTPLa8yEf+DDQxq1entzxSjHXHgyeBSVVpPCrBVmhjandk+lIFInjvAiAE1ZkJHSRccL73ORmgb1crwH7xlD9NwBPmypowMi8UIRMKfL2lNehT0AQIlEAikUBLMDzPIPhnwLZ imalison@ivanm-dfinity-razer.local"