diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf
index d86851e..d665feb 100644
--- a/.config/kitty/kitty.conf
+++ b/.config/kitty/kitty.conf
@@ -1,5 +1,5 @@
 font_family      'JetBrainsMono NF'
-font_size 11
+font_size 11.5
 
 text_composition_strategy legacy
 modify_font cell_width 95%
diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index 6919948..eea3e69 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -1,11 +1,13 @@
 {
   "LuaSnip": { "branch": "master", "commit": "fb525166ccc30296fb3457441eb979113de46b00" },
   "async.vim": { "branch": "master", "commit": "2082d13bb195f3203d41a308b89417426a7deca1" },
+  "auto-save.nvim": { "branch": "main", "commit": "5fbcaac0a2698c87a9a1bd2083cb6949505cca12" },
   "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" },
   "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
   "cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" },
   "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
+  "conform.nvim": { "branch": "master", "commit": "b4aab989db276993ea5dcb78872be494ce546521" },
   "copilot.vim": { "branch": "release", "commit": "3955014c503b0cd7b30bc56c86c56c0736ca0951" },
   "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
   "gruvbox.nvim": { "branch": "main", "commit": "00e38a379bab3389e187b3953566d67d494dfddd" },
diff --git a/.config/nvim/lua/plugins/auto-save.lua b/.config/nvim/lua/plugins/auto-save.lua
new file mode 100644
index 0000000..7ff9307
--- /dev/null
+++ b/.config/nvim/lua/plugins/auto-save.lua
@@ -0,0 +1,11 @@
+return{
+	"okuuva/auto-save.nvim",
+	version = '^1.0.0', -- see https://devhints.io/semver, alternatively use '*' to use the latest tagged release
+	cmd = "ASToggle", -- optional for lazy loading on command
+	event = { "InsertLeave", "TextChanged" }, -- optional for lazy loading on trigger events
+	opts = {
+		-- your config goes here
+		-- or just leave it empty :)
+		enabled = false
+	},
+}
diff --git a/.config/nvim/lua/plugins/conform.lua b/.config/nvim/lua/plugins/conform.lua
new file mode 100644
index 0000000..f6ff6a8
--- /dev/null
+++ b/.config/nvim/lua/plugins/conform.lua
@@ -0,0 +1,19 @@
+return {
+	'stevearc/conform.nvim',
+	opts = {},
+	config = function ()
+		require("conform").setup({
+			formatters_by_ft = {
+				tex = { "latexindent" },
+				--lua = { "stylua" },
+				-- Conform will run multiple formatters sequentially
+				--python = { "isort", "black" },
+				-- You can customize some of the format options for the filetype (:help conform.format)
+				--rust = { "rustfmt", lsp_format = "fallback" },
+				-- Conform will run the first available formatter
+				--javascript = { "prettierd", "prettier", stop_after_first = true },
+			},
+		})
+
+	end
+}
diff --git a/.config/sway/config b/.config/sway/config
index c8a73ae..2bc00a8 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -4,7 +4,8 @@ font 'JetBrainsMono NF' 9
 #set $mod Mod1
 set $mod Mod4
 
-set $term kitty -1
+#set $term kitty -1
+set $term kitty
 #set $term ghostty
 
 set $menu wofi -S drun -GI
@@ -21,8 +22,11 @@ include ~/.config/sway/config.d/*
 ### Output configuration
 # You can get the names of your outputs by running: swaymsg -t get_outputs
 # https://gitlab.com/w0lff/shikane for multitple display handling 
-exec --no-startup-id nohup shikane -c /home/jozamudi/.config/shikane/config.toml > /tmp/nohup-shikane.log 2>&1
-exec_always shikane -o
+output * bg /home/jozamudi/Downloads/samurai-cyberpunk-3840x2160-12877.png fill
+output eDP-1 scale 1.8
+#output 'BNQ BenQ PD3200U S2N01233019' scale 1.5
+
+exec shikane -c /home/jozamudi/.config/shikane/config.toml 
 
 bindswitch --reload --locked lid:on output $laptop disable
 bindswitch --reload --locked lid:off output $laptop enable
@@ -31,8 +35,9 @@ exec_always --no-startup-id '/home/jozamudi/.config/sway/scripts/clamshell-mode.
 ### Idle configuration
 exec swayidle -w \
 	timeout 300 'swaylock -f -c 000000' \
-	timeout 600 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \
-	before-sleep 'playerctl pause; swaylock -f -c 000000'
+	timeout 600 'swaymsg "output * power off"' \
+	resume 'swaymsg "output * power on"' \
+	before-sleep 'playerctl pause; swaymsg output $laptop power on; swaylock -f -c 000000'
 
 
 seat seat0 xcursor_theme Adwaita 25 
@@ -50,5 +55,5 @@ exec dex -a
 
 default_border pixel 2
 default_floating_border pixel 2
-
+exec systemctl --user import-environment XDG_SESSION_TYPE XDG_CURRENT_DESKTOP
 exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP=sway XDG_SESSION_DESKTOP=sway
diff --git a/.config/sway/config.d/keybinds b/.config/sway/config.d/keybinds
index fa7df12..a07ef4e 100644
--- a/.config/sway/config.d/keybinds
+++ b/.config/sway/config.d/keybinds
@@ -117,12 +117,13 @@ bindsym $mod+Shift+s sticky toggle
 
 # Toggle laptop display
 bindsym $mod+m output $laptop toggle
+bindsym $mod+shift+m exec bash -c 'playerctl pause; swaymsg output $laptop power on; swaylock -f -c 000000'
 
 # play/pause media player
-bindsym XF86Favorites exec playerctl play-pause 
-bindsym $mod+bracketleft exec mpc prev
-bindsym $mod+bracketright exec mpc next
-bindsym $mod+backslash exec mpc toggle
+#bindsym XF86Favorites exec playerctl play-pause 
+bindsym $mod+bracketleft exec playerctl previous
+bindsym $mod+bracketright exec playerctl next
+bindsym $mod+backslash exec playerctl play-pause
 
 
 bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5% \
@@ -136,10 +137,10 @@ bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle \
 
 bindsym XF86AudioMicMute exec pactl set-source-mute @DEFAULT_SOURCE@ toggle
 
-bindsym XF86MonBrightnessDown exec brightnessctl set 5%-
-bindsym XF86MonBrightnessUp exec brightnessctl set 5%+
+bindsym XF86MonBrightnessDown exec brightnessctl set 2%-
+bindsym XF86MonBrightnessUp exec brightnessctl set 2%+
 
-bindsym $mod+shift+p exec slurp | grim -g - - | tee ~/Pictures/$(date +%s).png | wl-copy 
+bindsym $mod+shift+p exec slurp | grim -g - - | tee ~/Pictures/$(date +%F-%s).png | wl-copy 
 
 bindgesture swipe:right workspace prev
 bindgesture swipe:left workspace next
diff --git a/.config/sway/config.d/swayfx b/.config/sway/config.d/swayfx
new file mode 100644
index 0000000..41eb488
--- /dev/null
+++ b/.config/sway/config.d/swayfx
@@ -0,0 +1,9 @@
+smart_corner_radius on
+
+corner_radius 8
+blur enable
+blur_passes 2
+blur_radius 2
+layer_effects "waybar" "blur enable"; shadows enable
+shadows on
+shadow_blur_radius 5
diff --git a/.config/swaylock/config b/.config/swaylock/config
new file mode 100644
index 0000000..d3bee1f
--- /dev/null
+++ b/.config/swaylock/config
@@ -0,0 +1,15 @@
+ignore-empty-password
+
+clock
+timestr=%R
+datestr=%a, %e of %B
+
+screenshots
+
+fade-in=0.2
+
+effect-blur=20x2
+#effect-greyscale
+effect-scale=0.3
+
+indicator
diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc
index fcbd344..8ad69d2 100644
--- a/.config/waybar/config.jsonc
+++ b/.config/waybar/config.jsonc
@@ -116,7 +116,7 @@
     "clock": {
         "timezone": "America/Los_Angeles",
         "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
-				"format": "{:%R%p %Y-%m-%d}",
+				"format": "{:%r %Y-%m-%d}",
 				//"format": "{:%R %p  %Y-%m-%d}",
         //"format-alt": "{:%Y-%m-%d}"
     },