diff --git a/conky/conkyrc b/conky/conkyrc
new file mode 100644
index 0000000..27384a2
--- /dev/null
+++ b/conky/conkyrc
@@ -0,0 +1,105 @@
+conky.config = {
+
+	--Various settings
+	background = true, 							-- forked to background
+	cpu_avg_samples = 2,						-- The number of samples to average for CPU monitoring.
+	diskio_avg_samples = 10,					-- The number of samples to average for disk I/O monitoring.
+	double_buffer = true,						-- Use the Xdbe extension? (eliminates flicker)
+	if_up_strictness = 'address',				-- how strict if testing interface is up - up, link or address
+	net_avg_samples = 2,						-- The number of samples to average for net data
+	no_buffers = true,							-- Subtract (file system) buffers from used memory?
+	temperature_unit = 'fahrenheit',			-- fahrenheit or celsius
+	text_buffer_size = 2048,					-- size of buffer for display of content of large variables - default 256
+	update_interval = 1,						-- update interval
+	imlib_cache_size = 0,                       -- disable image cache to get a new spotify cover per song
+
+	-- Placement (Conky on MIDDLE of THREE monitors at 1920x1080)
+	--alignment = 'top_left',		                -- top_left,top_middle,top_right,bottom_left,bottom_middle,bottom_right,
+	--gap_x = 3540,                               -- pixels between right or left border
+	--gap_y = 70,									-- pixels between bottom or left border
+
+    -- Placement (For SINGLE monitor users!)
+	alignment = 'top_right',		            -- top_left,top_middle,top_right,bottom_left,bottom_middle,bottom_right,
+	gap_x = 50,								-- pixels between right or left border
+	gap_y = 70,								-- pixels between bottom or left border
+
+    -- Size
+    minimum_height = 200,						-- minimum height of window
+	minimum_width = 260,						-- minimum width of window
+	maximum_width = 260,						-- maximum width of window
+
+	--Graphical
+	border_inner_margin = 5, 					-- margin between border and text
+	border_outer_margin = 5, 					-- margin between border and edge of window
+	border_width = 0, 							-- border width in pixels
+	default_bar_width = 260,					-- default is 0 - full width
+	default_bar_height = 10,					-- default is 6
+	default_gauge_height = 25,					-- default is 25
+	default_gauge_width =40,					-- default is 40
+	default_graph_height = 40,					-- default is 25
+	default_graph_width = 153,					-- default is 0 - full width
+	default_shade_color = '#000000',			-- default shading colour
+	default_outline_color = '#000000',			-- default outline colour
+	draw_borders = false,						-- draw borders around text
+	draw_graph_borders = true,					-- draw borders around graphs
+	draw_shades = false,						-- draw shades
+	draw_outline = false,						-- draw outline
+	stippled_borders = 0,						-- dashing the border
+
+	--Textual
+	format_human_readable = true,				-- KiB, MiB rather then number of bytes
+	font  = 'monospace:bold:size=14',  	-- the default font used
+	font2 = 'monospace:bold:size=18',         	-- font for the time
+	font3 = 'monospace:size=14',               	-- font for the date
+	font4 = 'monospace:bold:size=9',              -- font for the keybindings heading
+	max_text_width = 0,							-- 0 will make sure line does not get broken if width too smal
+	max_user_text = 16384,						-- max text in conky default 16384
+	override_utf8_locale = true,				-- force UTF8 requires xft
+	short_units = true,							-- shorten units from KiB to k
+	top_name_width = 21,						-- width for $top name value default 15
+	top_name_verbose = false,					-- If true, top name shows the full command line of  each  process - Default value is false.
+	uppercase = false,							-- uppercase or not
+	use_spacer = 'none',						-- adds spaces around certain objects to align - default none
+	use_xft = true,								-- xft font - anti-aliased font
+	xftalpha = 1,								-- alpha of the xft font - between 0-1
+
+	--Windows
+	own_window = true,							-- create your own window to draw
+	own_window_argb_value = 255,			    -- real transparency - composite manager required 0-255
+	own_window_argb_visual = true,				-- use ARGB - composite manager required
+	own_window_class = 'Conky',					-- manually set the WM_CLASS name for use with xprop
+	own_window_colour = '#1e1e2e',				-- set colour if own_window_transparent no
+	own_window_transparent = false,				-- if own_window_argb_visual is true sets background opacity 0%
+	own_window_title = 'conky',			        -- set the name manually
+	own_window_type = 'desktop',				-- if own_window true options are: normal/override/dock/desktop/panel
+	own_window_hints = 'undecorated,below,above,sticky,skip_taskbar,skip_pager',  -- if own_window true - just hints - own_window_type sets it
+
+	--catppuccin
+	color0 = '#C9CBFF',
+	color1 = '#D9E0EE',
+	color2 = '#89DCEB',
+	color3 = '#F2CDCD',
+	color4 = '#C3BAC6',
+    color5 = '#ABE9B3',
+    color6 = '#FAE3B0',
+};
+
+conky.text = [[
+${alignc}${color0}${font2}System Usage${font}
+${voffset 18}${goto 12}${color5}CPU${goto 50}
+${goto 12}$cpu%
+${color2}${goto 12}${cpubar 8,254}
+${voffset 5}${goto 12}$font${color1}${top name 1}$alignr$color${top cpu 1}%
+${goto 12}${color1}${top name 2}$alignr$color${top cpu 2}%
+${goto 12}${color1}${top name 3}$alignr$color${top cpu 3}%
+${voffset 14}${goto 12}${color6}RAM${goto 50}
+${goto 12}$mem/$memmax
+${color2}${goto 12}${membar 8,254}${color}
+${goto 12}${voffset 5}${color1}${top_mem name 1}$alignr$color${top_mem mem_res 1}
+${goto 12}${color1}${top_mem name 2}$alignr$color${top_mem mem_res 2}
+${goto 12}${color1}${top_mem name 3}$alignr$color${top_mem mem_res 3}
+${goto 12}${voffset 14}${color3}${font}File System 
+${goto 12}${color3}${fs_used /}/${fs_size /} 
+${goto 12}${color2}${fs_bar 8,254}
+]];
+
diff --git a/mako/config b/mako/config
index 89a65b0..1376602 100644
--- a/mako/config
+++ b/mako/config
@@ -1,4 +1,5 @@
 font=monospace 14
+default-timeout=30000
 
 # Colors
 
diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua
index 5bff1da..6098098 100644
--- a/nvim/lua/plugins.lua
+++ b/nvim/lua/plugins.lua
@@ -10,7 +10,8 @@ return require('packer').startup(function()
   use 'hoob3rt/lualine.nvim' -- status line
   use { -- file picker and grepper
     'nvim-telescope/telescope.nvim',
-    requires = { {'nvim-lua/plenary.nvim'} }
+    --requires = { {'nvim-lua/plenary.nvim', commit = '08e301982b9a057110ede7a735dd1b5285eb341f'} }
+    requires = { {'nvim-lua/plenary.nvim' } }
   }
   use 'nvim-telescope/telescope-ui-select.nvim' -- selector
   use 'gpanders/editorconfig.nvim'
@@ -28,9 +29,8 @@ return require('packer').startup(function()
   use 'mfussenegger/nvim-dap' -- debug adapter protocol
   use { -- gitgutter replacement
     'lewis6991/gitsigns.nvim',
-    requires = {
-      'nvim-lua/plenary.nvim'
-    }
+    --requires = { {'nvim-lua/plenary.nvim', commit = '08e301982b9a057110ede7a735dd1b5285eb341f'} }
+    requires = { {'nvim-lua/plenary.nvim' } }
   }
   use 'Pocco81/TrueZen.nvim' -- distraction free writing
   use 'https://code.sitosis.com/rudism/telescope-dict.nvim.git' -- thesaurus and dictionary
diff --git a/sway/config b/sway/config
index f5e02ba..5a4624d 100644
--- a/sway/config
+++ b/sway/config
@@ -6,8 +6,6 @@ set $wobpipe /run/user/1000/wobpipe
 exec mkfifo $wobpipe
 exec tail -f $wobpipe | wob
 
-exec swayidle -w timeout 300 'swaylock -f -c 000000' timeout 600 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' before-sleep 'swaylock -f -c 000000'
-
 floating_modifier $mod normal
 
 include /home/rudism/.config/sway/config.d/*
diff --git a/sway/config.d/01-theme b/sway/config.d/01-theme
index ef00f9e..1f93042 100644
--- a/sway/config.d/01-theme
+++ b/sway/config.d/01-theme
@@ -1,6 +1,7 @@
 output * bg /home/rudism/skynet/wallpaper/wallpaper.png fill
 
 default_border pixel 2
+default_floating_border pixel 2
 
 set $rosewater #f5e0dc
 set $flamingo #f2cdcd
diff --git a/sway/config.d/03-keybindings b/sway/config.d/03-keybindings
index 5fe4e8c..0f4225c 100644
--- a/sway/config.d/03-keybindings
+++ b/sway/config.d/03-keybindings
@@ -38,7 +38,7 @@ bindsym $mod+F9 move container to workspace number 9
 bindsym $mod+F10 move container to workspace number 10
 
 bindsym $mod+f fullscreen
-bindsym $mod+k splith
+bindsym $mod+i splith
 bindsym $mod+j splitv
 
 bindsym XF86AudioRaiseVolume exec pamixer -i 5 && pamixer --get-volume > $wobpipe
diff --git a/sway/config.d/04-windowcfg b/sway/config.d/04-windowcfg
index 55481c7..2e513f2 100644
--- a/sway/config.d/04-windowcfg
+++ b/sway/config.d/04-windowcfg
@@ -1,3 +1,4 @@
 for_window [app_id="org.speedcrunch.speedcrunch"] floating enable, sticky enable
 for_window [app_id="Firefox" title="Picture-in-Picture"] floating enable, sticky enable
 for_window [instance="bitwarden"] floating enable, sticky enable
+for_window [instance="Conky"] floating enable, sticky enable
diff --git a/sway/config.d/06-startup b/sway/config.d/06-startup
index 0a7f8a1..d02021e 100644
--- a/sway/config.d/06-startup
+++ b/sway/config.d/06-startup
@@ -1,3 +1,4 @@
+exec swayidle -w timeout 900 'swaylock -f -c 000000' timeout 1200 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' before-sleep 'swaylock -f -c 000000'
 exec dbus-update-activation-environment DISPLAY
 exec mako
 exec wl-paste -t text --watch clipman store
diff --git a/tmux/tmux.conf b/tmux/tmux.conf
index ea92e82..098576d 100644
--- a/tmux/tmux.conf
+++ b/tmux/tmux.conf
@@ -26,7 +26,7 @@ bind-key -T copy-mode-vi y send-keys -X copy-selection
 bind-key -T copy-mode-vi r send-keys -X rectangle-toggle
 
 bind r source-file ~/.tmux.conf \; display "tmux config reloaded :)"
-bind k split-window -h -c "#{pane_current_path}"
+bind i split-window -h -c "#{pane_current_path}"
 bind j split-window -v -c "#{pane_current_path}"
 
 set -s escape-time 0
diff --git a/zsh/zalias-borges b/zsh/zalias-borges
index 0205c7b..ad1ed62 100644
--- a/zsh/zalias-borges
+++ b/zsh/zalias-borges
@@ -11,6 +11,7 @@ hash -d og=/home/rudism/mri/cosmic/nasa/og
 hash -d schema=/home/rudism/mri/cosmic/api-schema
 hash -d a=/mnt/agrajag
 hash -d b=/mnt/beeblebrox
+hash -d c=/mnt/constantmown
 
 # command aliases
 alias nasavpn='/home/rudism/src/nasavpn/nasavpn'
diff --git a/zsh/zshrc b/zsh/zshrc
index 7ffb3b8..b8b4677 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -35,7 +35,7 @@ plug "sindresorhus/pure"
 plug "zsh-users/zsh-autosuggestions"
 plug "zsh-users/zsh-syntax-highlighting"
 plug "zpm-zsh/ls"
-plug "fdellwing/zsh-bat"
+ZAP_GIT_PREFIX="https://code.sitosis.com/" plug "rudism/zsh-bat"
 plug "lukechilds/zsh-nvm"
 plug "jeffreytse/zsh-vi-mode"