diff --git a/config.yaml b/config.yaml
index 2a0149d..208fe2d 100644
--- a/config.yaml
+++ b/config.yaml
@@ -102,7 +102,7 @@ profiles:
 
 
 ###############################################################
-# Accents {{{
+# Accents
 ###############################################################
 
     accent_red:     {variables: {accent_color: "#D9534F"}}
@@ -154,8 +154,9 @@ profiles:
 
     main:
         variables:
-            gtk_theme:      "materia-{{@@ env['USER'] @@}}-{{@@ accent_color_name @@}}-{{@@ color.type @@}}"
+            gtk_theme:      "Mint-Y-{{@@ 'Dark' if color.type == 'dark' else 'Darker' @@}}-{{@@ accent_color_name.capitalize() @@}}"
             kvantum_theme:  "Materia{{@@ color.type.capitalize() @@}}"
+            # icon_theme:     "Mint-Y-{{@@ 'Dark' if color.type == 'dark' else 'Darker' @@}}-{{@@ accent_color_name.capitalize() @@}}"
             icon_theme:     "Papirus-{{@@ color.type.capitalize() @@}}"
             cursor_theme:   "capitaine-cursors{{@@ '-light' if color.type == 'light' @@}}"
         dotfiles:
diff --git a/dotfiles/meta.PKGBUILD b/dotfiles/meta.PKGBUILD
index fa648bb..b600a7e 100755
--- a/dotfiles/meta.PKGBUILD
+++ b/dotfiles/meta.PKGBUILD
@@ -44,8 +44,9 @@ depends=(
     grim slurp swappy wl-clipboard imagemagick wf-recorder wshowkeys
 
     # Theme
-    materia-custom-accent papirus-icon-theme
-    papirus-folders capitaine-cursors
+    mint-themes mint-y-icons
+    papirus-icon-theme papirus-folders
+    capitaine-cursors
     # Make dependencies
     bc sassc inkscape
 
diff --git a/dotfiles/scripts/_make_theme b/dotfiles/scripts/_make_theme
index bc8d2b4..358926a 100755
--- a/dotfiles/scripts/_make_theme
+++ b/dotfiles/scripts/_make_theme
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+{%@@ if 'papirus' in "{{@@ icon_theme @@}}".lower() @@%}
 # Papirus Icon Theme
 {
     papirus-folders -l | grep "[^>] {{@@ accent_color_name @@}}"&&
@@ -9,6 +10,9 @@
         papirus-folders -uD
 
 } &
+{%@@ endif @@%}
+
+{%@@ if 'materia' in "{{@@ gtk_theme @@}}".lower() @@%}
 
 # Materia GTK Theme
 src_path="$HOME/.cache/materia-theme"
@@ -60,3 +64,5 @@ mkdir -p "${dst_path}/${theme_name}"
 
     notify-send "Finished generating theme"
 } &> /dev/null &
+
+{%@@ endif @@%}