diff --git a/config/eww/bars/top-bar.scss b/config/eww/bars/top-bar.scss
index f5b55dc..feb4bc9 100644
--- a/config/eww/bars/top-bar.scss
+++ b/config/eww/bars/top-bar.scss
@@ -43,6 +43,10 @@ tooltip label {
     color: $base0D;
 }
 
+.wifi.icon {
+    padding-right: 12px;
+}
+
 .wifi-text {
     padding-left: 8px;
 }
diff --git a/config/rofi/menus/powermenu/powermenu.sh b/config/rofi/menus/powermenu/powermenu.sh
index 1f91e7f..24a8e80 100755
--- a/config/rofi/menus/powermenu/powermenu.sh
+++ b/config/rofi/menus/powermenu/powermenu.sh
@@ -58,14 +58,10 @@ run_cmd() {
 		elif [[ $1 == '--suspend' ]]; then
 			systemctl suspend
 		elif [[ $1 == '--logout' ]]; then
-			if [[ "$DESKTOP_SESSION" == 'openbox' ]]; then
-				openbox --exit
-			elif [[ "$DESKTOP_SESSION" == 'bspwm' ]]; then
-				bspc quit
-			elif [[ "$DESKTOP_SESSION" == 'i3' ]]; then
+			if [[ "$DESKTOP_SESSION" == 'i3' ]]; then
 				i3-msg exit
-			elif [[ "$DESKTOP_SESSION" == 'plasma' ]]; then
-				qdbus org.kde.ksmserver /KSMServer logout 0 0 0
+			elif [[ ! -z $HYPRLAND_INSTANCE_SIGNATURE ]]; then
+				hyprctl dispatch exit
 			fi
 		fi
 	else
diff --git a/data/wallpapers/wallhaven/01.jpg b/data/wallpapers/wallhaven/ciutat.jpg
similarity index 100%
rename from data/wallpapers/wallhaven/01.jpg
rename to data/wallpapers/wallhaven/ciutat.jpg
diff --git a/data/wallpapers/wallhaven/desert.jpg b/data/wallpapers/wallhaven/desert.jpg
new file mode 100644
index 0000000..b622772
Binary files /dev/null and b/data/wallpapers/wallhaven/desert.jpg differ
diff --git a/data/wallpapers/wallhaven/muntanya.png b/data/wallpapers/wallhaven/muntanya.png
new file mode 100644
index 0000000..835201e
Binary files /dev/null and b/data/wallpapers/wallhaven/muntanya.png differ
diff --git a/hosts/reykjavik/default.nix b/hosts/reykjavik/default.nix
index ebfdffd..079837c 100644
--- a/hosts/reykjavik/default.nix
+++ b/hosts/reykjavik/default.nix
@@ -3,7 +3,7 @@
 with lib;
 let
   nix-colors-lib = inputs.nix-colors.lib-contrib { inherit pkgs; };
-  wallpaper = ../../data/wallpapers/wallhaven/canyon.jpg;
+  wallpaper = ../../data/wallpapers/wallhaven/muntanya.png;
 in
 {
   imports = [
diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix
index f5efe89..baacb00 100644
--- a/modules/desktop/hyprland.nix
+++ b/modules/desktop/hyprland.nix
@@ -21,8 +21,42 @@ in {
     environment.systemPackages = with pkgs; [
       # Wallpaper
       hyprpaper
+      greetd.gtkgreet
+      cage
     ];
 
+    # - Login screen -----------------------------
+    services.greetd = {
+      enable = true;
+      settings = {
+        default_session = {
+          command = "${pkgs.cage}/bin/cage -d -s ${pkgs.greetd.gtkgreet}/bin/gtkgreet -- -c Hyprland -s /etc/greetd/greetd.css";
+          user = config.user.name;
+        };
+      };
+    };
+
+    environment.etc."greetd/environments".text = ''
+      Hyprland
+    '';
+
+    environment.etc."greetd/greetd.css".text = ''
+      window {
+          background-image: url("file://${config.samfelag.modules.desktop.wallpaper}");
+          background-size: cover;
+          background-position: center;
+          font-family: Iosevka;
+          color: #${config.colorScheme.palette.base00};
+      }
+
+      box#body {
+          background-color: #${config.colorScheme.palette.base06};
+          opacity: 0.75;
+          border-radius: 10px;
+          padding: 50px;
+      }
+    '';
+
     # - Dependencies -----------------------------
     samfelag.modules.desktop.rofi.enable = true;
     samfelag.modules.desktop.eww.enable = true;
@@ -31,8 +65,8 @@ in {
 
     # Hyprpaper
     hm.xdg.configFile."hypr/hyprpaper.conf".text = ''
-    preload = ${config.samfelag.modules.desktop.wallpaper}
-    wallpaper = ,${config.samfelag.modules.desktop.wallpaper}
+      preload = ${config.samfelag.modules.desktop.wallpaper}
+      wallpaper = ,${config.samfelag.modules.desktop.wallpaper}
     '';
 
     programs.hyprland = {
@@ -69,7 +103,7 @@ in {
 
         gestures = {
           # See https://wiki.hyprland.org/Configuring/Variables/ for more
-          workspace_swipe = false;
+          workspace_swipe = true;
         };
 
         bind = [