diff --git a/Makefile b/Makefile
index 43c37f47..7b737ea2 100644
--- a/Makefile
+++ b/Makefile
@@ -98,4 +98,4 @@ setup-gpg:
 
 
 setup-lockscreen:
-	betterlockscreen -u desktop/pictures/walls --blur 1
+	betterlockscreen -u $(HOME)/desktop/pictures/walls --blur 1
diff --git a/users/modules/iaas/aws/default.nix b/users/modules/iaas/aws/default.nix
index f7da507f..6da52050 100644
--- a/users/modules/iaas/aws/default.nix
+++ b/users/modules/iaas/aws/default.nix
@@ -1,20 +1,6 @@
 { pkgs, nixosConfig, ... }:
 
 {
-  imports = [
-    # autorandr
-    # xophe ./finances.nix
-    # xophe ./next.nix
-    # xophe ./keyboard.nix
-    # xophe ./spotify.nix
-    #./firefox.nix
-    #./gtk.nix
-    #./mpv.nix
-    # ./i3.nix
-    # ./mpd.nix
-    # ./redshift.nix
-    # ./xsession.nix
-  ];
   home.packages = with pkgs; [
     aws-vault
     aws-iam-authenticator
@@ -28,5 +14,4 @@
     AWS_VAULT_PASS_PREFIX = "vault";
     AWS_VAULT_PASS_PASSWORD_STORE_DIR = ''''${HOME}/sync/password-store'';
   };
-
 }
diff --git a/users/xophe/desktop/default.nix b/users/xophe/desktop/default.nix
index 4f96f7d2..3b7351c9 100644
--- a/users/xophe/desktop/default.nix
+++ b/users/xophe/desktop/default.nix
@@ -2,7 +2,6 @@
 
 {
   imports = [
-    # autorandr
     # xophe ./finances.nix
     # xophe ./next.nix
     # xophe ./keyboard.nix
diff --git a/users/xophe/desktop/i3.nix b/users/xophe/desktop/i3.nix
index 081d1980..35a7f025 100644
--- a/users/xophe/desktop/i3.nix
+++ b/users/xophe/desktop/i3.nix
@@ -25,6 +25,7 @@ in
   ];
   home.sessionVariables = { WEBKIT_DISABLE_COMPOSITING_MODE = 1; };
   home.packages = with pkgs; [
+    gThumb
     alacritty
     arandr
     # TODO switch to betterlockscreen