diff --git a/config/neovim/after/plugin/colorscheme.lua b/config/neovim/after/plugin/colorscheme.lua
index ec741345..7aed293a 100644
--- a/config/neovim/after/plugin/colorscheme.lua
+++ b/config/neovim/after/plugin/colorscheme.lua
@@ -3,10 +3,19 @@ if not status_ok then
   return
 end
 
-catppuccin.setup {}
+catppuccin.setup({
+  flavour = "macchiato",
+  integrations = {
+    cmp = true,
+    gitsigns = true,
+    native_lsp = {
+      enabled = true;
+    },
+    telescope = true,
+    treesitter = true,
+  },
+  term_colors = true,
+  transparent_background = true,
+})
 
-vim.opt.termguicolors = true
-
-vim.g.catppuccin_flavour = "mocha"
-
-vim.cmd([[ colorscheme catppuccin ]])
+vim.cmd.colorscheme "catppuccin"
diff --git a/config/sway/config b/config/sway/config
index 3346b4c6..384a2f1b 100644
--- a/config/sway/config
+++ b/config/sway/config
@@ -24,10 +24,13 @@ set $menu wofi --show run
 
 set $browser firefox
 
+set $wallpaper ~/.config/sway/wallpaper.jpg
+
 ### Output configuration
 #
 # Default wallpaper (more resolutions are available in /run/current-system/sw/share/backgrounds/sway/)
-output * bg ~/.config/sway/wallpaper.png fill
+output * bg $wallpaper fill #000000
+
 #
 # Example configuration:
 #
@@ -59,11 +62,11 @@ bindsym --locked XF86MonBrightnessUp exec brightnessctl set 5%+
 
 ### Idle configuration
 exec swayidle -w \
-    timeout 300 'swaylock -f -i ~/.config/sway/wallpaper.png' \
+    timeout 300 'swaylock -f -i $wallpaper \
     timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \
-    before-sleep 'swaylock -f -i ~/.config/sway/wallpaper.png'
+    before-sleep "swaylock -f -i $wallpaper"
 
-bindsym $mod+Escape exec swaylock -f -i ~/.config/sway/wallpaper.png
+bindsym $mod+Escape exec swaylock -f -i $wallpaper #000000
 
 ### Input configuration
 #
diff --git a/config/sway/wallpaper.jpg b/config/sway/wallpaper.jpg
new file mode 100644
index 00000000..75d60ad7
Binary files /dev/null and b/config/sway/wallpaper.jpg differ
diff --git a/config/sway/wallpaper.png b/config/sway/wallpaper.png
deleted file mode 100644
index 8b6da592..00000000
Binary files a/config/sway/wallpaper.png and /dev/null differ