diff --git a/data/themes/empc.edc b/data/themes/empc.edc
index d089cac..7f1b60c 100644
--- a/data/themes/empc.edc
+++ b/data/themes/empc.edc
@@ -31,7 +31,7 @@ collections {
                aspect: 1.0 1.0; aspect_preference: BOTH;
             }
          }
-         part { name: "text_clip"; type: RECT; mouse_events: 0;
+         part { name: "bgchooser_active_clip"; type: RECT; mouse_events: 0;
              description { state: "default";
              }
              description { state: "hidden";
@@ -42,12 +42,12 @@ collections {
          program { name: "text_show";
             action: STATE_SET "default" 0.0;
             transition: LINEAR 0.2 CURRENT;
-            target: "text_clip";
+            target: "bgchooser_active_clip";
          }
          program { name: "text_hide";
             action: STATE_SET "hidden" 0.0;
             transition: LINEAR 0.2 CURRENT;
-            target: "text_clip";
+            target: "bgchooser_active_clip";
          }
          part { name: EMPC_BASE_SWALLOW_BACKGROUND; type: SWALLOW;
             description { state: "default";
@@ -136,7 +136,7 @@ collections {
             after: "empc_bg_done";
          }
          part { name: EMPC_BASE_TEXT_ARTIST; type: TEXT; mouse_events: 0;
-            clip_to: "text_clip";
+            clip_to: "bgchooser_active_clip";
             effect: GLOW;
             scale: 1;
             description { state: "default";
@@ -153,7 +153,7 @@ collections {
             }
          }
          part { name: EMPC_BASE_TEXT_ALBUM; type: TEXT; mouse_events: 0;
-            clip_to: "text_clip";
+            clip_to: "bgchooser_active_clip";
             effect: GLOW;
             scale: 1;
             description { state: "default";
@@ -192,7 +192,7 @@ collections {
             }
          }
          part { name: "title_clip"; type: RECT; mouse_events: 0;
-             clip_to: "text_clip";
+             clip_to: "bgchooser_active_clip";
              description { state: "default";
              }
              description { state: "left";
@@ -203,7 +203,7 @@ collections {
              }
          }
          part { name: "title_animator"; type: TEXT; mouse_events: 0;
-            clip_to: "text_clip";
+            clip_to: "bgchooser_active_clip";
             effect: GLOW;
             scale: 1;
             description { state: "default";
@@ -316,6 +316,7 @@ collections {
             }
          }
          part { name: "playlist_events"; type: RECT; repeat_events: 1;
+            clip_to: "bgchooser_active_clip";
             description { state: "default";
                min: 16 16;
                color: 0 0 0 0;
@@ -336,6 +337,7 @@ collections {
             }
          }
          part { name: "controls_events"; type: RECT; repeat_events: 1;
+            clip_to: "bgchooser_active_clip";
             description { state: "default";
                min: 16 16;
                color: 0 0 0 0;
@@ -399,9 +401,12 @@ collections {
          program { name: "playlist_show";
             filter: EMPC_BASE_SWALLOW_PLAYLIST "default";
             signal: "empc,playlist,show"; source: "empc";
-            action: ACTION_STOP;
-            target: "playlist_hide_start";
-            after: "playlist_show_start";
+            script {
+               if (!get_int(bg_chooser)) {
+                  stop_program(get_program_id("playlist_hide_start"));
+                  run_program(get_program_id("playlist_show_start"));
+               }
+            }
          }
          program { name: "playlist_show_start";
             action: STATE_SET "visible" 0.0;
@@ -450,9 +455,12 @@ collections {
          program { name: "controls_show";
             filter: EMPC_BASE_SWALLOW_CONTROLS "default";
             signal: "empc,controls,show"; source: "empc";
-            action: ACTION_STOP;
-            target: "controls_hide_start";
-            after: "controls_show_start";
+            script {
+               if (!get_int(bg_chooser)) {
+                  stop_program(get_program_id("controls_hide_start"));
+                  run_program(get_program_id("controls_show_start"));
+               }
+            }
          }
          program { name: "controls_show_start";
             action: STATE_SET "visible" 0.0;