diff --git a/config/sxhkd/sxhkdrc b/config/sxhkd/sxhkdrc
index 159710b6..396eaddd 100644
--- a/config/sxhkd/sxhkdrc
+++ b/config/sxhkd/sxhkdrc
@@ -21,7 +21,7 @@ super + {_,shift +}{1-9,0}
 	bspc {desktop -f,node -d} {1-9,10}
 
 super + Return
-	st
+	xst
 
 super + grave
 	st-scratch
diff --git a/default.nix b/default.nix
index 794826b5..232b3f3a 100644
--- a/default.nix
+++ b/default.nix
@@ -57,6 +57,13 @@
 
   time.timeZone = "America/Toronto";
   # time.timeZone = "Europe/Copenhagen";
+  location = (if config.time.timeZone == "America/Toronto" then {
+    latitude = 43.70011;
+    longitude = -79.4163;
+  } else if config.time.timeZone == "Europe/Copenhagen" then {
+    latitude = 55.88;
+    longitude = 12.5;
+  } else {});
 
   # Set up hlissner user account
   users.users.hlissner = {
@@ -75,5 +82,5 @@
   # compatible, in order to avoid breaking some software such as database
   # servers. You should change this only after NixOS release notes say you
   # should.
-  system.stateVersion = "19.03"; # Did you read the comment?
+  system.stateVersion = "19.09"; # Did you read the comment?
 }
diff --git a/modules/desktop/bspwm.nix b/modules/desktop/bspwm.nix
index 3240db63..592055d8 100644
--- a/modules/desktop/bspwm.nix
+++ b/modules/desktop/bspwm.nix
@@ -37,7 +37,7 @@
                 xdotool windowactivate $scratch
             fi
         else
-            st -t $SCRID -n $SCRID -c $SCRID \
+            xst -t $SCRID -n $SCRID -c $SCRID \
               -f "$(xrdb -query | grep 'st-scratch\.font' | cut -f2)" \
               -g 100x26 \
               -e $SHELL
@@ -58,7 +58,7 @@
     compton = {
       enable = true;
       backend = "glx";
-      vSync = "opengl-swc";
+      vSync = true;
       inactiveOpacity = "0.90";
     };
   };
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index 0efb253e..0ba0e97f 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -22,16 +22,7 @@
       enable = true;
       libinput.disableWhileTyping = true;
     };
-
-    redshift = (if config.time.timeZone == "America/Toronto" then {
-      enable = true;
-      latitude = "43.70011";
-      longitude = "-79.4163";
-    } else if config.time.timeZone == "Europe/Copenhagen" then {
-      enable = true;
-      latitude = "55.88";
-      longitude = "12.5";
-    } else {});
+    redshift.enable = true;
   };
 
   fonts = {