diff --git a/.gitmodules b/.gitmodules
index f81a3b7..077118c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,3 +10,6 @@
 [submodule "config/alacritty/themes/rose-pine"]
 	path = config/alacritty/themes/rose-pine
 	url = https://github.com/rose-pine/alacritty.git
+[submodule "Sway Catppuccin Theme"]
+	path = config/sway/themes/catppuccin
+	url = https://github.com/catppuccin/i3.git
diff --git a/config/sway/config b/config/sway/config
index 0df742f..928c69a 100644
--- a/config/sway/config
+++ b/config/sway/config
@@ -266,7 +266,17 @@ bindgesture swipe:up scratchpad show
 gaps inner 10
 gaps outer 2
 default_border pixel 2
+smart_borders on
 default_floating_border pixel 2
 
 xwayland enable
 
+include ./themes/catppuccin/themes/catppuccin-macchiato
+
+# target                 title     bg    text   indicator  border
+client.focused           $teal     $base $text  $teal      $teal
+client.focused_inactive  $base     $base $text  $base      $base
+client.unfocused         $base     $base $text  $base      $base
+client.urgent            $peach    $base $peach $peach     $peach
+client.placeholder       $overlay0 $base $text  $overlay0  $overlay0
+client.background        $base
diff --git a/config/sway/themes/catppuccin b/config/sway/themes/catppuccin
new file mode 160000
index 0000000..c89098f
--- /dev/null
+++ b/config/sway/themes/catppuccin
@@ -0,0 +1 @@
+Subproject commit c89098fc3517b64f0422aaaccb98dcab6ae9348f