diff --git a/fish b/fish
index b3021e9..bba5c66 160000
--- a/fish
+++ b/fish
@@ -1 +1 @@
-Subproject commit b3021e9e5d3d62107298f2f98f9e9aca742f047d
+Subproject commit bba5c66149b42c370acc3765abd306fc8e3f3c3a
diff --git a/sway/catppuccin-mocha b/sway/catppuccin-mocha
new file mode 100644
index 0000000..686a5a2
--- /dev/null
+++ b/sway/catppuccin-mocha
@@ -0,0 +1,25 @@
+set $rosewater #f5e0dc
+set $flamingo  #f2cdcd
+set $pink      #f5c2e7
+set $mauve     #cba6f7
+set $red       #f38ba8
+set $maroon    #eba0ac
+set $peach     #fab387
+set $green     #a6e3a1
+set $teal      #94e2d5
+set $sky       #89dceb
+set $sapphire  #74c7ec
+set $blue      #89b4fa
+set $lavender  #b4befe
+set $text      #cdd6f4
+set $subtext1  #bac2de
+set $subtext0  #a6adc8
+set $overlay2  #9399b2
+set $overlay1  #7f849c
+set $overlay0  #6c7086
+set $surface2  #585b70
+set $surface1  #45475a
+set $surface0  #313244
+set $base      #1e1e2e
+set $mantle    #181825
+set $crust     #11111b
diff --git a/sway/config b/sway/config
new file mode 100644
index 0000000..5dfd30c
--- /dev/null
+++ b/sway/config
@@ -0,0 +1,275 @@
+
+# Default config for sway
+#
+# Copy this to ~/.config/sway/config and edit it to your liking.
+#
+# Read `man 5 sway` for a complete reference.
+
+### 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 alacritty
+set $files alacritty -t XPLR -e fish -c xplr
+set $menu fd --glob '*.desktop' /usr/share/applications/ $HOME/.local/share/applications/ | sed -E 's:^(.+)\\/([^\\/]+)$:\2:' | fzfmenu | xargs gtk-launch
+set $menu fd --glob '*.desktop' /usr/share/applications/ $HOME/.local/share/applications/ -X rg -or '$2' "(Name\[en_GB]=|Name=)(.*)" -N -I -m 1 --trim | fzfmenu | fd --ignore-case "Freetube" /usr/share/applications/ $HOME/.local/share/applications/ | sed -E 's:^(.+)\\/([^\\/]+)$:\2:' | xargs gtk-launch
+set $music "fd --type d --base-directory $HOME/Music | fzfmusic | awk '{$1=$1;print}' | mpc add"
+
+### Output configuration
+#
+# Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/)
+output * bg /home/erin/Pictures/Art/ship-cat.png fill
+
+#
+# Example configuration:
+#
+#   output HDMI-A-1 resolution 1920x1080 position 1920,0
+#
+# 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 "2:7: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.
+
+### Key bindings
+#
+# Basics:
+#
+    # Start a terminal
+    bindsym $mod+Return exec $term
+    # Start file manager
+    bindsym $mod+f exec $files
+
+    # Screenshot
+    bindsym $mod+p exec grim -g "$(slurp)" $(xdg-user-dir PICTURES)/$(date +'%s_grim.png')
+
+    #Lock screen
+    bindsym Ctrl+Shift+l exec /home/erin/.config/swaylock/lock.sh 40
+
+    # Kill focused window
+    bindsym $mod+Shift+q kill
+
+    # Start your launcher
+    bindsym $mod+d exec $menu
+    bindsym $mod+m exec $music
+    bindsym $mod+n exec $HOME/.config/rofi/bin/powermenu
+
+    # 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
+
+    # 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'
+
+    # Audio
+	bindsym --locked XF86AudioRaiseVolume exec volumectl -u up 2
+	bindsym --locked XF86AudioLowerVolume exec volumectl -u down 2
+	bindsym --locked XF86AudioMute exec volumectl toggle-mute
+	bindsym --locked XF86AudioMicMute exec volumectl -m toggle-mute
+
+	bindsym --locked XF86AudioPlay exec mpc toggle
+	bindsym --locked XF86AudioStop exec mpc toggle
+	bindsym --locked XF86AudioNext exec mpc next
+	bindsym --locked XF86AudioPRev exec mpc prev
+
+    #Brightness
+	bindsym XF86MonBrightnessUp exec lightctl up 2
+	bindsym XF86MonBrightnessDown exec lightctl down 2
+#
+# 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 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
+
+    # Switch the current container between different layout styles
+    bindsym $mod+s layout stacking
+    bindsym $mod+w layout tabbed
+    bindsym $mod+e layout toggle split
+
+    # Make the current focus fullscreen
+    bindsym $mod+Shift+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 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.
+
+    # 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"
+
+#
+# Status Bar:
+#
+# Read `man 5 sway-bar` for more information about this section.
+#bar {
+#    position top
+
+    # When the status_command prints a new line to stdout, swaybar updates.
+    # The default just shows the current date and time.
+#    status_command while date +'%Y-%m-%d %I:%M %p'; do sleep 1; done
+
+#    colors {
+#        statusline #F5E0DC
+#        background #1A1826
+#        inactive_workspace #32323200 #32323200 #5c5c5c
+#		separator #988BA2
+#		focused_workspace #DDB6F2 #575268 #F5E0DC
+#    }
+
+#    tray_padding 2
+#    tray_bindsym button1 Activate
+#    tray_bindsym button2 Contextmenu
+#}
+
+
+font pango:Cozette Regular 10
+hide_edge_borders none
+gaps inner 6
+gaps outer 4
+
+bar swaybar_command waybar
+exec "avizo-service"
+exec pipewire &
+exec pipewire-pulse &
+exec wlsunset -l 50 -L -85 &
+exec bun &
+exec blueman-applet &
+exec mpd
+exec_always --no-startup-id mako &
+
+include /etc/sway/config.d/*
+include catppuccin-mocha
+client.focused $flamingo $base $text $green $pink
+client.focused_inactive $rosewater $mantle $subtext0 $green $mauve
+client.unfocused $rosewater $crust $subtext0 $flamingo $mauve
+client.urgent $peach $base $peach $overlay0 $peach
+client.placeholder $overlay0 $base $text $overlay0 $overlay0
+client.background $base
+
+for_window [app_id="fzf-menu"] floating enable;sticky enable;border none;