diff --git a/configs/kitty_g/themed/catppuccin/kitty.conf b/configs/kitty_g/themed/catppuccin/kitty.conf
new file mode 100644
index 0000000..f4f4ad9
--- /dev/null
+++ b/configs/kitty_g/themed/catppuccin/kitty.conf
@@ -0,0 +1,15 @@
+font_family ComicCode Nerd Font
+bold_font ComicCode Nerd Font Bold
+italic_font ComicCode Nerd Font Italic
+bold_italic_font ComicCode Nerd Font Bold Italic
+font_size 10.0
+background_opacity 1
+bold_font auto
+italic_font auto
+bold_italic_font auto
+hide_window_decorations yes
+confirm_os_window_close 0
+enable_audio_bell no
+window_padding_width 25
+
+include /home/toniiz/.config/kitty/themes/mocha.conf
diff --git a/configs/kitty_g/themed/catppuccin/themes/mocha.conf b/configs/kitty_g/themed/catppuccin/themes/mocha.conf
new file mode 100644
index 0000000..f37adf9
--- /dev/null
+++ b/configs/kitty_g/themed/catppuccin/themes/mocha.conf
@@ -0,0 +1,80 @@
+# vim:ft=kitty
+
+## name: Catppuccin Kitty Mocha
+## author: Catppuccin Org
+## license: MIT
+## upstream: https://github.com/catppuccin/kitty/blob/main/themes/mocha.conf
+## blurb: Soothing pastel theme for the high-spirited!
+
+
+
+# The basic colors
+foreground #cdd6f4
+background #1e1e2e
+selection_foreground #1e1e2e
+selection_background #f5e0dc
+
+# Cursor colors
+cursor #f5e0dc
+cursor_text_color #1e1e2e
+
+# URL underline color when hovering with mouse
+url_color #f5e0dc
+
+# Kitty window border colors
+active_border_color #b4befe
+inactive_border_color #6c7086
+bell_border_color #f9e2af
+
+# OS Window titlebar colors
+wayland_titlebar_color system
+macos_titlebar_color system
+
+# Tab bar colors
+active_tab_foreground #11111b
+active_tab_background #cba6f7
+inactive_tab_foreground #cdd6f4
+inactive_tab_background #181825
+tab_bar_background #11111b
+
+# Colors for marks (marked text in the terminal)
+mark1_foreground #1e1e2e
+mark1_background #b4befe
+mark2_foreground #1e1e2e
+mark2_background #cba6f7
+mark3_foreground #1e1e2e
+mark3_background #74c7ec
+
+# The 16 terminal colors
+
+# black
+color0 #45475a
+color8 #585b70
+
+# red
+color1 #f38ba8
+color9 #f38ba8
+
+# green
+color2 #a6e3a1
+color10 #a6e3a1
+
+# yellow
+color3 #f9e2af
+color11 #f9e2af
+
+# blue
+color4 #89b4fa
+color12 #89b4fa
+
+# magenta
+color5 #f5c2e7
+color13 #f5c2e7
+
+# cyan
+color6 #94e2d5
+color14 #94e2d5
+
+# white
+color7 #bac2de
+color15 #a6adc8
diff --git a/configs/kitty_g/gruvbox/kitty.uneditted.conf b/configs/kitty_g/themed/gruvbox/kitty.uneditted.conf
similarity index 100%
rename from configs/kitty_g/gruvbox/kitty.uneditted.conf
rename to configs/kitty_g/themed/gruvbox/kitty.uneditted.conf
diff --git a/configs/kitty_g/gruvbox/kitty.windows_yes.conf b/configs/kitty_g/themed/gruvbox/kitty.windows_yes.conf
similarity index 100%
rename from configs/kitty_g/gruvbox/kitty.windows_yes.conf
rename to configs/kitty_g/themed/gruvbox/kitty.windows_yes.conf
diff --git a/configs/swaync/themed/catppuccin/README.md b/configs/swaync/themed/catppuccin/README.md
new file mode 100644
index 0000000..b8747ad
--- /dev/null
+++ b/configs/swaync/themed/catppuccin/README.md
@@ -0,0 +1,9 @@
+# Catppuccin for Swaync
+[Repo Github Link](https://github.com/catppuccin/swaync)
+
+## Installation
+
+1. Download your preferred flavor from the [latest release](https://github.com/catppuccin/swaync/releases/tag/v0.2.3)
+2. Rename the downloaded theme to **style.css** and put it into ~/.config/swaync/.
+3. If you're using a custom font, you will need to change the line font-family: 'Ubuntu Nerd Font' to your font of choice.
+4. Run swaync-client -rs to reload swaync css.
diff --git a/configs/swaync/themed/catppuccin/mocha.css b/configs/swaync/themed/catppuccin/mocha.css
new file mode 100644
index 0000000..e01c657
--- /dev/null
+++ b/configs/swaync/themed/catppuccin/mocha.css
@@ -0,0 +1,342 @@
+* {
+ all: unset;
+ font-size: 14px;
+ font-family: "FantasqueSansM Nerd Font";
+ transition: 200ms;
+}
+
+trough highlight {
+ background: #cdd6f4;
+}
+
+scale trough {
+ margin: 0rem 1rem;
+ background-color: #313244;
+ min-height: 8px;
+ min-width: 70px;
+}
+
+slider {
+ background-color: #89b4fa;
+}
+
+.floating-notifications.background .notification-row .notification-background {
+ box-shadow: 0 0 8px 0 rgba(0, 0, 0, 0.8), inset 0 0 0 1px #313244;
+ border-radius: 12.6px;
+ margin: 18px;
+ background-color: #1e1e2e;
+ color: #cdd6f4;
+ padding: 0;
+}
+
+.floating-notifications.background .notification-row .notification-background .notification {
+ padding: 7px;
+ border-radius: 12.6px;
+}
+
+.floating-notifications.background .notification-row .notification-background .notification.critical {
+ box-shadow: inset 0 0 7px 0 #f38ba8;
+}
+
+.floating-notifications.background .notification-row .notification-background .notification .notification-content {
+ margin: 7px;
+}
+
+.floating-notifications.background .notification-row .notification-background .notification .notification-content .summary {
+ color: #cdd6f4;
+}
+
+.floating-notifications.background .notification-row .notification-background .notification .notification-content .time {
+ color: #a6adc8;
+}
+
+.floating-notifications.background .notification-row .notification-background .notification .notification-content .body {
+ color: #cdd6f4;
+}
+
+.floating-notifications.background .notification-row .notification-background .notification > *:last-child > * {
+ min-height: 3.4em;
+}
+
+.floating-notifications.background .notification-row .notification-background .notification > *:last-child > * .notification-action {
+ border-radius: 7px;
+ color: #cdd6f4;
+ background-color: #313244;
+ box-shadow: inset 0 0 0 1px #45475a;
+ margin: 7px;
+}
+
+.floating-notifications.background .notification-row .notification-background .notification > *:last-child > * .notification-action:hover {
+ box-shadow: inset 0 0 0 1px #45475a;
+ background-color: #313244;
+ color: #cdd6f4;
+}
+
+.floating-notifications.background .notification-row .notification-background .notification > *:last-child > * .notification-action:active {
+ box-shadow: inset 0 0 0 1px #45475a;
+ background-color: #74c7ec;
+ color: #cdd6f4;
+}
+
+.floating-notifications.background .notification-row .notification-background .close-button {
+ margin: 7px;
+ padding: 2px;
+ border-radius: 6.3px;
+ color: #1e1e2e;
+ background-color: #f38ba8;
+}
+
+.floating-notifications.background .notification-row .notification-background .close-button:hover {
+ background-color: #eba0ac;
+ color: #1e1e2e;
+}
+
+.floating-notifications.background .notification-row .notification-background .close-button:active {
+ background-color: #f38ba8;
+ color: #1e1e2e;
+}
+
+.control-center {
+ box-shadow: 0 0 8px 0 rgba(0, 0, 0, 0.8), inset 0 0 0 1px #313244;
+ border-radius: 12.6px;
+ margin: 18px;
+ background-color: #1e1e2e;
+ color: #cdd6f4;
+ padding: 14px;
+}
+
+.control-center .widget-title > label {
+ color: #cdd6f4;
+ font-size: 1.3em;
+}
+
+.control-center .widget-title button {
+ border-radius: 7px;
+ color: #cdd6f4;
+ background-color: #313244;
+ box-shadow: inset 0 0 0 1px #45475a;
+ padding: 8px;
+}
+
+.control-center .widget-title button:hover {
+ box-shadow: inset 0 0 0 1px #45475a;
+ background-color: #585b70;
+ color: #cdd6f4;
+}
+
+.control-center .widget-title button:active {
+ box-shadow: inset 0 0 0 1px #45475a;
+ background-color: #74c7ec;
+ color: #1e1e2e;
+}
+
+.control-center .notification-row .notification-background {
+ border-radius: 7px;
+ color: #cdd6f4;
+ background-color: #313244;
+ box-shadow: inset 0 0 0 1px #45475a;
+ margin-top: 14px;
+}
+
+.control-center .notification-row .notification-background .notification {
+ padding: 7px;
+ border-radius: 7px;
+}
+
+.control-center .notification-row .notification-background .notification.critical {
+ box-shadow: inset 0 0 7px 0 #f38ba8;
+}
+
+.control-center .notification-row .notification-background .notification .notification-content {
+ margin: 7px;
+}
+
+.control-center .notification-row .notification-background .notification .notification-content .summary {
+ color: #cdd6f4;
+}
+
+.control-center .notification-row .notification-background .notification .notification-content .time {
+ color: #a6adc8;
+}
+
+.control-center .notification-row .notification-background .notification .notification-content .body {
+ color: #cdd6f4;
+}
+
+.control-center .notification-row .notification-background .notification > *:last-child > * {
+ min-height: 3.4em;
+}
+
+.control-center .notification-row .notification-background .notification > *:last-child > * .notification-action {
+ border-radius: 7px;
+ color: #cdd6f4;
+ background-color: #11111b;
+ box-shadow: inset 0 0 0 1px #45475a;
+ margin: 7px;
+}
+
+.control-center .notification-row .notification-background .notification > *:last-child > * .notification-action:hover {
+ box-shadow: inset 0 0 0 1px #45475a;
+ background-color: #313244;
+ color: #cdd6f4;
+}
+
+.control-center .notification-row .notification-background .notification > *:last-child > * .notification-action:active {
+ box-shadow: inset 0 0 0 1px #45475a;
+ background-color: #74c7ec;
+ color: #cdd6f4;
+}
+
+.control-center .notification-row .notification-background .close-button {
+ margin: 7px;
+ padding: 2px;
+ border-radius: 6.3px;
+ color: #1e1e2e;
+ background-color: #eba0ac;
+}
+
+.close-button {
+ border-radius: 6.3px;
+}
+
+.control-center .notification-row .notification-background .close-button:hover {
+ background-color: #f38ba8;
+ color: #1e1e2e;
+}
+
+.control-center .notification-row .notification-background .close-button:active {
+ background-color: #f38ba8;
+ color: #1e1e2e;
+}
+
+.control-center .notification-row .notification-background:hover {
+ box-shadow: inset 0 0 0 1px #45475a;
+ background-color: #7f849c;
+ color: #cdd6f4;
+}
+
+.control-center .notification-row .notification-background:active {
+ box-shadow: inset 0 0 0 1px #45475a;
+ background-color: #74c7ec;
+ color: #cdd6f4;
+}
+
+.notification.critical progress {
+ background-color: #f38ba8;
+}
+
+.notification.low progress,
+.notification.normal progress {
+ background-color: #89b4fa;
+}
+
+.control-center-dnd {
+ margin-top: 5px;
+ border-radius: 8px;
+ background: #313244;
+ border: 1px solid #45475a;
+ box-shadow: none;
+}
+
+.control-center-dnd:checked {
+ background: #313244;
+}
+
+.control-center-dnd slider {
+ background: #45475a;
+ border-radius: 8px;
+}
+
+.widget-dnd {
+ margin: 0px;
+ font-size: 1.1rem;
+}
+
+.widget-dnd > switch {
+ font-size: initial;
+ border-radius: 8px;
+ background: #313244;
+ border: 1px solid #45475a;
+ box-shadow: none;
+}
+
+.widget-dnd > switch:checked {
+ background: #313244;
+}
+
+.widget-dnd > switch slider {
+ background: #45475a;
+ border-radius: 8px;
+ border: 1px solid #6c7086;
+}
+
+.widget-mpris .widget-mpris-player {
+ background: #313244;
+ padding: 7px;
+}
+
+.widget-mpris .widget-mpris-title {
+ font-size: 1.2rem;
+}
+
+.widget-mpris .widget-mpris-subtitle {
+ font-size: 0.8rem;
+}
+
+.widget-menubar > box > .menu-button-bar > button > label {
+ font-size: 3rem;
+ padding: 0.5rem 2rem;
+}
+
+.widget-menubar > box > .menu-button-bar > :last-child {
+ color: #f38ba8;
+}
+
+.power-buttons button:hover,
+.powermode-buttons button:hover,
+.screenshot-buttons button:hover {
+ background: #313244;
+}
+
+.control-center .widget-label > label {
+ color: #cdd6f4;
+ font-size: 2rem;
+}
+
+.widget-buttons-grid {
+ padding-top: 1rem;
+}
+
+.widget-buttons-grid > flowbox > flowboxchild > button label {
+ font-size: 2.5rem;
+}
+
+.widget-volume {
+ padding-top: 1rem;
+}
+
+.widget-volume label {
+ font-size: 1.5rem;
+ color: #74c7ec;
+}
+
+.widget-volume trough highlight {
+ background: #74c7ec;
+}
+
+.widget-backlight trough highlight {
+ background: #f9e2af;
+}
+
+.widget-backlight label {
+ font-size: 1.5rem;
+ color: #f9e2af;
+}
+
+.widget-backlight .KB {
+ padding-bottom: 1rem;
+}
+
+.image {
+ padding-right: 0.5rem;
+}
diff --git a/configs/waybar_l/themed/catppuccin/hyprland/config b/configs/waybar_l/themed/catppuccin/hyprland/config
new file mode 100644
index 0000000..f89bd6f
--- /dev/null
+++ b/configs/waybar_l/themed/catppuccin/hyprland/config
@@ -0,0 +1,71 @@
+{
+ "layer": "top", // Waybar at top layer
+ "position": "top", // Waybar position (top|bottom|left|right)
+ // "width": 1280, // Waybar width
+ // Choose the order of the modules
+ "modules-left": ["hyprland/workspaces"],
+ "modules-center": ["custom/music"],
+ "modules-right": ["pulseaudio", "backlight", "battery", "clock", "tray", "custom/lock", "custom/power"],
+ "hyprland/workspaces": {
+ "disable-scroll": true,
+ "sort-by-name": true,
+ "format": " {icon} ",
+ "format-icons": {
+ "default": "",
+ },
+ },
+ "tray": {
+ "icon-size": 21,
+ "spacing": 10
+ },
+ "custom/music": {
+ "format": " {}",
+ "escape": true,
+ "interval": 5,
+ "tooltip": false,
+ "exec": "playerctl metadata --format='{{ title }}'",
+ "on-click": "playerctl play-pause",
+ "max-length": 50
+ },
+ "clock": {
+ "timezone": "Asia/Dubai",
+ "tooltip-format": "{:%Y %B}\n{calendar}",
+ "format-alt": " {:%d/%m/%Y}",
+ "format": " {:%H:%M}"
+ },
+ "backlight": {
+ "device": "intel_backlight",
+ "format": "{icon}",
+ "format-icons": ["", "", "", "", "", "", "", "", ""]
+ },
+ "battery": {
+ "states": {
+ "warning": 30,
+ "critical": 15
+ },
+ "format": "{icon}",
+ "format-charging": "",
+ "format-plugged": "",
+ "format-alt": "{icon}",
+ "format-icons": ["", "", "", "", "", "", "", "", "", "", "", ""]
+ },
+ "pulseaudio": {
+ // "scroll-step": 1, // %, can be a float
+ "format": "{icon} {volume}%",
+ "format-muted": "",
+ "format-icons": {
+ "default": ["", "", " "]
+ },
+ "on-click": "pavucontrol"
+ },
+ "custom/lock": {
+ "tooltip": false,
+ "on-click": "sh -c '(sleep 0.5s; swaylock --grace 0)' & disown",
+ "format": "",
+ },
+ "custom/power": {
+ "tooltip": false,
+ "on-click": "wlogout &",
+ "format": "襤"
+ }
+}
diff --git a/configs/waybar_l/themed/catppuccin/sway/config b/configs/waybar_l/themed/catppuccin/sway/config
new file mode 100644
index 0000000..225ab51
--- /dev/null
+++ b/configs/waybar_l/themed/catppuccin/sway/config
@@ -0,0 +1,71 @@
+{
+ "layer": "top", // Waybar at top layer
+ "position": "top", // Waybar position (top|bottom|left|right)
+ // "width": 1280, // Waybar width
+ // Choose the order of the modules
+ "modules-left": ["sway/workspaces"],
+ "modules-center": ["custom/music"],
+ "modules-right": ["pulseaudio", "backlight", "battery", "clock", "tray", "custom/lock", "custom/power"],
+ "sway/workspaces": {
+ "disable-scroll": true,
+ "sort-by-name": true,
+ "format": " {icon} ",
+ "format-icons": {
+ "default": "",
+ },
+ },
+ "tray": {
+ "icon-size": 21,
+ "spacing": 10
+ },
+ "custom/music": {
+ "format": " {}",
+ "escape": true,
+ "interval": 5,
+ "tooltip": false,
+ "exec": "playerctl metadata --format='{{ title }}'",
+ "on-click": "playerctl play-pause",
+ "max-length": 50
+ },
+ "clock": {
+ "timezone": "Asia/Dubai",
+ "tooltip-format": "{:%Y %B}\n{calendar}",
+ "format-alt": " {:%d/%m/%Y}",
+ "format": " {:%H:%M}"
+ },
+ "backlight": {
+ "device": "intel_backlight",
+ "format": "{icon}",
+ "format-icons": ["", "", "", "", "", "", "", "", ""]
+ },
+ "battery": {
+ "states": {
+ "warning": 30,
+ "critical": 15
+ },
+ "format": "{icon}",
+ "format-charging": "",
+ "format-plugged": "",
+ "format-alt": "{icon}",
+ "format-icons": ["", "", "", "", "", "", "", "", "", "", "", ""]
+ },
+ "pulseaudio": {
+ // "scroll-step": 1, // %, can be a float
+ "format": "{icon} {volume}%",
+ "format-muted": "",
+ "format-icons": {
+ "default": ["", "", " "]
+ },
+ "on-click": "pavucontrol"
+ },
+ "custom/lock": {
+ "tooltip": false,
+ "on-click": "sh -c '(sleep 0.5s; swaylock --grace 0)' & disown",
+ "format": "",
+ },
+ "custom/power": {
+ "tooltip": false,
+ "on-click": "wlogout &",
+ "format": "襤"
+ }
+}