diff --git a/config/dunst/dunstrc b/config/dunst/dunstrc
new file mode 100644
index 0000000..def3d58
--- /dev/null
+++ b/config/dunst/dunstrc
@@ -0,0 +1,19 @@
+[global]
+icon_path = ""
+font = "JetBrains Mono 12"
+origin = bottom-right
+
+[urgency_low]
+    background = "#0d0e1c"
+    foreground = "#ffffff"
+    frame_color = "#79a8ff"
+
+[urgency_normal]
+    background = "#0d0e1c"
+    foreground = "#ffffff"
+    frame_color = "#79a8ff"
+
+[urgency_critical]
+    background = "#0d0e1c"
+    foreground = "#ff7f9f"
+    frame_color = "#ff7f9f"
diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf
index 24f00d7..a649338 100644
--- a/config/kitty/kitty.conf
+++ b/config/kitty/kitty.conf
@@ -5,6 +5,10 @@ shell_integration no-cursor
 
 text_composition_strategy legacy
 enable_audio_bell false
+confirm_os_window_close 0
+
+map kitty_mod+shift+t new_tab_with_cwd
+map kitty_mod+shift+n launch --cwd=current --type=os-window
 
 map alt+1 goto_tab 1
 map alt+2 goto_tab 2
@@ -15,3 +19,46 @@ map alt+6 goto_tab 6
 map alt+7 goto_tab 7
 map alt+8 goto_tab 8
 map alt+9 goto_tab 9
+
+background #0d0e1c
+foreground #ffffff
+selection_background #7030af
+selection_foreground #ffffff
+url_color #c6daff
+cursor #ffffff
+cursor_text_color #0d0e1c
+
+# Tabs
+active_tab_background #0d0e1c
+active_tab_foreground #c6daff
+inactive_tab_background #4a4f6a
+inactive_tab_foreground #ffffff
+#tab_bar_background #2c3045
+
+# Windows
+active_border_color #79a8ff
+inactive_border_color #61647a
+
+# normal
+color0 #0d0e1c
+color1 #ff5f59
+color2 #44bc44
+color3 #d0bc00
+color4 #2fafff
+color5 #feacd0
+color6 #00d3d0
+color7 #ffffff
+
+# bright
+color8 #1d2235
+color9 #ff5f5f
+color10 #44df44
+color11 #efef00
+color12 #338fff
+color13 #ff66ff
+color14 #00eff0
+color15 #989898
+
+# extended colors
+color16 #fec43f
+color17 #ff9f80
diff --git a/config/sway/bar.sh b/config/sway/bar.sh
new file mode 100755
index 0000000..2ee674e
--- /dev/null
+++ b/config/sway/bar.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+date=$(date +'%A, %b %d')
+time=$(date +'%I:%M %p')
+user=$(whoami)
+hostname=$(hostname)
+volume=$(pamixer --get-volume)
+
+# => Friday, Mar 05 | 03:47 PM
+echo "$user@$hostname | $volume% | | $date | $time"
diff --git a/config/sway/bg.jpg b/config/sway/bg.jpg
new file mode 100644
index 0000000..0d673a1
Binary files /dev/null and b/config/sway/bg.jpg differ
diff --git a/config/sway/bg1.jpg b/config/sway/bg1.jpg
new file mode 100644
index 0000000..37b75ba
Binary files /dev/null and b/config/sway/bg1.jpg differ
diff --git a/config/sway/config b/config/sway/config
index a1ab977..735137e 100644
--- a/config/sway/config
+++ b/config/sway/config
@@ -1,234 +1,144 @@
-# Default config for sway~/
-#
-# Copy this to ~/.config/sway/config and edit it to your liking.
-#
-# Read `man 5 sway` for a complete reference.
+# Sway config for hunterstasonis
 
-### Variables
-#
-# Logo key. Use Mod1 for Alt.
 set $mod Mod4
-# Home row direction keys, like vim
+
 set $left h
 set $down j
 set $up k
 set $right l
-# Your preferred terminal emulator
+
 set $term kitty
-# Your preferred application launcher
 set $menu rofi
 
 # Startup commands
 exec dunst
 
-### Output configuration
-#
-# Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/)
-#output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
-output * bg /home/hunterstasonis/.config/sway/bg.jpg fill
-#
-# Example configuration:
-#
+# Looks, super small gap/pixel border
+default_border pixel 5
+gaps inner 5
+
+client.focused #0d0e1c #0d0e1c #ffffff #0d0e1c
+client.focused_inactive #2b3045 #2b3045 #ffffff #2b3045
+client.unfocused #2b3045 #2b3045 #ffffff #2b3045
+
+# Wallpaper & Display/DPI
+output * bg /home/hunterstasonis/.config/sway/bg1.jpg fill
 output DP-3 scale 1.75
-#
-# You can get the names of your outputs by running: swaymsg -t get_outputs
 
-### Idle configuration
-#
-# Example configuration:
-#
-# 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'
-#
-# This will lock your screen after 300 seconds of inactivity, then turn off
-# your displays after another 300 seconds, and turn your screens back on when
-# resumed. It will also lock your screen before your computer goes to sleep.
 
-### Input configuration
-#
-# Example configuration:
 input * repeat_delay 200
 input * repeat_rate 50
-#
-#   input "2:14:SynPS/2_Synaptics_TouchPad" {
-#       dwt enabled
-#       tap enabled
-#       natural_scroll enabled
-#       middle_emulation enabled
-#   }
-#
-# You can get the names of your inputs by running: swaymsg -t get_inputs
-# Read `man 5 sway-input` for more information about this section.
+input * xkb_options caps:escape
 
-### Key bindings
-#
-# Basics:
-#
-    # Start a terminal
-    bindsym $mod+Return exec $term
+# Start a terminal
+bindsym $mod+Return exec $term
+bindsym $mod+Shift+s exec sway-screenshot -m region
 
-    bindsym $mod+Shift+s exec sway-screenshot -m region
+# Kill focused window
+bindsym $mod+Shift+q kill
 
-    # Kill focused window
-    bindsym $mod+Shift+q kill
+# Application launcher
+bindsym $mod+d exec $menu -show drun
 
-    # Application launcher
-    bindsym $mod+d exec $menu -show drun
+# Executable launcher
+bindsym $mod+Shift+r exec $menu -show run
 
-    # Executable launcher
-    bindsym $mod+Shift+r exec $menu -show run
+floating_modifier $mod normal
 
-    # Drag floating windows by holding down $mod and left mouse button.
-    # Resize them with right mouse button + $mod.
-    # Despite the name, also works for non-floating windows.
-    # Change normal to inverse to use left mouse button for resizing and right
-    # mouse button for dragging.
-    floating_modifier $mod normal
+# Reload the configuration file
+bindsym $mod+Shift+c reload
 
-    # Reload the configuration file
-    bindsym $mod+Shift+c reload
+# Exit sway (logs you out of your Wayland session)
+bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit'
+bindsym $mod+Shift+grave exec bash ~/git/config/scripts/lock.sh
 
-    # Exit sway (logs you out of your Wayland session)
-    bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit'
-#
-# Moving around:
-#
-    # Move your focus around
-    bindsym $mod+$left focus left
-    bindsym $mod+$down focus down
-    bindsym $mod+$up focus up
-    bindsym $mod+$right focus right
-    # Or use $mod+[up|down|left|right]
-    bindsym $mod+Left focus left
-    bindsym $mod+Down focus down
-    bindsym $mod+Up focus up
-    bindsym $mod+Right focus right
+# Move your focus around
+bindsym $mod+$left focus left
+bindsym $mod+$down focus down
+bindsym $mod+$up focus up
+bindsym $mod+$right focus right
 
-    # Move the focused window with the same, but add Shift
-    bindsym $mod+Shift+$left move left
-    bindsym $mod+Shift+$down move down
-    bindsym $mod+Shift+$up move up
-    bindsym $mod+Shift+$right move right
-    # Ditto, with arrow keys
-    bindsym $mod+Shift+Left move left
-    bindsym $mod+Shift+Down move down
-    bindsym $mod+Shift+Up move up
-    bindsym $mod+Shift+Right move right
-#
-# Workspaces:
-#
-    # Switch to workspace
-    bindsym $mod+1 workspace number 1
-    bindsym $mod+2 workspace number 2
-    bindsym $mod+3 workspace number 3
-    bindsym $mod+4 workspace number 4
-    bindsym $mod+5 workspace number 5
-    bindsym $mod+6 workspace number 6
-    bindsym $mod+7 workspace number 7
-    bindsym $mod+8 workspace number 8
-    bindsym $mod+9 workspace number 9
-    bindsym $mod+0 workspace number 10
-    # Move focused container to workspace
-    bindsym $mod+Shift+1 move container to workspace number 1
-    bindsym $mod+Shift+2 move container to workspace number 2
-    bindsym $mod+Shift+3 move container to workspace number 3
-    bindsym $mod+Shift+4 move container to workspace number 4
-    bindsym $mod+Shift+5 move container to workspace number 5
-    bindsym $mod+Shift+6 move container to workspace number 6
-    bindsym $mod+Shift+7 move container to workspace number 7
-    bindsym $mod+Shift+8 move container to workspace number 8
-    bindsym $mod+Shift+9 move container to workspace number 9
-    bindsym $mod+Shift+0 move container to workspace number 10
-    # Note: workspaces can have any name you want, not just numbers.
-    # We just use 1-10 as the default.
-#
-# Layout stuff:
-#
-    # You can "split" the current object of your focus with
-    # $mod+b or $mod+v, for horizontal and vertical splits
-    # respectively.
-    bindsym $mod+b splith
-    bindsym $mod+v splitv
+# Move the focused window with the same, but add Shift
+bindsym $mod+Shift+$left move left
+bindsym $mod+Shift+$down move down
+bindsym $mod+Shift+$up move up
+bindsym $mod+Shift+$right move right
 
-    # Make the current focus fullscreen
-    bindsym $mod+f fullscreen
+# Switch to workspace
+bindsym $mod+1 workspace number 1
+bindsym $mod+2 workspace number 2
+bindsym $mod+3 workspace number 3
+bindsym $mod+4 workspace number 4
+bindsym $mod+5 workspace number 5
+bindsym $mod+6 workspace number 6
+bindsym $mod+7 workspace number 7
+bindsym $mod+8 workspace number 8
+bindsym $mod+9 workspace number 9
+bindsym $mod+0 workspace number 10
 
-    # Toggle the current focus between tiling and floating mode
-    bindsym $mod+Shift+space floating toggle
+# Move focused container to workspace
+bindsym $mod+Shift+1 move container to workspace number 1
+bindsym $mod+Shift+2 move container to workspace number 2
+bindsym $mod+Shift+3 move container to workspace number 3
+bindsym $mod+Shift+4 move container to workspace number 4
+bindsym $mod+Shift+5 move container to workspace number 5
+bindsym $mod+Shift+6 move container to workspace number 6
+bindsym $mod+Shift+7 move container to workspace number 7
+bindsym $mod+Shift+8 move container to workspace number 8
+bindsym $mod+Shift+9 move container to workspace number 9
+bindsym $mod+Shift+0 move container to workspace number 10
 
-    # Swap focus between the tiling area and the floating area
-    bindsym $mod+space focus mode_toggle
+bindsym $mod+b splith
+bindsym $mod+v splitv
 
-    # Move focus to the parent container
-    bindsym $mod+a focus parent
-#
-# Scratchpad:
-#
-    # Sway has a "scratchpad", which is a bag of holding for windows.
-    # You can send windows there and get them back later.
+bindsym $mod+w layout tabbed
+
+# Make the current focus fullscreen
+bindsym $mod+f fullscreen
+
+# Toggle the current focus between tiling and floating mode
+bindsym $mod+Shift+space floating toggle
+
+# Swap focus between the tiling area and the floating area
+bindsym $mod+space focus mode_toggle
+
+# Move the currently focused window to the scratchpad
+bindsym $mod+Shift+minus move scratchpad
+bindsym $mod+minus scratchpad show
 
-    # Move the currently focused window to the scratchpad
-    bindsym $mod+Shift+minus move scratchpad
 
-    # Show the next scratchpad window or hide the focused scratchpad window.
-    # If there are multiple scratchpad windows, this command cycles through them.
-    bindsym $mod+minus scratchpad show
-#
-# Resizing containers:
-#
 mode "resize" {
-    # left will shrink the containers width
-    # right will grow the containers width
-    # up will shrink the containers height
-    # down will grow the containers height
     bindsym $left resize shrink width 10px
     bindsym $down resize grow height 10px
     bindsym $up resize shrink height 10px
     bindsym $right resize grow width 10px
 
-    # Ditto, with arrow keys
-    bindsym Left resize shrink width 10px
-    bindsym Down resize grow height 10px
-    bindsym Up resize shrink height 10px
-    bindsym Right resize grow width 10px
-
     # Return to default mode
     bindsym Return mode "default"
     bindsym Escape mode "default"
 }
-bindsym $mod+r mode "resize"
-#
-# Utilities:
-#
 
-# Special keys to adjust volume via PulseAudio
+bindsym $mod+r mode "resize"
+
+# Adjust volume
 bindsym --locked XF86AudioMute exec pactl set-sink-mute \@DEFAULT_SINK@ toggle
 bindsym --locked XF86AudioLowerVolume exec pactl set-sink-volume \@DEFAULT_SINK@ -5%
 bindsym --locked XF86AudioRaiseVolume exec pactl set-sink-volume \@DEFAULT_SINK@ +5%
 bindsym --locked XF86AudioMicMute exec pactl set-source-mute \@DEFAULT_SOURCE@ toggle
 
-# Special keys to adjust brightness via brightnessctl
-bindsym --locked XF86MonBrightnessDown exec brightnessctl set 5%-
-bindsym --locked XF86MonBrightnessUp exec brightnessctl set 5%+
-
-# Special key to take a screenshot with grim
-bindsym Print exec grim
-
-#
-# Status Bar:
-#
-# Read `man 5 sway-bar` for more information about this section.
-
-# Status Bar:
 bar {
     position bottom
+    font JetBrains Mono 12
 
-    status_command while date +'%Y-%m-%d %I:%M:%S %p'; do sleep 1; done
+    colors {
+        background #0d0e1c 
+        statusline #ffffff
+
+        focused_workspace #4a4f69 #4a4f69 #f4f4f4
+        inactive_workspace #2b3045 #2b3045 #bfc0c4
+    }
+
+    status_command while ~/.config/sway/bar.sh; do sleep 1; done
 }
 
 include /etc/sway/config.d/*
-
-default_border pixel 0
-gaps inner 10
diff --git a/screenshot1.png b/screenshot1.png
index d4017d2..66e9ad7 100644
Binary files a/screenshot1.png and b/screenshot1.png differ
diff --git a/screenshot2.png b/screenshot2.png
index ff0c833..459d7c0 100644
Binary files a/screenshot2.png and b/screenshot2.png differ
diff --git a/scripts/lock.sh b/scripts/lock.sh
new file mode 100644
index 0000000..15cdd5a
--- /dev/null
+++ b/scripts/lock.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+swaynag -t warning -m 'Locking screen...' & disown
+
+grim -t jpeg /tmp/lock.png
+
+magick /tmp/lock.png -scale 10% -blur 0x2.5 -resize 1000% /tmp/lock.png
+
+swaylock -s fill -i /tmp/lock.png