diff --git a/common/default.nix b/common/default.nix
index df655bea..49e4611d 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -1,4 +1,9 @@
-{ lib, inputs, pkgs, ... }:
+{
+  lib,
+  inputs,
+  pkgs,
+  ...
+}:
 {
   imports = [
     ./users
@@ -75,21 +80,23 @@
     '';
   };
 
-  # Limit the systemd journal to 100 MB of disk or the
-  # last 7 days of logs, whichever happens first.
-  services.journald.extraConfig = ''
-    SystemMaxUse=100M
-    MaxFileSec=7day
-  '';
+  services = {
+    # Limit the systemd journal to 100 MB of disk or the
+    # last 7 days of logs, whichever happens first.
+    journald.extraConfig = ''
+      SystemMaxUse=100M
+      MaxFileSec=7day
+    '';
 
-  services.dbus.implementation = "broker";
+    dbus.implementation = "broker";
 
-  # Enable SSH
-  services.openssh = {
-    enable = true;
-    settings = {
-      PasswordAuthentication = lib.mkDefault false;
-      PermitRootLogin = lib.mkDefault "no";
+    # Enable SSH
+    openssh = {
+      enable = true;
+      settings = {
+        PasswordAuthentication = lib.mkDefault false;
+        PermitRootLogin = lib.mkDefault "no";
+      };
     };
   };
 
diff --git a/common/desktop/home.nix b/common/desktop/home.nix
index 07489b02..4c7eddcd 100644
--- a/common/desktop/home.nix
+++ b/common/desktop/home.nix
@@ -112,6 +112,7 @@ in
       element-desktop
       firefox
       discord
+      obsidian
     ];
   };
 
diff --git a/common/hm-modules/nvim/default.nix b/common/hm-modules/nvim/default.nix
index 4c0fd35a..bf7f9472 100644
--- a/common/hm-modules/nvim/default.nix
+++ b/common/hm-modules/nvim/default.nix
@@ -62,7 +62,10 @@ with lib;
         plugins = {
           nvim-surround.enable = true;
           dap.enable = true;
-          image.enable = true;
+          image = {
+            enable = true;
+            backend = "kitty";
+          };
           web-devicons.enable = true;
           bufferline.enable = true;
           nix.enable = true;
diff --git a/hosts/thalassa/aoife/home/hyprland.nix b/hosts/thalassa/aoife/home/hyprland.nix
index bd1642fb..a98da69a 100644
--- a/hosts/thalassa/aoife/home/hyprland.nix
+++ b/hosts/thalassa/aoife/home/hyprland.nix
@@ -23,6 +23,9 @@ in
     rofi = {
       enable = true;
       package = pkgs.rofi-wayland;
+      theme = {
+        listview.columns = 1;
+      };
     };
 
     hyprlock = {
@@ -50,7 +53,7 @@ in
             inner_color = "rgba(242, 243, 244, 0)";
             font_color = "rgba(242, 243, 244, 0.75)";
             fade_on_empty = false;
-            placeholder_text = "Start typing or scan fingerprint"; # Text rendered in the input box when it's empty.
+            placeholder_text = "Enter password or scan fingerprint.."; # Text rendered in the input box when it's empty.
             hide_input = false;
             check_color = "rgba(204, 136, 34, 0)";
             fail_color = "rgba(204, 34, 34, 0)"; # if authentication failed, changes outer_color and fail message color
@@ -122,10 +125,14 @@ in
             on-timeout = "loginctl lock-session";
           }
           {
-            timeout = 600; # 10 mins
+            timeout = 600; # 10 mins, screen off
             on-timeout = "hyprctl dispatch dpms off";
             on-resume = "hyprctl dispatch dpms on";
           }
+          {
+            timeout = 1800; # 30 mins
+            on-timeout = "systemctl suspend";
+          }
         ];
       };
     };
@@ -165,7 +172,7 @@ in
       # Autostart now handled by xdg.autoStart
       startup = pkgs.writeScriptBin "startup.sh" ''
         #!${pkgs.stdenv.shell}
-        echo "Starting up"
+        uwsm app -- ${pkgs.wl-clip-persist}/bin/wl-clip-persist -c both &
       '';
     in
     {
@@ -181,7 +188,7 @@ in
           inherit (builtins) genList concatLists toString;
           wpctl = "${pkgs.wireplumber}/bin/wpctl";
           brightnessctl = "${pkgs.brightnessctl}/bin/brightnessctl";
-          menu = "${config.programs.rofi.package}/bin/rofi -show combi -modes combi -combi-modes \"window,drun,run\"";
+          menu = "${config.programs.rofi.package}/bin/rofi -columns 1 -show combi -modes combi -combi-modes \"window,drun,run\"";
           fileManager = "${pkgs.nautilus}/bin/nautilus";
         in
         {
@@ -270,12 +277,16 @@ in
           };
 
           windowrulev2 = [
-            "suppressevent maximize, class:.* # You'll probably like this."
+            "suppressevent maximize, class:.*"
+
             "workspace 1 silent, class:^(Element)$"
             "workspace 1 silent, class:^(discord)$"
             "group, class:^(Element|discord)$,workspace:1"
+
             "workspace 2 silent, class:^(firefox)$"
             "float,class:^(firefox)$,title:^(Picture-in-Picture)$"
+
+            "workspace special:obsidian silent, class:^(obsidian)$"
           ];
 
           # l -> works when screen is locked
@@ -287,16 +298,16 @@ in
             ",XF86MonBrightnessDown,exec,${brightnessctl} -q s 5%-"
           ];
 
-          bindl = [ ",XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle" ];
+          bindl = [ ",XF86AudioMute, exec, ${wpctl} set-mute @DEFAULT_AUDIO_SINK@ toggle" ];
 
           bind =
             [
-              "$mod, RETURN, exec, ${terminal}"
+              "$mod, RETURN, exec, uwsm app -- ${terminal}"
               "$mod, Q, killactive,"
               "$mod SHIFT, Q, exec, uwsm stop,"
-              "$mod, E, exec, ${fileManager}"
+              "$mod, E, exec, uwsm app -- ${fileManager}"
               "$mod, V, togglefloating,"
-              "$mod, D, exec, ${menu}"
+              "$mod, D, exec, uwsm app -- ${menu}"
               "$mod, P, pseudo, # dwindle"
               "$mod, J, togglesplit, # dwindle"
               "$mod,m,fullscreen"
@@ -312,15 +323,19 @@ in
               "$mod, down, movefocus, d"
 
               # Scratch workspace
-              "$mod, S, togglespecialworkspace, magic"
-              "$mod SHIFT, S, movetoworkspace, special:magic"
+              "$mod, S, togglespecialworkspace, scratch"
+              "$mod SHIFT, S, movetoworkspace, special:scratch"
+
+              # Obsidian Workspace
+              "$mod, O, togglespecialworkspace, obsidian"
+              "$mod SHIFT, O, movetoworkspace, special:obsidian"
 
               # Groups aka Tabs
               "$mod,g,togglegroup"
               "$mod,tab,changegroupactive"
 
               # PrintScreen
-              ",Print,exec,${pkgs.grimblast}/bin/grimblast copysave area /home/vivian/cloud/Pictures/Screenshots/$(date +%s).png"
+              ",Print,exec,uwsm app -- ${pkgs.grimblast}/bin/grimblast copysave area /home/vivian/cloud/Pictures/Screenshots/$(date +%s).png"
               # Toggle Mirror for external displays on/off
               ",XF86Display,exec,${toggle_mirror}/bin/toggle_mirror.sh"
             ]
diff --git a/hosts/thalassa/aoife/home/waybar.nix b/hosts/thalassa/aoife/home/waybar.nix
index 2f07a5a0..ac48a495 100644
--- a/hosts/thalassa/aoife/home/waybar.nix
+++ b/hosts/thalassa/aoife/home/waybar.nix
@@ -5,11 +5,9 @@ in
 {
   programs.waybar = {
     enable = true;
-    systemd = {
-      enable = true;
-      # target = "wayland-session@Hyprland.target";
-    };
+    systemd.enable = true;
     style = ./waybar.css;
+
     settings = {
       mainBar = {
         layer = "top";
@@ -43,7 +41,7 @@ in
             format-ethernet = "󰈀 {ifname}: {ipaddr}/{cidr}";
             format-disconnected = "󰌙 ";
             tooltip-format = "{ifname}: {ipaddr}";
-            on-click = "touch ~/a && ${terminal} --execute ${nmtui}/bin/nmtui.sh";
+            on-click = "${terminal} --execute ${nmtui}/bin/nmtui.sh";
           };
 
         power-profiles-daemon = {