diff --git a/data/themes/default.edc b/data/themes/default.edc
index 91ec3e48c..557c1295c 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -9797,225 +9797,55 @@ collections { /* begin the collection of edje groups that are in this file */
    }
 
 /////////////////////////////////////////////////////////////////////////////
+#define CLOCK_SECONDS 1
    /*** MOD: CLOCK ***/
    group { name: "e/modules/clock/main";
       images {
 	 image: "clock_base.png" COMP;
 	 image: "tacho_fg.png" COMP;
-	 image: "ch-00.png" COMP;
-	 image: "ch-01.png" COMP;
-	 image: "ch-02.png" COMP;
-	 image: "ch-03.png" COMP;
-	 image: "ch-04.png" COMP;
-	 image: "ch-05.png" COMP;
-	 image: "ch-06.png" COMP;
-	 image: "ch-07.png" COMP;
-	 image: "ch-08.png" COMP;
-	 image: "ch-09.png" COMP;
-	 image: "ch-10.png" COMP;
-	 image: "ch-11.png" COMP;
-	 image: "ch-12.png" COMP;
-	 image: "ch-13.png" COMP;
-	 image: "ch-14.png" COMP;
-	 image: "ch-15.png" COMP;
-	 image: "ch-16.png" COMP;
-	 image: "ch-17.png" COMP;
-	 image: "ch-18.png" COMP;
-	 image: "ch-19.png" COMP;
-	 image: "ch-20.png" COMP;
-	 image: "ch-21.png" COMP;
-	 image: "ch-22.png" COMP;
-	 image: "ch-23.png" COMP;
-	 image: "ch-24.png" COMP;
-	 image: "ch-25.png" COMP;
-	 image: "ch-26.png" COMP;
-	 image: "ch-27.png" COMP;
-	 image: "ch-28.png" COMP;
-	 image: "ch-29.png" COMP;
-	 image: "ch-30.png" COMP;
-	 image: "ch-31.png" COMP;
-	 image: "ch-32.png" COMP;
-	 image: "ch-33.png" COMP;
-	 image: "ch-34.png" COMP;
-	 image: "ch-35.png" COMP;
-	 image: "ch-36.png" COMP;
-	 image: "ch-37.png" COMP;
-	 image: "ch-38.png" COMP;
-	 image: "ch-39.png" COMP;
-	 image: "ch-40.png" COMP;
-	 image: "ch-41.png" COMP;
-	 image: "ch-42.png" COMP;
-	 image: "ch-43.png" COMP;
-	 image: "ch-44.png" COMP;
-	 image: "ch-45.png" COMP;
-	 image: "ch-46.png" COMP;
-	 image: "ch-47.png" COMP;
-	 image: "ch-48.png" COMP;
-	 image: "ch-49.png" COMP;
-	 image: "ch-50.png" COMP;
-	 image: "ch-51.png" COMP;
-	 image: "ch-52.png" COMP;
-	 image: "ch-53.png" COMP;
-	 image: "ch-54.png" COMP;
-	 image: "ch-55.png" COMP;
-	 image: "ch-56.png" COMP;
-	 image: "ch-57.png" COMP;
-	 image: "ch-58.png" COMP;
-	 image: "ch-59.png" COMP;
-	 image: "cm-00.png" COMP;
-	 image: "cm-01.png" COMP;
-	 image: "cm-02.png" COMP;
-	 image: "cm-03.png" COMP;
-	 image: "cm-04.png" COMP;
-	 image: "cm-05.png" COMP;
-	 image: "cm-06.png" COMP;
-	 image: "cm-07.png" COMP;
-	 image: "cm-08.png" COMP;
-	 image: "cm-09.png" COMP;
-	 image: "cm-10.png" COMP;
-	 image: "cm-11.png" COMP;
-	 image: "cm-12.png" COMP;
-	 image: "cm-13.png" COMP;
-	 image: "cm-14.png" COMP;
-	 image: "cm-15.png" COMP;
-	 image: "cm-16.png" COMP;
-	 image: "cm-17.png" COMP;
-	 image: "cm-18.png" COMP;
-	 image: "cm-19.png" COMP;
-	 image: "cm-20.png" COMP;
-	 image: "cm-21.png" COMP;
-	 image: "cm-22.png" COMP;
-	 image: "cm-23.png" COMP;
-	 image: "cm-24.png" COMP;
-	 image: "cm-25.png" COMP;
-	 image: "cm-26.png" COMP;
-	 image: "cm-27.png" COMP;
-	 image: "cm-28.png" COMP;
-	 image: "cm-29.png" COMP;
-	 image: "cm-30.png" COMP;
-	 image: "cm-31.png" COMP;
-	 image: "cm-32.png" COMP;
-	 image: "cm-33.png" COMP;
-	 image: "cm-34.png" COMP;
-	 image: "cm-35.png" COMP;
-	 image: "cm-36.png" COMP;
-	 image: "cm-37.png" COMP;
-	 image: "cm-38.png" COMP;
-	 image: "cm-39.png" COMP;
-	 image: "cm-40.png" COMP;
-	 image: "cm-41.png" COMP;
-	 image: "cm-42.png" COMP;
-	 image: "cm-43.png" COMP;
-	 image: "cm-44.png" COMP;
-	 image: "cm-45.png" COMP;
-	 image: "cm-46.png" COMP;
-	 image: "cm-47.png" COMP;
-	 image: "cm-48.png" COMP;
-	 image: "cm-49.png" COMP;
-	 image: "cm-50.png" COMP;
-	 image: "cm-51.png" COMP;
-	 image: "cm-52.png" COMP;
-	 image: "cm-53.png" COMP;
-	 image: "cm-54.png" COMP;
-	 image: "cm-55.png" COMP;
-	 image: "cm-56.png" COMP;
-	 image: "cm-57.png" COMP;
-	 image: "cm-58.png" COMP;
-	 image: "cm-59.png" COMP;
+         image: "ch-h1.png" COMP;
+         image: "ch-h2.png" COMP;
+         image: "ch-m1.png" COMP;
+         image: "ch-m2.png" COMP;
 #ifdef CLOCK_SECONDS
-	 image: "cs-00.png" COMP;
-	 image: "cs-01.png" COMP;
-	 image: "cs-02.png" COMP;
-	 image: "cs-03.png" COMP;
-	 image: "cs-04.png" COMP;
-	 image: "cs-05.png" COMP;
-	 image: "cs-06.png" COMP;
-	 image: "cs-07.png" COMP;
-	 image: "cs-08.png" COMP;
-	 image: "cs-09.png" COMP;
-	 image: "cs-10.png" COMP;
-	 image: "cs-11.png" COMP;
-	 image: "cs-12.png" COMP;
-	 image: "cs-13.png" COMP;
-	 image: "cs-14.png" COMP;
-	 image: "cs-15.png" COMP;
-	 image: "cs-16.png" COMP;
-	 image: "cs-17.png" COMP;
-	 image: "cs-18.png" COMP;
-	 image: "cs-19.png" COMP;
-	 image: "cs-20.png" COMP;
-	 image: "cs-21.png" COMP;
-	 image: "cs-22.png" COMP;
-	 image: "cs-23.png" COMP;
-	 image: "cs-24.png" COMP;
-	 image: "cs-25.png" COMP;
-	 image: "cs-26.png" COMP;
-	 image: "cs-27.png" COMP;
-	 image: "cs-28.png" COMP;
-	 image: "cs-29.png" COMP;
-	 image: "cs-30.png" COMP;
-	 image: "cs-31.png" COMP;
-	 image: "cs-32.png" COMP;
-	 image: "cs-33.png" COMP;
-	 image: "cs-34.png" COMP;
-	 image: "cs-35.png" COMP;
-	 image: "cs-36.png" COMP;
-	 image: "cs-37.png" COMP;
-	 image: "cs-38.png" COMP;
-	 image: "cs-39.png" COMP;
-	 image: "cs-40.png" COMP;
-	 image: "cs-41.png" COMP;
-	 image: "cs-42.png" COMP;
-	 image: "cs-43.png" COMP;
-	 image: "cs-44.png" COMP;
-	 image: "cs-45.png" COMP;
-	 image: "cs-46.png" COMP;
-	 image: "cs-47.png" COMP;
-	 image: "cs-48.png" COMP;
-	 image: "cs-49.png" COMP;
-	 image: "cs-50.png" COMP;
-	 image: "cs-51.png" COMP;
-	 image: "cs-52.png" COMP;
-	 image: "cs-53.png" COMP;
-	 image: "cs-54.png" COMP;
-	 image: "cs-55.png" COMP;
-	 image: "cs-56.png" COMP;
-	 image: "cs-57.png" COMP;
-	 image: "cs-58.png" COMP;
-	 image: "cs-59.png" COMP;
+         image: "ch-s1.png" COMP;
+         image: "ch-s2.png" COMP;
 #endif
       }
       min: 16 16;
       max:  128 128;
       script {
 	 public clock_cb(val) {
-	    new buf[11];
 	    new year, month, day, yearday, weekday, hour, minute;
 	    new Float:second;
-	    new v;
+            new v;
 
 	    date(year, month, day, yearday, weekday, hour, minute, second);
 #ifdef CLOCK_SECONDS
-	    v = round(second);
-	    timer(1.0 - (second - v), "clock_cb", 1);
-	    buf[0] = 0;
-	    if (v < 10) {snprintf(buf, 10, "0%i", v);}
-	    else        {snprintf(buf, 10, "%i", v);}
-	    set_state(PART:"seconds", buf, 0.0);
+            v = round(second);
+            timer(1.0 - (second - v), "clock_cb", 1);
+            custom_state(PART:"seconds", "default", 0.0);
+            set_state_val(PART:"seconds", STATE_MAP_ROT_Z, (v * 360.0) / 60.0);
+            set_state(PART:"seconds", "custom", 0.0);
+            custom_state(PART:"seconds-sh", "default", 0.0);
+            set_state_val(PART:"seconds-sh", STATE_MAP_ROT_Z, (v * 360.0) / 60.0);
+            set_state(PART:"seconds-sh", "custom", 0.0);
 #else
 	    timer(60.0 - (second), "clock_cb", 1);
 #endif
-	    v = minute;
-	    buf[0] = 0;
-	    if (v < 10) {snprintf(buf, 10, "0%i", v);}
-	    else        {snprintf(buf, 10, "%i", v);}
-	    set_state(PART:"minutes", buf, 0.0);
-
-	    v = ((hour % 12) * 5) + ((minute * 5) / 60);
-	    buf[0] = 0;
-	    if (v < 10) {snprintf(buf, 10, "0%i", v);}
-	    else        {snprintf(buf, 10, "%i", v);}
-	    set_state(PART:"hour", buf, 0.0);
+            custom_state(PART:"minutes", "default", 0.0);
+            set_state_val(PART:"minutes", STATE_MAP_ROT_Z, (minute * 360.0) / 60.0);
+            set_state(PART:"minutes", "custom", 0.0);
+            custom_state(PART:"minutes-sh", "default", 0.0);
+            set_state_val(PART:"minutes-sh", STATE_MAP_ROT_Z, (minute * 360.0) / 60.0);
+            set_state(PART:"minutes-sh", "custom", 0.0);
+            
+            custom_state(PART:"hour", "default", 0.0);
+            set_state_val(PART:"hour", STATE_MAP_ROT_Z, (hour * 360.0) / 12.0);
+            set_state(PART:"hour", "custom", 0.0);
+            custom_state(PART:"hour-sh", "default", 0.0);
+            set_state_val(PART:"hour-sh", STATE_MAP_ROT_Z, (hour * 360.0) / 12.0);
+            set_state(PART:"hour-sh", "custom", 0.0);
 	 }
       }
       parts {
@@ -10026,210 +9856,144 @@ collections { /* begin the collection of edje groups that are in this file */
 	       image.normal: "clock_base.png";
 	    }
 	 }
+         part { name: "base2";
+            type: RECT;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               visible: 0;
+               rel1 {
+                  to: "base";
+                  relative: (2.0/128.0) (2.0/128.0);
+               }
+               rel2 {
+                  to: "base";
+                  relative: (1.0+(2.0/128.0)) (1.0+(2.0/128.0));
+               }
+            }
+         }
 #ifdef CLOCK_SECONDS
-	 part { name: "seconds";
-	    mouse_events: 0;
-	    description { state: "default" 0.0;
-	       rel1.to: "base"; rel2.to: "base";
-	       image.normal: "cs-00.png";
-	    }
-	    description { state: "00" 0.0; inherit: "default" 0.0; image.normal: "cs-00.png";}
-	    description { state: "01" 0.0; inherit: "default" 0.0; image.normal: "cs-01.png";}
-	    description { state: "02" 0.0; inherit: "default" 0.0; image.normal: "cs-02.png";}
-	    description { state: "03" 0.0; inherit: "default" 0.0; image.normal: "cs-03.png";}
-	    description { state: "04" 0.0; inherit: "default" 0.0; image.normal: "cs-04.png";}
-	    description { state: "05" 0.0; inherit: "default" 0.0; image.normal: "cs-05.png";}
-	    description { state: "06" 0.0; inherit: "default" 0.0; image.normal: "cs-06.png";}
-	    description { state: "07" 0.0; inherit: "default" 0.0; image.normal: "cs-07.png";}
-	    description { state: "08" 0.0; inherit: "default" 0.0; image.normal: "cs-08.png";}
-	    description { state: "09" 0.0; inherit: "default" 0.0; image.normal: "cs-09.png";}
-	    description { state: "10" 0.0; inherit: "default" 0.0; image.normal: "cs-10.png";}
-	    description { state: "11" 0.0; inherit: "default" 0.0; image.normal: "cs-11.png";}
-	    description { state: "12" 0.0; inherit: "default" 0.0; image.normal: "cs-12.png";}
-	    description { state: "13" 0.0; inherit: "default" 0.0; image.normal: "cs-13.png";}
-	    description { state: "14" 0.0; inherit: "default" 0.0; image.normal: "cs-14.png";}
-	    description { state: "15" 0.0; inherit: "default" 0.0; image.normal: "cs-15.png";}
-	    description { state: "16" 0.0; inherit: "default" 0.0; image.normal: "cs-16.png";}
-	    description { state: "17" 0.0; inherit: "default" 0.0; image.normal: "cs-17.png";}
-	    description { state: "18" 0.0; inherit: "default" 0.0; image.normal: "cs-18.png";}
-	    description { state: "19" 0.0; inherit: "default" 0.0; image.normal: "cs-19.png";}
-	    description { state: "20" 0.0; inherit: "default" 0.0; image.normal: "cs-20.png";}
-	    description { state: "21" 0.0; inherit: "default" 0.0; image.normal: "cs-21.png";}
-	    description { state: "22" 0.0; inherit: "default" 0.0; image.normal: "cs-22.png";}
-	    description { state: "23" 0.0; inherit: "default" 0.0; image.normal: "cs-23.png";}
-	    description { state: "24" 0.0; inherit: "default" 0.0; image.normal: "cs-24.png";}
-	    description { state: "25" 0.0; inherit: "default" 0.0; image.normal: "cs-25.png";}
-	    description { state: "26" 0.0; inherit: "default" 0.0; image.normal: "cs-26.png";}
-	    description { state: "27" 0.0; inherit: "default" 0.0; image.normal: "cs-27.png";}
-	    description { state: "28" 0.0; inherit: "default" 0.0; image.normal: "cs-28.png";}
-	    description { state: "29" 0.0; inherit: "default" 0.0; image.normal: "cs-29.png";}
-	    description { state: "30" 0.0; inherit: "default" 0.0; image.normal: "cs-30.png";}
-	    description { state: "31" 0.0; inherit: "default" 0.0; image.normal: "cs-31.png";}
-	    description { state: "32" 0.0; inherit: "default" 0.0; image.normal: "cs-32.png";}
-	    description { state: "33" 0.0; inherit: "default" 0.0; image.normal: "cs-33.png";}
-	    description { state: "34" 0.0; inherit: "default" 0.0; image.normal: "cs-34.png";}
-	    description { state: "35" 0.0; inherit: "default" 0.0; image.normal: "cs-35.png";}
-	    description { state: "36" 0.0; inherit: "default" 0.0; image.normal: "cs-36.png";}
-	    description { state: "37" 0.0; inherit: "default" 0.0; image.normal: "cs-37.png";}
-	    description { state: "38" 0.0; inherit: "default" 0.0; image.normal: "cs-38.png";}
-	    description { state: "39" 0.0; inherit: "default" 0.0; image.normal: "cs-39.png";}
-	    description { state: "40" 0.0; inherit: "default" 0.0; image.normal: "cs-40.png";}
-	    description { state: "41" 0.0; inherit: "default" 0.0; image.normal: "cs-41.png";}
-	    description { state: "42" 0.0; inherit: "default" 0.0; image.normal: "cs-42.png";}
-	    description { state: "43" 0.0; inherit: "default" 0.0; image.normal: "cs-43.png";}
-	    description { state: "44" 0.0; inherit: "default" 0.0; image.normal: "cs-44.png";}
-	    description { state: "45" 0.0; inherit: "default" 0.0; image.normal: "cs-45.png";}
-	    description { state: "46" 0.0; inherit: "default" 0.0; image.normal: "cs-46.png";}
-	    description { state: "47" 0.0; inherit: "default" 0.0; image.normal: "cs-47.png";}
-	    description { state: "48" 0.0; inherit: "default" 0.0; image.normal: "cs-48.png";}
-	    description { state: "49" 0.0; inherit: "default" 0.0; image.normal: "cs-49.png";}
-	    description { state: "50" 0.0; inherit: "default" 0.0; image.normal: "cs-50.png";}
-	    description { state: "51" 0.0; inherit: "default" 0.0; image.normal: "cs-51.png";}
-	    description { state: "52" 0.0; inherit: "default" 0.0; image.normal: "cs-52.png";}
-	    description { state: "53" 0.0; inherit: "default" 0.0; image.normal: "cs-53.png";}
-	    description { state: "54" 0.0; inherit: "default" 0.0; image.normal: "cs-54.png";}
-	    description { state: "55" 0.0; inherit: "default" 0.0; image.normal: "cs-55.png";}
-	    description { state: "56" 0.0; inherit: "default" 0.0; image.normal: "cs-56.png";}
-	    description { state: "57" 0.0; inherit: "default" 0.0; image.normal: "cs-57.png";}
-	    description { state: "58" 0.0; inherit: "default" 0.0; image.normal: "cs-58.png";}
-	    description { state: "59" 0.0; inherit: "default" 0.0; image.normal: "cs-59.png";}
-	 }
+         part { name: "seconds-sh";
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               rel1 {
+                  to: "base2";
+                  relative: 0.3125 0.0;
+               }
+               rel2 {
+                  to: "base2";
+                  relative: 0.6875 0.6875;
+               }
+               image.normal: "ch-s2.png";
+               map {
+                  on: 1;
+                  rotation {
+                     center: "base2";
+                  }
+               }
+            }
+         }
+         part { name: "seconds";
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               rel1 {
+                  to: "base";
+                  relative: 0.3125 0.0;
+               }
+               rel2 {
+                  to: "base";
+                  relative: 0.6875 0.6875;
+               }
+               image.normal: "ch-s1.png";
+               map {
+                  on: 1;
+                  rotation {
+                     center: "base";
+                  }
+               }
+            }
+         }
 #endif
-	 part { name: "minutes";
-	    mouse_events: 0;
-	    description { state: "default" 0.0;
-	       rel1.to: "base"; rel2.to: "base";
-	       image.normal: "ch-00.png";
-	    }
-	    description { state: "00" 0.0; inherit: "default" 0.0; image.normal: "ch-00.png";}
-	    description { state: "01" 0.0; inherit: "default" 0.0; image.normal: "ch-01.png";}
-	    description { state: "02" 0.0; inherit: "default" 0.0; image.normal: "ch-02.png";}
-	    description { state: "03" 0.0; inherit: "default" 0.0; image.normal: "ch-03.png";}
-	    description { state: "04" 0.0; inherit: "default" 0.0; image.normal: "ch-04.png";}
-	    description { state: "05" 0.0; inherit: "default" 0.0; image.normal: "ch-05.png";}
-	    description { state: "06" 0.0; inherit: "default" 0.0; image.normal: "ch-06.png";}
-	    description { state: "07" 0.0; inherit: "default" 0.0; image.normal: "ch-07.png";}
-	    description { state: "08" 0.0; inherit: "default" 0.0; image.normal: "ch-08.png";}
-	    description { state: "09" 0.0; inherit: "default" 0.0; image.normal: "ch-09.png";}
-	    description { state: "10" 0.0; inherit: "default" 0.0; image.normal: "ch-10.png";}
-	    description { state: "11" 0.0; inherit: "default" 0.0; image.normal: "ch-11.png";}
-	    description { state: "12" 0.0; inherit: "default" 0.0; image.normal: "ch-12.png";}
-	    description { state: "13" 0.0; inherit: "default" 0.0; image.normal: "ch-13.png";}
-	    description { state: "14" 0.0; inherit: "default" 0.0; image.normal: "ch-14.png";}
-	    description { state: "15" 0.0; inherit: "default" 0.0; image.normal: "ch-15.png";}
-	    description { state: "16" 0.0; inherit: "default" 0.0; image.normal: "ch-16.png";}
-	    description { state: "17" 0.0; inherit: "default" 0.0; image.normal: "ch-17.png";}
-	    description { state: "18" 0.0; inherit: "default" 0.0; image.normal: "ch-18.png";}
-	    description { state: "19" 0.0; inherit: "default" 0.0; image.normal: "ch-19.png";}
-	    description { state: "20" 0.0; inherit: "default" 0.0; image.normal: "ch-20.png";}
-	    description { state: "21" 0.0; inherit: "default" 0.0; image.normal: "ch-21.png";}
-	    description { state: "22" 0.0; inherit: "default" 0.0; image.normal: "ch-22.png";}
-	    description { state: "23" 0.0; inherit: "default" 0.0; image.normal: "ch-23.png";}
-	    description { state: "24" 0.0; inherit: "default" 0.0; image.normal: "ch-24.png";}
-	    description { state: "25" 0.0; inherit: "default" 0.0; image.normal: "ch-25.png";}
-	    description { state: "26" 0.0; inherit: "default" 0.0; image.normal: "ch-26.png";}
-	    description { state: "27" 0.0; inherit: "default" 0.0; image.normal: "ch-27.png";}
-	    description { state: "28" 0.0; inherit: "default" 0.0; image.normal: "ch-28.png";}
-	    description { state: "29" 0.0; inherit: "default" 0.0; image.normal: "ch-29.png";}
-	    description { state: "30" 0.0; inherit: "default" 0.0; image.normal: "ch-30.png";}
-	    description { state: "31" 0.0; inherit: "default" 0.0; image.normal: "ch-31.png";}
-	    description { state: "32" 0.0; inherit: "default" 0.0; image.normal: "ch-32.png";}
-	    description { state: "33" 0.0; inherit: "default" 0.0; image.normal: "ch-33.png";}
-	    description { state: "34" 0.0; inherit: "default" 0.0; image.normal: "ch-34.png";}
-	    description { state: "35" 0.0; inherit: "default" 0.0; image.normal: "ch-35.png";}
-	    description { state: "36" 0.0; inherit: "default" 0.0; image.normal: "ch-36.png";}
-	    description { state: "37" 0.0; inherit: "default" 0.0; image.normal: "ch-37.png";}
-	    description { state: "38" 0.0; inherit: "default" 0.0; image.normal: "ch-38.png";}
-	    description { state: "39" 0.0; inherit: "default" 0.0; image.normal: "ch-39.png";}
-	    description { state: "40" 0.0; inherit: "default" 0.0; image.normal: "ch-40.png";}
-	    description { state: "41" 0.0; inherit: "default" 0.0; image.normal: "ch-41.png";}
-	    description { state: "42" 0.0; inherit: "default" 0.0; image.normal: "ch-42.png";}
-	    description { state: "43" 0.0; inherit: "default" 0.0; image.normal: "ch-43.png";}
-	    description { state: "44" 0.0; inherit: "default" 0.0; image.normal: "ch-44.png";}
-	    description { state: "45" 0.0; inherit: "default" 0.0; image.normal: "ch-45.png";}
-	    description { state: "46" 0.0; inherit: "default" 0.0; image.normal: "ch-46.png";}
-	    description { state: "47" 0.0; inherit: "default" 0.0; image.normal: "ch-47.png";}
-	    description { state: "48" 0.0; inherit: "default" 0.0; image.normal: "ch-48.png";}
-	    description { state: "49" 0.0; inherit: "default" 0.0; image.normal: "ch-49.png";}
-	    description { state: "50" 0.0; inherit: "default" 0.0; image.normal: "ch-50.png";}
-	    description { state: "51" 0.0; inherit: "default" 0.0; image.normal: "ch-51.png";}
-	    description { state: "52" 0.0; inherit: "default" 0.0; image.normal: "ch-52.png";}
-	    description { state: "53" 0.0; inherit: "default" 0.0; image.normal: "ch-53.png";}
-	    description { state: "54" 0.0; inherit: "default" 0.0; image.normal: "ch-54.png";}
-	    description { state: "55" 0.0; inherit: "default" 0.0; image.normal: "ch-55.png";}
-	    description { state: "56" 0.0; inherit: "default" 0.0; image.normal: "ch-56.png";}
-	    description { state: "57" 0.0; inherit: "default" 0.0; image.normal: "ch-57.png";}
-	    description { state: "58" 0.0; inherit: "default" 0.0; image.normal: "ch-58.png";}
-	    description { state: "59" 0.0; inherit: "default" 0.0; image.normal: "ch-59.png";}
-	 }
-	 part { name: "hour";
-	    mouse_events: 0;
-	    description { state: "default" 0.0;
-	       rel1.to: "base"; rel2.to: "base";
-	       image.normal: "cm-00.png";
-	    }
-	    description { state: "00" 0.0; inherit: "default" 0.0; image.normal: "cm-00.png";}
-	    description { state: "01" 0.0; inherit: "default" 0.0; image.normal: "cm-01.png";}
-	    description { state: "02" 0.0; inherit: "default" 0.0; image.normal: "cm-02.png";}
-	    description { state: "03" 0.0; inherit: "default" 0.0; image.normal: "cm-03.png";}
-	    description { state: "04" 0.0; inherit: "default" 0.0; image.normal: "cm-04.png";}
-	    description { state: "05" 0.0; inherit: "default" 0.0; image.normal: "cm-05.png";}
-	    description { state: "06" 0.0; inherit: "default" 0.0; image.normal: "cm-06.png";}
-	    description { state: "07" 0.0; inherit: "default" 0.0; image.normal: "cm-07.png";}
-	    description { state: "08" 0.0; inherit: "default" 0.0; image.normal: "cm-08.png";}
-	    description { state: "09" 0.0; inherit: "default" 0.0; image.normal: "cm-09.png";}
-	    description { state: "10" 0.0; inherit: "default" 0.0; image.normal: "cm-10.png";}
-	    description { state: "11" 0.0; inherit: "default" 0.0; image.normal: "cm-11.png";}
-	    description { state: "12" 0.0; inherit: "default" 0.0; image.normal: "cm-12.png";}
-	    description { state: "13" 0.0; inherit: "default" 0.0; image.normal: "cm-13.png";}
-	    description { state: "14" 0.0; inherit: "default" 0.0; image.normal: "cm-14.png";}
-	    description { state: "15" 0.0; inherit: "default" 0.0; image.normal: "cm-15.png";}
-	    description { state: "16" 0.0; inherit: "default" 0.0; image.normal: "cm-16.png";}
-	    description { state: "17" 0.0; inherit: "default" 0.0; image.normal: "cm-17.png";}
-	    description { state: "18" 0.0; inherit: "default" 0.0; image.normal: "cm-18.png";}
-	    description { state: "19" 0.0; inherit: "default" 0.0; image.normal: "cm-19.png";}
-	    description { state: "20" 0.0; inherit: "default" 0.0; image.normal: "cm-20.png";}
-	    description { state: "21" 0.0; inherit: "default" 0.0; image.normal: "cm-21.png";}
-	    description { state: "22" 0.0; inherit: "default" 0.0; image.normal: "cm-22.png";}
-	    description { state: "23" 0.0; inherit: "default" 0.0; image.normal: "cm-23.png";}
-	    description { state: "24" 0.0; inherit: "default" 0.0; image.normal: "cm-24.png";}
-	    description { state: "25" 0.0; inherit: "default" 0.0; image.normal: "cm-25.png";}
-	    description { state: "26" 0.0; inherit: "default" 0.0; image.normal: "cm-26.png";}
-	    description { state: "27" 0.0; inherit: "default" 0.0; image.normal: "cm-27.png";}
-	    description { state: "28" 0.0; inherit: "default" 0.0; image.normal: "cm-28.png";}
-	    description { state: "29" 0.0; inherit: "default" 0.0; image.normal: "cm-29.png";}
-	    description { state: "30" 0.0; inherit: "default" 0.0; image.normal: "cm-30.png";}
-	    description { state: "31" 0.0; inherit: "default" 0.0; image.normal: "cm-31.png";}
-	    description { state: "32" 0.0; inherit: "default" 0.0; image.normal: "cm-32.png";}
-	    description { state: "33" 0.0; inherit: "default" 0.0; image.normal: "cm-33.png";}
-	    description { state: "34" 0.0; inherit: "default" 0.0; image.normal: "cm-34.png";}
-	    description { state: "35" 0.0; inherit: "default" 0.0; image.normal: "cm-35.png";}
-	    description { state: "36" 0.0; inherit: "default" 0.0; image.normal: "cm-36.png";}
-	    description { state: "37" 0.0; inherit: "default" 0.0; image.normal: "cm-37.png";}
-	    description { state: "38" 0.0; inherit: "default" 0.0; image.normal: "cm-38.png";}
-	    description { state: "39" 0.0; inherit: "default" 0.0; image.normal: "cm-39.png";}
-	    description { state: "40" 0.0; inherit: "default" 0.0; image.normal: "cm-40.png";}
-	    description { state: "41" 0.0; inherit: "default" 0.0; image.normal: "cm-41.png";}
-	    description { state: "42" 0.0; inherit: "default" 0.0; image.normal: "cm-42.png";}
-	    description { state: "43" 0.0; inherit: "default" 0.0; image.normal: "cm-43.png";}
-	    description { state: "44" 0.0; inherit: "default" 0.0; image.normal: "cm-44.png";}
-	    description { state: "45" 0.0; inherit: "default" 0.0; image.normal: "cm-45.png";}
-	    description { state: "46" 0.0; inherit: "default" 0.0; image.normal: "cm-46.png";}
-	    description { state: "47" 0.0; inherit: "default" 0.0; image.normal: "cm-47.png";}
-	    description { state: "48" 0.0; inherit: "default" 0.0; image.normal: "cm-48.png";}
-	    description { state: "49" 0.0; inherit: "default" 0.0; image.normal: "cm-49.png";}
-	    description { state: "50" 0.0; inherit: "default" 0.0; image.normal: "cm-50.png";}
-	    description { state: "51" 0.0; inherit: "default" 0.0; image.normal: "cm-51.png";}
-	    description { state: "52" 0.0; inherit: "default" 0.0; image.normal: "cm-52.png";}
-	    description { state: "53" 0.0; inherit: "default" 0.0; image.normal: "cm-53.png";}
-	    description { state: "54" 0.0; inherit: "default" 0.0; image.normal: "cm-54.png";}
-	    description { state: "55" 0.0; inherit: "default" 0.0; image.normal: "cm-55.png";}
-	    description { state: "56" 0.0; inherit: "default" 0.0; image.normal: "cm-56.png";}
-	    description { state: "57" 0.0; inherit: "default" 0.0; image.normal: "cm-57.png";}
-	    description { state: "58" 0.0; inherit: "default" 0.0; image.normal: "cm-58.png";}
-	    description { state: "59" 0.0; inherit: "default" 0.0; image.normal: "cm-59.png";}
-	 }
-	 part { name: "over";
+         part { name: "minutes-sh";
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               rel1 {
+                  to: "base2";
+                  relative: 0.3125 0.0;
+               }
+               rel2 {
+                  to: "base2";
+                  relative: 0.6875 0.6875;
+               }
+               image.normal: "ch-m2.png";
+               map {
+                  on: 1;
+                  rotation {
+                     center: "base2";
+                  }
+               }
+            }
+         }
+         part { name: "minutes";
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               rel1 {
+                  to: "base";
+                  relative: 0.3125 0.0;
+               }
+               rel2 {
+                  to: "base";
+                  relative: 0.6875 0.6875;
+               }
+               image.normal: "ch-m1.png";
+               map {
+                  on: 1;
+                  rotation {
+                     center: "base";
+                  }
+               }
+            }
+         }
+         part { name: "hour-sh";
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               rel1 {
+                  to: "base2";
+                  relative: 0.3125 0.0;
+               }
+               rel2 {
+                  to: "base2";
+                  relative: 0.6875 0.6875;
+               }
+               image.normal: "ch-h2.png";
+               map {
+                  on: 1;
+                  rotation {
+                     center: "base2";
+                  }
+               }
+            }
+         }
+         part { name: "hour";
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               rel1 {
+                  to: "base";
+                  relative: 0.3125 0.0;
+               }
+               rel2 {
+                  to: "base";
+                  relative: 0.6875 0.6875;
+               }
+               image.normal: "ch-h1.png";
+               map {
+                  on: 1;
+                  rotation {
+                     center: "base";
+                  }
+               }
+            }
+         }
+         part { name: "over";
 	    mouse_events: 0;
 	    description { state: "default" 0.0;
 	       rel1.to: "base"; rel2.to: "base";
diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am
index 65552fda4..ec31aea86 100644
--- a/data/themes/images/Makefile.am
+++ b/data/themes/images/Makefile.am
@@ -60,190 +60,16 @@ busy-7.png \
 busy-8.png \
 busy-9.png \
 cfg.png \
-ch-00.png \
-ch-01.png \
-ch-02.png \
-ch-03.png \
-ch-04.png \
-ch-05.png \
-ch-06.png \
-ch-07.png \
-ch-08.png \
-ch-09.png \
-ch-10.png \
-ch-11.png \
-ch-12.png \
-ch-13.png \
-ch-14.png \
-ch-15.png \
-ch-16.png \
-ch-17.png \
-ch-18.png \
-ch-19.png \
-ch-20.png \
-ch-21.png \
-ch-22.png \
-ch-23.png \
-ch-24.png \
-ch-25.png \
-ch-26.png \
-ch-27.png \
-ch-28.png \
-ch-29.png \
-ch-30.png \
-ch-31.png \
-ch-32.png \
-ch-33.png \
-ch-34.png \
-ch-35.png \
-ch-36.png \
-ch-37.png \
-ch-38.png \
-ch-39.png \
-ch-40.png \
-ch-41.png \
-ch-42.png \
-ch-43.png \
-ch-44.png \
-ch-45.png \
-ch-46.png \
-ch-47.png \
-ch-48.png \
-ch-49.png \
-ch-50.png \
-ch-51.png \
-ch-52.png \
-ch-53.png \
-ch-54.png \
-ch-55.png \
-ch-56.png \
-ch-57.png \
-ch-58.png \
-ch-59.png \
 check_base.png \
 check_on.png \
 check_sel.png \
+ch-h1.png \
+ch-h2.png \
+ch-m1.png \
+ch-m2.png \
+ch-s1.png \
+ch-s2.png \
 clock_base.png \
-cm-00.png \
-cm-01.png \
-cm-02.png \
-cm-03.png \
-cm-04.png \
-cm-05.png \
-cm-06.png \
-cm-07.png \
-cm-08.png \
-cm-09.png \
-cm-10.png \
-cm-11.png \
-cm-12.png \
-cm-13.png \
-cm-14.png \
-cm-15.png \
-cm-16.png \
-cm-17.png \
-cm-18.png \
-cm-19.png \
-cm-20.png \
-cm-21.png \
-cm-22.png \
-cm-23.png \
-cm-24.png \
-cm-25.png \
-cm-26.png \
-cm-27.png \
-cm-28.png \
-cm-29.png \
-cm-30.png \
-cm-31.png \
-cm-32.png \
-cm-33.png \
-cm-34.png \
-cm-35.png \
-cm-36.png \
-cm-37.png \
-cm-38.png \
-cm-39.png \
-cm-40.png \
-cm-41.png \
-cm-42.png \
-cm-43.png \
-cm-44.png \
-cm-45.png \
-cm-46.png \
-cm-47.png \
-cm-48.png \
-cm-49.png \
-cm-50.png \
-cm-51.png \
-cm-52.png \
-cm-53.png \
-cm-54.png \
-cm-55.png \
-cm-56.png \
-cm-57.png \
-cm-58.png \
-cm-59.png \
-cs-00.png \
-cs-01.png \
-cs-02.png \
-cs-03.png \
-cs-04.png \
-cs-05.png \
-cs-06.png \
-cs-07.png \
-cs-08.png \
-cs-09.png \
-cs-10.png \
-cs-11.png \
-cs-12.png \
-cs-13.png \
-cs-14.png \
-cs-15.png \
-cs-16.png \
-cs-17.png \
-cs-18.png \
-cs-19.png \
-cs-20.png \
-cs-21.png \
-cs-22.png \
-cs-23.png \
-cs-24.png \
-cs-25.png \
-cs-26.png \
-cs-27.png \
-cs-28.png \
-cs-29.png \
-cs-30.png \
-cs-31.png \
-cs-32.png \
-cs-33.png \
-cs-34.png \
-cs-35.png \
-cs-36.png \
-cs-37.png \
-cs-38.png \
-cs-39.png \
-cs-40.png \
-cs-41.png \
-cs-42.png \
-cs-43.png \
-cs-44.png \
-cs-45.png \
-cs-46.png \
-cs-47.png \
-cs-48.png \
-cs-49.png \
-cs-50.png \
-cs-51.png \
-cs-52.png \
-cs-53.png \
-cs-54.png \
-cs-55.png \
-cs-56.png \
-cs-57.png \
-cs-58.png \
-cs-59.png \
 dia_botshad.png \
 dia_grad.png \
 dia_topshad.png \
diff --git a/data/themes/images/ch-00.png b/data/themes/images/ch-00.png
deleted file mode 100644
index 3294ed6be..000000000
Binary files a/data/themes/images/ch-00.png and /dev/null differ
diff --git a/data/themes/images/ch-01.png b/data/themes/images/ch-01.png
deleted file mode 100644
index c5ded0591..000000000
Binary files a/data/themes/images/ch-01.png and /dev/null differ
diff --git a/data/themes/images/ch-02.png b/data/themes/images/ch-02.png
deleted file mode 100644
index 32cce8bff..000000000
Binary files a/data/themes/images/ch-02.png and /dev/null differ
diff --git a/data/themes/images/ch-03.png b/data/themes/images/ch-03.png
deleted file mode 100644
index f91e820c0..000000000
Binary files a/data/themes/images/ch-03.png and /dev/null differ
diff --git a/data/themes/images/ch-04.png b/data/themes/images/ch-04.png
deleted file mode 100644
index db48bc11b..000000000
Binary files a/data/themes/images/ch-04.png and /dev/null differ
diff --git a/data/themes/images/ch-05.png b/data/themes/images/ch-05.png
deleted file mode 100644
index 43454f7a4..000000000
Binary files a/data/themes/images/ch-05.png and /dev/null differ
diff --git a/data/themes/images/ch-06.png b/data/themes/images/ch-06.png
deleted file mode 100644
index 1d036e593..000000000
Binary files a/data/themes/images/ch-06.png and /dev/null differ
diff --git a/data/themes/images/ch-07.png b/data/themes/images/ch-07.png
deleted file mode 100644
index ab0bab9a4..000000000
Binary files a/data/themes/images/ch-07.png and /dev/null differ
diff --git a/data/themes/images/ch-08.png b/data/themes/images/ch-08.png
deleted file mode 100644
index 3371505f8..000000000
Binary files a/data/themes/images/ch-08.png and /dev/null differ
diff --git a/data/themes/images/ch-09.png b/data/themes/images/ch-09.png
deleted file mode 100644
index a1175f257..000000000
Binary files a/data/themes/images/ch-09.png and /dev/null differ
diff --git a/data/themes/images/ch-10.png b/data/themes/images/ch-10.png
deleted file mode 100644
index dd9cba341..000000000
Binary files a/data/themes/images/ch-10.png and /dev/null differ
diff --git a/data/themes/images/ch-11.png b/data/themes/images/ch-11.png
deleted file mode 100644
index 07451c109..000000000
Binary files a/data/themes/images/ch-11.png and /dev/null differ
diff --git a/data/themes/images/ch-12.png b/data/themes/images/ch-12.png
deleted file mode 100644
index c76b475bb..000000000
Binary files a/data/themes/images/ch-12.png and /dev/null differ
diff --git a/data/themes/images/ch-13.png b/data/themes/images/ch-13.png
deleted file mode 100644
index 85097cde2..000000000
Binary files a/data/themes/images/ch-13.png and /dev/null differ
diff --git a/data/themes/images/ch-14.png b/data/themes/images/ch-14.png
deleted file mode 100644
index d053931ea..000000000
Binary files a/data/themes/images/ch-14.png and /dev/null differ
diff --git a/data/themes/images/ch-15.png b/data/themes/images/ch-15.png
deleted file mode 100644
index 99510f015..000000000
Binary files a/data/themes/images/ch-15.png and /dev/null differ
diff --git a/data/themes/images/ch-16.png b/data/themes/images/ch-16.png
deleted file mode 100644
index f2ca43932..000000000
Binary files a/data/themes/images/ch-16.png and /dev/null differ
diff --git a/data/themes/images/ch-17.png b/data/themes/images/ch-17.png
deleted file mode 100644
index 7cd9a533e..000000000
Binary files a/data/themes/images/ch-17.png and /dev/null differ
diff --git a/data/themes/images/ch-18.png b/data/themes/images/ch-18.png
deleted file mode 100644
index ef8daf9cc..000000000
Binary files a/data/themes/images/ch-18.png and /dev/null differ
diff --git a/data/themes/images/ch-19.png b/data/themes/images/ch-19.png
deleted file mode 100644
index 453abfad5..000000000
Binary files a/data/themes/images/ch-19.png and /dev/null differ
diff --git a/data/themes/images/ch-20.png b/data/themes/images/ch-20.png
deleted file mode 100644
index a2faf90d5..000000000
Binary files a/data/themes/images/ch-20.png and /dev/null differ
diff --git a/data/themes/images/ch-21.png b/data/themes/images/ch-21.png
deleted file mode 100644
index bc38850f2..000000000
Binary files a/data/themes/images/ch-21.png and /dev/null differ
diff --git a/data/themes/images/ch-22.png b/data/themes/images/ch-22.png
deleted file mode 100644
index d64bf89e2..000000000
Binary files a/data/themes/images/ch-22.png and /dev/null differ
diff --git a/data/themes/images/ch-23.png b/data/themes/images/ch-23.png
deleted file mode 100644
index 424ab144a..000000000
Binary files a/data/themes/images/ch-23.png and /dev/null differ
diff --git a/data/themes/images/ch-24.png b/data/themes/images/ch-24.png
deleted file mode 100644
index 6a057470d..000000000
Binary files a/data/themes/images/ch-24.png and /dev/null differ
diff --git a/data/themes/images/ch-25.png b/data/themes/images/ch-25.png
deleted file mode 100644
index 352d82ee5..000000000
Binary files a/data/themes/images/ch-25.png and /dev/null differ
diff --git a/data/themes/images/ch-26.png b/data/themes/images/ch-26.png
deleted file mode 100644
index 033fb2bb6..000000000
Binary files a/data/themes/images/ch-26.png and /dev/null differ
diff --git a/data/themes/images/ch-27.png b/data/themes/images/ch-27.png
deleted file mode 100644
index 7b25ba748..000000000
Binary files a/data/themes/images/ch-27.png and /dev/null differ
diff --git a/data/themes/images/ch-28.png b/data/themes/images/ch-28.png
deleted file mode 100644
index ea71dff3a..000000000
Binary files a/data/themes/images/ch-28.png and /dev/null differ
diff --git a/data/themes/images/ch-29.png b/data/themes/images/ch-29.png
deleted file mode 100644
index 59e24020e..000000000
Binary files a/data/themes/images/ch-29.png and /dev/null differ
diff --git a/data/themes/images/ch-30.png b/data/themes/images/ch-30.png
deleted file mode 100644
index 4eac26024..000000000
Binary files a/data/themes/images/ch-30.png and /dev/null differ
diff --git a/data/themes/images/ch-31.png b/data/themes/images/ch-31.png
deleted file mode 100644
index 45d668f6d..000000000
Binary files a/data/themes/images/ch-31.png and /dev/null differ
diff --git a/data/themes/images/ch-32.png b/data/themes/images/ch-32.png
deleted file mode 100644
index 9fa83c6d3..000000000
Binary files a/data/themes/images/ch-32.png and /dev/null differ
diff --git a/data/themes/images/ch-33.png b/data/themes/images/ch-33.png
deleted file mode 100644
index 3e6ccf39a..000000000
Binary files a/data/themes/images/ch-33.png and /dev/null differ
diff --git a/data/themes/images/ch-34.png b/data/themes/images/ch-34.png
deleted file mode 100644
index 8967a1342..000000000
Binary files a/data/themes/images/ch-34.png and /dev/null differ
diff --git a/data/themes/images/ch-35.png b/data/themes/images/ch-35.png
deleted file mode 100644
index e0db34daa..000000000
Binary files a/data/themes/images/ch-35.png and /dev/null differ
diff --git a/data/themes/images/ch-36.png b/data/themes/images/ch-36.png
deleted file mode 100644
index 9c5fad586..000000000
Binary files a/data/themes/images/ch-36.png and /dev/null differ
diff --git a/data/themes/images/ch-37.png b/data/themes/images/ch-37.png
deleted file mode 100644
index dbc3bd4f9..000000000
Binary files a/data/themes/images/ch-37.png and /dev/null differ
diff --git a/data/themes/images/ch-38.png b/data/themes/images/ch-38.png
deleted file mode 100644
index d12bd3e48..000000000
Binary files a/data/themes/images/ch-38.png and /dev/null differ
diff --git a/data/themes/images/ch-39.png b/data/themes/images/ch-39.png
deleted file mode 100644
index 9e50e9f08..000000000
Binary files a/data/themes/images/ch-39.png and /dev/null differ
diff --git a/data/themes/images/ch-40.png b/data/themes/images/ch-40.png
deleted file mode 100644
index af59c0fa3..000000000
Binary files a/data/themes/images/ch-40.png and /dev/null differ
diff --git a/data/themes/images/ch-41.png b/data/themes/images/ch-41.png
deleted file mode 100644
index 6950584dd..000000000
Binary files a/data/themes/images/ch-41.png and /dev/null differ
diff --git a/data/themes/images/ch-42.png b/data/themes/images/ch-42.png
deleted file mode 100644
index 4818903ca..000000000
Binary files a/data/themes/images/ch-42.png and /dev/null differ
diff --git a/data/themes/images/ch-43.png b/data/themes/images/ch-43.png
deleted file mode 100644
index a3c8868f9..000000000
Binary files a/data/themes/images/ch-43.png and /dev/null differ
diff --git a/data/themes/images/ch-44.png b/data/themes/images/ch-44.png
deleted file mode 100644
index 0a1b02a06..000000000
Binary files a/data/themes/images/ch-44.png and /dev/null differ
diff --git a/data/themes/images/ch-45.png b/data/themes/images/ch-45.png
deleted file mode 100644
index a90f99433..000000000
Binary files a/data/themes/images/ch-45.png and /dev/null differ
diff --git a/data/themes/images/ch-46.png b/data/themes/images/ch-46.png
deleted file mode 100644
index a084527e4..000000000
Binary files a/data/themes/images/ch-46.png and /dev/null differ
diff --git a/data/themes/images/ch-47.png b/data/themes/images/ch-47.png
deleted file mode 100644
index d14fc09ec..000000000
Binary files a/data/themes/images/ch-47.png and /dev/null differ
diff --git a/data/themes/images/ch-48.png b/data/themes/images/ch-48.png
deleted file mode 100644
index 24e1c5e7c..000000000
Binary files a/data/themes/images/ch-48.png and /dev/null differ
diff --git a/data/themes/images/ch-49.png b/data/themes/images/ch-49.png
deleted file mode 100644
index d42310191..000000000
Binary files a/data/themes/images/ch-49.png and /dev/null differ
diff --git a/data/themes/images/ch-50.png b/data/themes/images/ch-50.png
deleted file mode 100644
index 7fb56afbf..000000000
Binary files a/data/themes/images/ch-50.png and /dev/null differ
diff --git a/data/themes/images/ch-51.png b/data/themes/images/ch-51.png
deleted file mode 100644
index 6086295c7..000000000
Binary files a/data/themes/images/ch-51.png and /dev/null differ
diff --git a/data/themes/images/ch-52.png b/data/themes/images/ch-52.png
deleted file mode 100644
index c94b706b7..000000000
Binary files a/data/themes/images/ch-52.png and /dev/null differ
diff --git a/data/themes/images/ch-53.png b/data/themes/images/ch-53.png
deleted file mode 100644
index 9f53f452e..000000000
Binary files a/data/themes/images/ch-53.png and /dev/null differ
diff --git a/data/themes/images/ch-54.png b/data/themes/images/ch-54.png
deleted file mode 100644
index 22ddbb0f7..000000000
Binary files a/data/themes/images/ch-54.png and /dev/null differ
diff --git a/data/themes/images/ch-55.png b/data/themes/images/ch-55.png
deleted file mode 100644
index d6992e31f..000000000
Binary files a/data/themes/images/ch-55.png and /dev/null differ
diff --git a/data/themes/images/ch-56.png b/data/themes/images/ch-56.png
deleted file mode 100644
index 35a7ddee3..000000000
Binary files a/data/themes/images/ch-56.png and /dev/null differ
diff --git a/data/themes/images/ch-57.png b/data/themes/images/ch-57.png
deleted file mode 100644
index a01ed0573..000000000
Binary files a/data/themes/images/ch-57.png and /dev/null differ
diff --git a/data/themes/images/ch-58.png b/data/themes/images/ch-58.png
deleted file mode 100644
index 2201547ae..000000000
Binary files a/data/themes/images/ch-58.png and /dev/null differ
diff --git a/data/themes/images/ch-59.png b/data/themes/images/ch-59.png
deleted file mode 100644
index 690f77592..000000000
Binary files a/data/themes/images/ch-59.png and /dev/null differ
diff --git a/data/themes/images/ch-h1.png b/data/themes/images/ch-h1.png
new file mode 100644
index 000000000..bd6b7ef9a
Binary files /dev/null and b/data/themes/images/ch-h1.png differ
diff --git a/data/themes/images/ch-h2.png b/data/themes/images/ch-h2.png
new file mode 100644
index 000000000..9edee5795
Binary files /dev/null and b/data/themes/images/ch-h2.png differ
diff --git a/data/themes/images/ch-m1.png b/data/themes/images/ch-m1.png
new file mode 100644
index 000000000..5a3dff499
Binary files /dev/null and b/data/themes/images/ch-m1.png differ
diff --git a/data/themes/images/ch-m2.png b/data/themes/images/ch-m2.png
new file mode 100644
index 000000000..a04a8b792
Binary files /dev/null and b/data/themes/images/ch-m2.png differ
diff --git a/data/themes/images/ch-s1.png b/data/themes/images/ch-s1.png
new file mode 100644
index 000000000..5ef6adc0a
Binary files /dev/null and b/data/themes/images/ch-s1.png differ
diff --git a/data/themes/images/ch-s2.png b/data/themes/images/ch-s2.png
new file mode 100644
index 000000000..4acd92846
Binary files /dev/null and b/data/themes/images/ch-s2.png differ
diff --git a/data/themes/images/cm-00.png b/data/themes/images/cm-00.png
deleted file mode 100644
index bb766e345..000000000
Binary files a/data/themes/images/cm-00.png and /dev/null differ
diff --git a/data/themes/images/cm-01.png b/data/themes/images/cm-01.png
deleted file mode 100644
index b69f44db7..000000000
Binary files a/data/themes/images/cm-01.png and /dev/null differ
diff --git a/data/themes/images/cm-02.png b/data/themes/images/cm-02.png
deleted file mode 100644
index 70f85d340..000000000
Binary files a/data/themes/images/cm-02.png and /dev/null differ
diff --git a/data/themes/images/cm-03.png b/data/themes/images/cm-03.png
deleted file mode 100644
index e1d5ef488..000000000
Binary files a/data/themes/images/cm-03.png and /dev/null differ
diff --git a/data/themes/images/cm-04.png b/data/themes/images/cm-04.png
deleted file mode 100644
index e40dad6d4..000000000
Binary files a/data/themes/images/cm-04.png and /dev/null differ
diff --git a/data/themes/images/cm-05.png b/data/themes/images/cm-05.png
deleted file mode 100644
index 59dcac18f..000000000
Binary files a/data/themes/images/cm-05.png and /dev/null differ
diff --git a/data/themes/images/cm-06.png b/data/themes/images/cm-06.png
deleted file mode 100644
index 49ef3a167..000000000
Binary files a/data/themes/images/cm-06.png and /dev/null differ
diff --git a/data/themes/images/cm-07.png b/data/themes/images/cm-07.png
deleted file mode 100644
index f766e4bd7..000000000
Binary files a/data/themes/images/cm-07.png and /dev/null differ
diff --git a/data/themes/images/cm-08.png b/data/themes/images/cm-08.png
deleted file mode 100644
index 48152f7b9..000000000
Binary files a/data/themes/images/cm-08.png and /dev/null differ
diff --git a/data/themes/images/cm-09.png b/data/themes/images/cm-09.png
deleted file mode 100644
index 25c906e65..000000000
Binary files a/data/themes/images/cm-09.png and /dev/null differ
diff --git a/data/themes/images/cm-10.png b/data/themes/images/cm-10.png
deleted file mode 100644
index 7b4d0691c..000000000
Binary files a/data/themes/images/cm-10.png and /dev/null differ
diff --git a/data/themes/images/cm-11.png b/data/themes/images/cm-11.png
deleted file mode 100644
index f0c78d0f4..000000000
Binary files a/data/themes/images/cm-11.png and /dev/null differ
diff --git a/data/themes/images/cm-12.png b/data/themes/images/cm-12.png
deleted file mode 100644
index 070c10c79..000000000
Binary files a/data/themes/images/cm-12.png and /dev/null differ
diff --git a/data/themes/images/cm-13.png b/data/themes/images/cm-13.png
deleted file mode 100644
index 19526f2d2..000000000
Binary files a/data/themes/images/cm-13.png and /dev/null differ
diff --git a/data/themes/images/cm-14.png b/data/themes/images/cm-14.png
deleted file mode 100644
index 97c9135a2..000000000
Binary files a/data/themes/images/cm-14.png and /dev/null differ
diff --git a/data/themes/images/cm-15.png b/data/themes/images/cm-15.png
deleted file mode 100644
index 8643a7358..000000000
Binary files a/data/themes/images/cm-15.png and /dev/null differ
diff --git a/data/themes/images/cm-16.png b/data/themes/images/cm-16.png
deleted file mode 100644
index 7e3b148d6..000000000
Binary files a/data/themes/images/cm-16.png and /dev/null differ
diff --git a/data/themes/images/cm-17.png b/data/themes/images/cm-17.png
deleted file mode 100644
index bc30f6491..000000000
Binary files a/data/themes/images/cm-17.png and /dev/null differ
diff --git a/data/themes/images/cm-18.png b/data/themes/images/cm-18.png
deleted file mode 100644
index bf462628d..000000000
Binary files a/data/themes/images/cm-18.png and /dev/null differ
diff --git a/data/themes/images/cm-19.png b/data/themes/images/cm-19.png
deleted file mode 100644
index 93f496b19..000000000
Binary files a/data/themes/images/cm-19.png and /dev/null differ
diff --git a/data/themes/images/cm-20.png b/data/themes/images/cm-20.png
deleted file mode 100644
index f492f18ef..000000000
Binary files a/data/themes/images/cm-20.png and /dev/null differ
diff --git a/data/themes/images/cm-21.png b/data/themes/images/cm-21.png
deleted file mode 100644
index e1e4d16fd..000000000
Binary files a/data/themes/images/cm-21.png and /dev/null differ
diff --git a/data/themes/images/cm-22.png b/data/themes/images/cm-22.png
deleted file mode 100644
index 1a72e523a..000000000
Binary files a/data/themes/images/cm-22.png and /dev/null differ
diff --git a/data/themes/images/cm-23.png b/data/themes/images/cm-23.png
deleted file mode 100644
index 6984a3a1c..000000000
Binary files a/data/themes/images/cm-23.png and /dev/null differ
diff --git a/data/themes/images/cm-24.png b/data/themes/images/cm-24.png
deleted file mode 100644
index 869c45b06..000000000
Binary files a/data/themes/images/cm-24.png and /dev/null differ
diff --git a/data/themes/images/cm-25.png b/data/themes/images/cm-25.png
deleted file mode 100644
index e2b1be41c..000000000
Binary files a/data/themes/images/cm-25.png and /dev/null differ
diff --git a/data/themes/images/cm-26.png b/data/themes/images/cm-26.png
deleted file mode 100644
index 57aef7536..000000000
Binary files a/data/themes/images/cm-26.png and /dev/null differ
diff --git a/data/themes/images/cm-27.png b/data/themes/images/cm-27.png
deleted file mode 100644
index e3f2b5c0e..000000000
Binary files a/data/themes/images/cm-27.png and /dev/null differ
diff --git a/data/themes/images/cm-28.png b/data/themes/images/cm-28.png
deleted file mode 100644
index bdf472668..000000000
Binary files a/data/themes/images/cm-28.png and /dev/null differ
diff --git a/data/themes/images/cm-29.png b/data/themes/images/cm-29.png
deleted file mode 100644
index b9f9bc957..000000000
Binary files a/data/themes/images/cm-29.png and /dev/null differ
diff --git a/data/themes/images/cm-30.png b/data/themes/images/cm-30.png
deleted file mode 100644
index 80c40a0f4..000000000
Binary files a/data/themes/images/cm-30.png and /dev/null differ
diff --git a/data/themes/images/cm-31.png b/data/themes/images/cm-31.png
deleted file mode 100644
index 748006d75..000000000
Binary files a/data/themes/images/cm-31.png and /dev/null differ
diff --git a/data/themes/images/cm-32.png b/data/themes/images/cm-32.png
deleted file mode 100644
index 73dcd4426..000000000
Binary files a/data/themes/images/cm-32.png and /dev/null differ
diff --git a/data/themes/images/cm-33.png b/data/themes/images/cm-33.png
deleted file mode 100644
index f0a705b7e..000000000
Binary files a/data/themes/images/cm-33.png and /dev/null differ
diff --git a/data/themes/images/cm-34.png b/data/themes/images/cm-34.png
deleted file mode 100644
index 4c0ada930..000000000
Binary files a/data/themes/images/cm-34.png and /dev/null differ
diff --git a/data/themes/images/cm-35.png b/data/themes/images/cm-35.png
deleted file mode 100644
index 427149a5d..000000000
Binary files a/data/themes/images/cm-35.png and /dev/null differ
diff --git a/data/themes/images/cm-36.png b/data/themes/images/cm-36.png
deleted file mode 100644
index 59a7d0401..000000000
Binary files a/data/themes/images/cm-36.png and /dev/null differ
diff --git a/data/themes/images/cm-37.png b/data/themes/images/cm-37.png
deleted file mode 100644
index 9226d34c0..000000000
Binary files a/data/themes/images/cm-37.png and /dev/null differ
diff --git a/data/themes/images/cm-38.png b/data/themes/images/cm-38.png
deleted file mode 100644
index e7ea1fc13..000000000
Binary files a/data/themes/images/cm-38.png and /dev/null differ
diff --git a/data/themes/images/cm-39.png b/data/themes/images/cm-39.png
deleted file mode 100644
index 2823f5819..000000000
Binary files a/data/themes/images/cm-39.png and /dev/null differ
diff --git a/data/themes/images/cm-40.png b/data/themes/images/cm-40.png
deleted file mode 100644
index 1dd9229d1..000000000
Binary files a/data/themes/images/cm-40.png and /dev/null differ
diff --git a/data/themes/images/cm-41.png b/data/themes/images/cm-41.png
deleted file mode 100644
index 0e0a6c041..000000000
Binary files a/data/themes/images/cm-41.png and /dev/null differ
diff --git a/data/themes/images/cm-42.png b/data/themes/images/cm-42.png
deleted file mode 100644
index 39ffa7a4b..000000000
Binary files a/data/themes/images/cm-42.png and /dev/null differ
diff --git a/data/themes/images/cm-43.png b/data/themes/images/cm-43.png
deleted file mode 100644
index 4f7e28381..000000000
Binary files a/data/themes/images/cm-43.png and /dev/null differ
diff --git a/data/themes/images/cm-44.png b/data/themes/images/cm-44.png
deleted file mode 100644
index 500a72b90..000000000
Binary files a/data/themes/images/cm-44.png and /dev/null differ
diff --git a/data/themes/images/cm-45.png b/data/themes/images/cm-45.png
deleted file mode 100644
index ad58b6a76..000000000
Binary files a/data/themes/images/cm-45.png and /dev/null differ
diff --git a/data/themes/images/cm-46.png b/data/themes/images/cm-46.png
deleted file mode 100644
index e39851a20..000000000
Binary files a/data/themes/images/cm-46.png and /dev/null differ
diff --git a/data/themes/images/cm-47.png b/data/themes/images/cm-47.png
deleted file mode 100644
index 9ec7eac0b..000000000
Binary files a/data/themes/images/cm-47.png and /dev/null differ
diff --git a/data/themes/images/cm-48.png b/data/themes/images/cm-48.png
deleted file mode 100644
index ed94dc555..000000000
Binary files a/data/themes/images/cm-48.png and /dev/null differ
diff --git a/data/themes/images/cm-49.png b/data/themes/images/cm-49.png
deleted file mode 100644
index 09d49f792..000000000
Binary files a/data/themes/images/cm-49.png and /dev/null differ
diff --git a/data/themes/images/cm-50.png b/data/themes/images/cm-50.png
deleted file mode 100644
index fe7012432..000000000
Binary files a/data/themes/images/cm-50.png and /dev/null differ
diff --git a/data/themes/images/cm-51.png b/data/themes/images/cm-51.png
deleted file mode 100644
index 46cd0ab36..000000000
Binary files a/data/themes/images/cm-51.png and /dev/null differ
diff --git a/data/themes/images/cm-52.png b/data/themes/images/cm-52.png
deleted file mode 100644
index 1f48e27bf..000000000
Binary files a/data/themes/images/cm-52.png and /dev/null differ
diff --git a/data/themes/images/cm-53.png b/data/themes/images/cm-53.png
deleted file mode 100644
index fe515f745..000000000
Binary files a/data/themes/images/cm-53.png and /dev/null differ
diff --git a/data/themes/images/cm-54.png b/data/themes/images/cm-54.png
deleted file mode 100644
index 215f18f06..000000000
Binary files a/data/themes/images/cm-54.png and /dev/null differ
diff --git a/data/themes/images/cm-55.png b/data/themes/images/cm-55.png
deleted file mode 100644
index 50ef273e3..000000000
Binary files a/data/themes/images/cm-55.png and /dev/null differ
diff --git a/data/themes/images/cm-56.png b/data/themes/images/cm-56.png
deleted file mode 100644
index ca4c5e366..000000000
Binary files a/data/themes/images/cm-56.png and /dev/null differ
diff --git a/data/themes/images/cm-57.png b/data/themes/images/cm-57.png
deleted file mode 100644
index 67cb78497..000000000
Binary files a/data/themes/images/cm-57.png and /dev/null differ
diff --git a/data/themes/images/cm-58.png b/data/themes/images/cm-58.png
deleted file mode 100644
index 611a04018..000000000
Binary files a/data/themes/images/cm-58.png and /dev/null differ
diff --git a/data/themes/images/cm-59.png b/data/themes/images/cm-59.png
deleted file mode 100644
index 86f7014d5..000000000
Binary files a/data/themes/images/cm-59.png and /dev/null differ
diff --git a/data/themes/images/cs-00.png b/data/themes/images/cs-00.png
deleted file mode 100644
index d658d6f4e..000000000
Binary files a/data/themes/images/cs-00.png and /dev/null differ
diff --git a/data/themes/images/cs-01.png b/data/themes/images/cs-01.png
deleted file mode 100644
index 0c06d9ce4..000000000
Binary files a/data/themes/images/cs-01.png and /dev/null differ
diff --git a/data/themes/images/cs-02.png b/data/themes/images/cs-02.png
deleted file mode 100644
index 0530227fd..000000000
Binary files a/data/themes/images/cs-02.png and /dev/null differ
diff --git a/data/themes/images/cs-03.png b/data/themes/images/cs-03.png
deleted file mode 100644
index a944ea8a7..000000000
Binary files a/data/themes/images/cs-03.png and /dev/null differ
diff --git a/data/themes/images/cs-04.png b/data/themes/images/cs-04.png
deleted file mode 100644
index ea92e052d..000000000
Binary files a/data/themes/images/cs-04.png and /dev/null differ
diff --git a/data/themes/images/cs-05.png b/data/themes/images/cs-05.png
deleted file mode 100644
index 16c6ec5f2..000000000
Binary files a/data/themes/images/cs-05.png and /dev/null differ
diff --git a/data/themes/images/cs-06.png b/data/themes/images/cs-06.png
deleted file mode 100644
index cdeb5caf9..000000000
Binary files a/data/themes/images/cs-06.png and /dev/null differ
diff --git a/data/themes/images/cs-07.png b/data/themes/images/cs-07.png
deleted file mode 100644
index eca463e39..000000000
Binary files a/data/themes/images/cs-07.png and /dev/null differ
diff --git a/data/themes/images/cs-08.png b/data/themes/images/cs-08.png
deleted file mode 100644
index cb01b772f..000000000
Binary files a/data/themes/images/cs-08.png and /dev/null differ
diff --git a/data/themes/images/cs-09.png b/data/themes/images/cs-09.png
deleted file mode 100644
index 7a1e70e6d..000000000
Binary files a/data/themes/images/cs-09.png and /dev/null differ
diff --git a/data/themes/images/cs-10.png b/data/themes/images/cs-10.png
deleted file mode 100644
index a70170cda..000000000
Binary files a/data/themes/images/cs-10.png and /dev/null differ
diff --git a/data/themes/images/cs-11.png b/data/themes/images/cs-11.png
deleted file mode 100644
index a58c968cf..000000000
Binary files a/data/themes/images/cs-11.png and /dev/null differ
diff --git a/data/themes/images/cs-12.png b/data/themes/images/cs-12.png
deleted file mode 100644
index 990f6642d..000000000
Binary files a/data/themes/images/cs-12.png and /dev/null differ
diff --git a/data/themes/images/cs-13.png b/data/themes/images/cs-13.png
deleted file mode 100644
index c6277e23d..000000000
Binary files a/data/themes/images/cs-13.png and /dev/null differ
diff --git a/data/themes/images/cs-14.png b/data/themes/images/cs-14.png
deleted file mode 100644
index d56f961aa..000000000
Binary files a/data/themes/images/cs-14.png and /dev/null differ
diff --git a/data/themes/images/cs-15.png b/data/themes/images/cs-15.png
deleted file mode 100644
index 54069b5b3..000000000
Binary files a/data/themes/images/cs-15.png and /dev/null differ
diff --git a/data/themes/images/cs-16.png b/data/themes/images/cs-16.png
deleted file mode 100644
index b4b424ab8..000000000
Binary files a/data/themes/images/cs-16.png and /dev/null differ
diff --git a/data/themes/images/cs-17.png b/data/themes/images/cs-17.png
deleted file mode 100644
index 81842ddc0..000000000
Binary files a/data/themes/images/cs-17.png and /dev/null differ
diff --git a/data/themes/images/cs-18.png b/data/themes/images/cs-18.png
deleted file mode 100644
index 5694c7cac..000000000
Binary files a/data/themes/images/cs-18.png and /dev/null differ
diff --git a/data/themes/images/cs-19.png b/data/themes/images/cs-19.png
deleted file mode 100644
index 1347728c7..000000000
Binary files a/data/themes/images/cs-19.png and /dev/null differ
diff --git a/data/themes/images/cs-20.png b/data/themes/images/cs-20.png
deleted file mode 100644
index c86b7f7e4..000000000
Binary files a/data/themes/images/cs-20.png and /dev/null differ
diff --git a/data/themes/images/cs-21.png b/data/themes/images/cs-21.png
deleted file mode 100644
index 1da210005..000000000
Binary files a/data/themes/images/cs-21.png and /dev/null differ
diff --git a/data/themes/images/cs-22.png b/data/themes/images/cs-22.png
deleted file mode 100644
index 7f880386b..000000000
Binary files a/data/themes/images/cs-22.png and /dev/null differ
diff --git a/data/themes/images/cs-23.png b/data/themes/images/cs-23.png
deleted file mode 100644
index 344753e0f..000000000
Binary files a/data/themes/images/cs-23.png and /dev/null differ
diff --git a/data/themes/images/cs-24.png b/data/themes/images/cs-24.png
deleted file mode 100644
index 582187317..000000000
Binary files a/data/themes/images/cs-24.png and /dev/null differ
diff --git a/data/themes/images/cs-25.png b/data/themes/images/cs-25.png
deleted file mode 100644
index ff52c3c98..000000000
Binary files a/data/themes/images/cs-25.png and /dev/null differ
diff --git a/data/themes/images/cs-26.png b/data/themes/images/cs-26.png
deleted file mode 100644
index d3ecc38df..000000000
Binary files a/data/themes/images/cs-26.png and /dev/null differ
diff --git a/data/themes/images/cs-27.png b/data/themes/images/cs-27.png
deleted file mode 100644
index c7264bab2..000000000
Binary files a/data/themes/images/cs-27.png and /dev/null differ
diff --git a/data/themes/images/cs-28.png b/data/themes/images/cs-28.png
deleted file mode 100644
index b3d2b79f7..000000000
Binary files a/data/themes/images/cs-28.png and /dev/null differ
diff --git a/data/themes/images/cs-29.png b/data/themes/images/cs-29.png
deleted file mode 100644
index 428e66cc8..000000000
Binary files a/data/themes/images/cs-29.png and /dev/null differ
diff --git a/data/themes/images/cs-30.png b/data/themes/images/cs-30.png
deleted file mode 100644
index 3e8f47de0..000000000
Binary files a/data/themes/images/cs-30.png and /dev/null differ
diff --git a/data/themes/images/cs-31.png b/data/themes/images/cs-31.png
deleted file mode 100644
index 4fb6b6ed4..000000000
Binary files a/data/themes/images/cs-31.png and /dev/null differ
diff --git a/data/themes/images/cs-32.png b/data/themes/images/cs-32.png
deleted file mode 100644
index d72070d3f..000000000
Binary files a/data/themes/images/cs-32.png and /dev/null differ
diff --git a/data/themes/images/cs-33.png b/data/themes/images/cs-33.png
deleted file mode 100644
index 222a38414..000000000
Binary files a/data/themes/images/cs-33.png and /dev/null differ
diff --git a/data/themes/images/cs-34.png b/data/themes/images/cs-34.png
deleted file mode 100644
index bc2c40537..000000000
Binary files a/data/themes/images/cs-34.png and /dev/null differ
diff --git a/data/themes/images/cs-35.png b/data/themes/images/cs-35.png
deleted file mode 100644
index d12550157..000000000
Binary files a/data/themes/images/cs-35.png and /dev/null differ
diff --git a/data/themes/images/cs-36.png b/data/themes/images/cs-36.png
deleted file mode 100644
index b713f6ea2..000000000
Binary files a/data/themes/images/cs-36.png and /dev/null differ
diff --git a/data/themes/images/cs-37.png b/data/themes/images/cs-37.png
deleted file mode 100644
index 4befe6116..000000000
Binary files a/data/themes/images/cs-37.png and /dev/null differ
diff --git a/data/themes/images/cs-38.png b/data/themes/images/cs-38.png
deleted file mode 100644
index f5b7cb6bd..000000000
Binary files a/data/themes/images/cs-38.png and /dev/null differ
diff --git a/data/themes/images/cs-39.png b/data/themes/images/cs-39.png
deleted file mode 100644
index 887338be7..000000000
Binary files a/data/themes/images/cs-39.png and /dev/null differ
diff --git a/data/themes/images/cs-40.png b/data/themes/images/cs-40.png
deleted file mode 100644
index 497110de7..000000000
Binary files a/data/themes/images/cs-40.png and /dev/null differ
diff --git a/data/themes/images/cs-41.png b/data/themes/images/cs-41.png
deleted file mode 100644
index d651ba272..000000000
Binary files a/data/themes/images/cs-41.png and /dev/null differ
diff --git a/data/themes/images/cs-42.png b/data/themes/images/cs-42.png
deleted file mode 100644
index 4e741a5af..000000000
Binary files a/data/themes/images/cs-42.png and /dev/null differ
diff --git a/data/themes/images/cs-43.png b/data/themes/images/cs-43.png
deleted file mode 100644
index cd6aafa8a..000000000
Binary files a/data/themes/images/cs-43.png and /dev/null differ
diff --git a/data/themes/images/cs-44.png b/data/themes/images/cs-44.png
deleted file mode 100644
index c8657ebcd..000000000
Binary files a/data/themes/images/cs-44.png and /dev/null differ
diff --git a/data/themes/images/cs-45.png b/data/themes/images/cs-45.png
deleted file mode 100644
index 80dab6405..000000000
Binary files a/data/themes/images/cs-45.png and /dev/null differ
diff --git a/data/themes/images/cs-46.png b/data/themes/images/cs-46.png
deleted file mode 100644
index 7adbe1fa2..000000000
Binary files a/data/themes/images/cs-46.png and /dev/null differ
diff --git a/data/themes/images/cs-47.png b/data/themes/images/cs-47.png
deleted file mode 100644
index 20858b4fe..000000000
Binary files a/data/themes/images/cs-47.png and /dev/null differ
diff --git a/data/themes/images/cs-48.png b/data/themes/images/cs-48.png
deleted file mode 100644
index 4792b2866..000000000
Binary files a/data/themes/images/cs-48.png and /dev/null differ
diff --git a/data/themes/images/cs-49.png b/data/themes/images/cs-49.png
deleted file mode 100644
index ffa23590a..000000000
Binary files a/data/themes/images/cs-49.png and /dev/null differ
diff --git a/data/themes/images/cs-50.png b/data/themes/images/cs-50.png
deleted file mode 100644
index d1e4d85e1..000000000
Binary files a/data/themes/images/cs-50.png and /dev/null differ
diff --git a/data/themes/images/cs-51.png b/data/themes/images/cs-51.png
deleted file mode 100644
index 7afc32582..000000000
Binary files a/data/themes/images/cs-51.png and /dev/null differ
diff --git a/data/themes/images/cs-52.png b/data/themes/images/cs-52.png
deleted file mode 100644
index e9663b53b..000000000
Binary files a/data/themes/images/cs-52.png and /dev/null differ
diff --git a/data/themes/images/cs-53.png b/data/themes/images/cs-53.png
deleted file mode 100644
index 882bde877..000000000
Binary files a/data/themes/images/cs-53.png and /dev/null differ
diff --git a/data/themes/images/cs-54.png b/data/themes/images/cs-54.png
deleted file mode 100644
index a5549dfb6..000000000
Binary files a/data/themes/images/cs-54.png and /dev/null differ
diff --git a/data/themes/images/cs-55.png b/data/themes/images/cs-55.png
deleted file mode 100644
index 020dfe901..000000000
Binary files a/data/themes/images/cs-55.png and /dev/null differ
diff --git a/data/themes/images/cs-56.png b/data/themes/images/cs-56.png
deleted file mode 100644
index b335d19f2..000000000
Binary files a/data/themes/images/cs-56.png and /dev/null differ
diff --git a/data/themes/images/cs-57.png b/data/themes/images/cs-57.png
deleted file mode 100644
index f73ef094a..000000000
Binary files a/data/themes/images/cs-57.png and /dev/null differ
diff --git a/data/themes/images/cs-58.png b/data/themes/images/cs-58.png
deleted file mode 100644
index 43aa6cd2e..000000000
Binary files a/data/themes/images/cs-58.png and /dev/null differ
diff --git a/data/themes/images/cs-59.png b/data/themes/images/cs-59.png
deleted file mode 100644
index acdccf679..000000000
Binary files a/data/themes/images/cs-59.png and /dev/null differ