diff --git a/cl-theme b/cl-theme
index 0f47b94..1933274 100755
--- a/cl-theme
+++ b/cl-theme
@@ -552,13 +552,14 @@ create_session() {
 #######################
 clear_gfxboot_images() {
     local img=${GFXBOOT_INSTALL_PATH:-/usr/share/themes/gfxboot-themes-calculate}/${GFXBOOT_THEME:-back-custom}.jpg
-    rm $img &>>${DEBUG_LOG}
+    rm -f $img &>>${DEBUG_LOG}
 }
 
 create_gfxboot_images() {
     local img=${GFXBOOT_INSTALL_PATH:-/usr/share/themes/gfxboot-themes-calculate}/${GFXBOOT_THEME:-back-custom}.jpg
     filtered_resolutions=$(filter_resolutions $GFXBOOT_SOURCE $GFXBOOTRESOLUTION)
     [[ -n "${filtered_resolutions}" ]] || eerror $"Source image is too small" || return 1
+    mkdir -p $(dirname $img) 2>>$DEBUG_LOG
     convert_image $GFXBOOT_SOURCE $GFXBOOTRESOLUTION $img
 }
 
@@ -579,13 +580,14 @@ create_gfxboot() {
 #######################
 clear_grub_images() {
     local img=${GRUB_INSTALL_PATH:-/boot/grub}/${GRUB_THEME:-grub-custom}.png
-    rm $img &>>${DEBUG_LOG}
+    rm -f $img &>>${DEBUG_LOG}
 }
 
 create_grub_images() {
     local img=${GRUB_INSTALL_PATH:-/boot/grub}/${GRUB_THEME:-grub-custom}.png
     filtered_resolutions=$(filter_resolutions $GRUB_SOURCE $GRUBRESOLUTION)
     [[ -n "${filtered_resolutions}" ]] || eerror $"Source image is too small" || return 1
+    mkdir -p $(dirname $img) 2>>$DEBUG_LOG
     convert_image $GRUB_SOURCE $GRUBRESOLUTION $img
 
 }
@@ -696,10 +698,10 @@ then
     fi
 fi
 
-[[ -n $WALLPAPERS_SOURCE ]] && cl-core-setup --verbose=off --pkg-name calculate-wallpapers
-[[ -n $LOGIN_SOURCE ]] || [[ -n $SESSION_SOURCE ]] && cl-core-setup --verbose=off --pkg-name dm-themes-calculate
-[[ -n $SHUTDOWN_SOURCE ]] || [[ -n $BOOTING_SOURCE ]] && cl-core-setup --verbose=off --pkg-name splash-themes-calculate
-[[ -n $GFXBOOT_SOURCE ]] && cl-core-setup --verbose=off --pkg-name gfxboot-themes-calculate
-[[ -n $GRUB_SOURCE ]] && cl-core-setup --verbose=off --pkg-name grub-splashes-calculate
+[[ -n $WALLPAPERS_SOURCE ]] && [[ -n $CREATE_TEMPLATES ]] && cl-core-setup --verbose=off --pkg-name calculate-wallpapers
+[[ -n $LOGIN_SOURCE ]] || [[ -n $SESSION_SOURCE ]] && [[ -n $CREATE_TEMPLATES ]] && cl-core-setup --verbose=off --pkg-name dm-themes-calculate
+[[ -n $SHUTDOWN_SOURCE ]] || [[ -n $BOOTING_SOURCE ]] && [[ -n $CREATE_TEMPLATES ]] && cl-core-setup --verbose=off --pkg-name splash-themes-calculate
+[[ -n $GFXBOOT_SOURCE ]] && [[ -n $CREATE_TEMPLATES ]] && cl-core-setup --verbose=off --pkg-name gfxboot-themes-calculate
+[[ -n $GRUB_SOURCE ]] && [[ -n $CREATE_TEMPLATES ]] && cl-core-setup --verbose=off --pkg-name grub-splashes-calculate
 
 einfo $"All done!"