diff --git a/js/mac.js b/js/mac.js
index 1d2b32e..8f4e5a7 100644
--- a/js/mac.js
+++ b/js/mac.js
@@ -249,6 +249,7 @@ window.Win10 = {
                 //>> 获取弹窗标题
                 var title = $this.data('title')||'',
                     areaAndOffset,icon;
+
                 //>> 判断是否有标题图片
                 var bg=$this.data('icon-bg')?$this.data('icon-bg'):'';
                 if($this.data('icon-image')) {
@@ -260,7 +261,10 @@ window.Win10 = {
                     icon = '<i class="fa fa-fw fa-'+$this.data('icon-font')+' icon '+bg+'"></i>';
                 }
                 if(!title && $this.children('.icon').length===1 && $this.children('.title').length===1){
-                    title = $this.children('.icon').prop("outerHTML")+$this.children('.title').html();
+                    title = $this.children('.title').html();
+                    if(!icon){
+                        icon = $this.children('.icon').prop("outerHTML");
+                    }
                 }
                 //>> 判断是否需要 设置 区域宽度高度
                 if($this.data('area-offset')) {
diff --git a/plugins/theme_switcher/bg/bg1.jpg b/plugins/theme_switcher/bg/bg1.jpg
index 6d0698b..b08b38c 100644
Binary files a/plugins/theme_switcher/bg/bg1.jpg and b/plugins/theme_switcher/bg/bg1.jpg differ
diff --git a/plugins/theme_switcher/bg/bg10.jpg b/plugins/theme_switcher/bg/bg10.jpg
index 95a2d5e..5174a5c 100644
Binary files a/plugins/theme_switcher/bg/bg10.jpg and b/plugins/theme_switcher/bg/bg10.jpg differ
diff --git a/plugins/theme_switcher/bg/bg10_small.jpg b/plugins/theme_switcher/bg/bg10_small.jpg
index 045dbd5..6bcd241 100644
Binary files a/plugins/theme_switcher/bg/bg10_small.jpg and b/plugins/theme_switcher/bg/bg10_small.jpg differ
diff --git a/plugins/theme_switcher/bg/bg11.jpg b/plugins/theme_switcher/bg/bg11.jpg
index be99b4a..4147c18 100644
Binary files a/plugins/theme_switcher/bg/bg11.jpg and b/plugins/theme_switcher/bg/bg11.jpg differ
diff --git a/plugins/theme_switcher/bg/bg11_small.jpg b/plugins/theme_switcher/bg/bg11_small.jpg
index 5885022..8128e9d 100644
Binary files a/plugins/theme_switcher/bg/bg11_small.jpg and b/plugins/theme_switcher/bg/bg11_small.jpg differ
diff --git a/plugins/theme_switcher/bg/bg12.jpg b/plugins/theme_switcher/bg/bg12.jpg
deleted file mode 100644
index d12fbee..0000000
Binary files a/plugins/theme_switcher/bg/bg12.jpg and /dev/null differ
diff --git a/plugins/theme_switcher/bg/bg12_small.jpg b/plugins/theme_switcher/bg/bg12_small.jpg
deleted file mode 100644
index 3c75d2f..0000000
Binary files a/plugins/theme_switcher/bg/bg12_small.jpg and /dev/null differ
diff --git a/plugins/theme_switcher/bg/bg13.jpg b/plugins/theme_switcher/bg/bg13.jpg
deleted file mode 100644
index f0aac0e..0000000
Binary files a/plugins/theme_switcher/bg/bg13.jpg and /dev/null differ
diff --git a/plugins/theme_switcher/bg/bg13_small.jpg b/plugins/theme_switcher/bg/bg13_small.jpg
deleted file mode 100644
index 165f72b..0000000
Binary files a/plugins/theme_switcher/bg/bg13_small.jpg and /dev/null differ
diff --git a/plugins/theme_switcher/bg/bg14.jpg b/plugins/theme_switcher/bg/bg14.jpg
deleted file mode 100644
index aa22d12..0000000
Binary files a/plugins/theme_switcher/bg/bg14.jpg and /dev/null differ
diff --git a/plugins/theme_switcher/bg/bg14_small.jpg b/plugins/theme_switcher/bg/bg14_small.jpg
deleted file mode 100644
index 955841d..0000000
Binary files a/plugins/theme_switcher/bg/bg14_small.jpg and /dev/null differ
diff --git a/plugins/theme_switcher/bg/bg15.jpg b/plugins/theme_switcher/bg/bg15.jpg
deleted file mode 100644
index 9ef0008..0000000
Binary files a/plugins/theme_switcher/bg/bg15.jpg and /dev/null differ
diff --git a/plugins/theme_switcher/bg/bg15_small.jpg b/plugins/theme_switcher/bg/bg15_small.jpg
deleted file mode 100644
index 394ce1d..0000000
Binary files a/plugins/theme_switcher/bg/bg15_small.jpg and /dev/null differ
diff --git a/plugins/theme_switcher/bg/bg1_small.jpg b/plugins/theme_switcher/bg/bg1_small.jpg
index 962190b..3afdbc0 100644
Binary files a/plugins/theme_switcher/bg/bg1_small.jpg and b/plugins/theme_switcher/bg/bg1_small.jpg differ
diff --git a/plugins/theme_switcher/bg/bg2.jpg b/plugins/theme_switcher/bg/bg2.jpg
index f78d34f..69555ee 100644
Binary files a/plugins/theme_switcher/bg/bg2.jpg and b/plugins/theme_switcher/bg/bg2.jpg differ
diff --git a/plugins/theme_switcher/bg/bg2_small.jpg b/plugins/theme_switcher/bg/bg2_small.jpg
index 54090d3..caf3b1e 100644
Binary files a/plugins/theme_switcher/bg/bg2_small.jpg and b/plugins/theme_switcher/bg/bg2_small.jpg differ
diff --git a/plugins/theme_switcher/bg/bg3.jpg b/plugins/theme_switcher/bg/bg3.jpg
index 4b32ed5..d9f53c8 100644
Binary files a/plugins/theme_switcher/bg/bg3.jpg and b/plugins/theme_switcher/bg/bg3.jpg differ
diff --git a/plugins/theme_switcher/bg/bg3_small.jpg b/plugins/theme_switcher/bg/bg3_small.jpg
index 4c397d2..317bf38 100644
Binary files a/plugins/theme_switcher/bg/bg3_small.jpg and b/plugins/theme_switcher/bg/bg3_small.jpg differ
diff --git a/plugins/theme_switcher/bg/bg4.jpg b/plugins/theme_switcher/bg/bg4.jpg
index 54c47c1..0792854 100644
Binary files a/plugins/theme_switcher/bg/bg4.jpg and b/plugins/theme_switcher/bg/bg4.jpg differ
diff --git a/plugins/theme_switcher/bg/bg4_small.jpg b/plugins/theme_switcher/bg/bg4_small.jpg
index 16842ff..bcd1e7f 100644
Binary files a/plugins/theme_switcher/bg/bg4_small.jpg and b/plugins/theme_switcher/bg/bg4_small.jpg differ
diff --git a/plugins/theme_switcher/bg/bg5.jpg b/plugins/theme_switcher/bg/bg5.jpg
index 51742c1..86ca2eb 100644
Binary files a/plugins/theme_switcher/bg/bg5.jpg and b/plugins/theme_switcher/bg/bg5.jpg differ
diff --git a/plugins/theme_switcher/bg/bg5_small.jpg b/plugins/theme_switcher/bg/bg5_small.jpg
index a13f3b6..ff30037 100644
Binary files a/plugins/theme_switcher/bg/bg5_small.jpg and b/plugins/theme_switcher/bg/bg5_small.jpg differ
diff --git a/plugins/theme_switcher/bg/bg6.jpg b/plugins/theme_switcher/bg/bg6.jpg
index d9ad574..b369864 100644
Binary files a/plugins/theme_switcher/bg/bg6.jpg and b/plugins/theme_switcher/bg/bg6.jpg differ
diff --git a/plugins/theme_switcher/bg/bg6_small.jpg b/plugins/theme_switcher/bg/bg6_small.jpg
index 25cec1a..87c4284 100644
Binary files a/plugins/theme_switcher/bg/bg6_small.jpg and b/plugins/theme_switcher/bg/bg6_small.jpg differ
diff --git a/plugins/theme_switcher/bg/bg7.jpg b/plugins/theme_switcher/bg/bg7.jpg
index f1df667..e54e1c1 100644
Binary files a/plugins/theme_switcher/bg/bg7.jpg and b/plugins/theme_switcher/bg/bg7.jpg differ
diff --git a/plugins/theme_switcher/bg/bg7_small.jpg b/plugins/theme_switcher/bg/bg7_small.jpg
index 4835f19..f965ccc 100644
Binary files a/plugins/theme_switcher/bg/bg7_small.jpg and b/plugins/theme_switcher/bg/bg7_small.jpg differ
diff --git a/plugins/theme_switcher/bg/bg8.jpg b/plugins/theme_switcher/bg/bg8.jpg
index 07d91bd..7e2cc60 100644
Binary files a/plugins/theme_switcher/bg/bg8.jpg and b/plugins/theme_switcher/bg/bg8.jpg differ
diff --git a/plugins/theme_switcher/bg/bg8_small.jpg b/plugins/theme_switcher/bg/bg8_small.jpg
index 1b20baa..bfaedd4 100644
Binary files a/plugins/theme_switcher/bg/bg8_small.jpg and b/plugins/theme_switcher/bg/bg8_small.jpg differ
diff --git a/plugins/theme_switcher/bg/bg9.jpg b/plugins/theme_switcher/bg/bg9.jpg
index a6dba97..c412e0d 100644
Binary files a/plugins/theme_switcher/bg/bg9.jpg and b/plugins/theme_switcher/bg/bg9.jpg differ
diff --git a/plugins/theme_switcher/bg/bg9_small.jpg b/plugins/theme_switcher/bg/bg9_small.jpg
index 9c94e69..a5c10c4 100644
Binary files a/plugins/theme_switcher/bg/bg9_small.jpg and b/plugins/theme_switcher/bg/bg9_small.jpg differ
diff --git a/plugins/theme_switcher/theme_switcher.js b/plugins/theme_switcher/theme_switcher.js
index 093273b..2b305d1 100644
--- a/plugins/theme_switcher/theme_switcher.js
+++ b/plugins/theme_switcher/theme_switcher.js
@@ -6,12 +6,12 @@ $(function () {
         {
             "pic": "./plugins/theme_switcher/bg/bg1.jpg",
             "thumb": "./bg/bg1_small.jpg",
-            "title": "win10"
+            "title": " Mojave Night"
         },
         {
             "pic": "./plugins/theme_switcher/bg/bg2.jpg",
             "thumb": "./bg/bg2_small.jpg",
-            "title": "梦幻光影"
+            "title": "莫哈韦沙漠风景白天"
         },
         {
             "pic": "./plugins/theme_switcher/bg/bg3.jpg",
@@ -21,63 +21,43 @@ $(function () {
         {
             "pic": "./plugins/theme_switcher/bg/bg4.jpg",
             "thumb": "./bg/bg4_small.jpg",
-            "title": "乡土气息"
+            "title": "Abstract壁纸"
         },
         {
             "pic": "./plugins/theme_switcher/bg/bg5.jpg",
             "thumb": "./bg/bg5_small.jpg",
-            "title": "绿色清新"
+            "title": "暗色沙漠壁纸"
         },
         {
             "pic": "./plugins/theme_switcher/bg/bg6.jpg",
             "thumb": "./bg/bg6_small.jpg",
-            "title": "Win8"
+            "title": "莫哈韦沙漠"
         },
         {
             "pic": "./plugins/theme_switcher/bg/bg7.jpg",
             "thumb": "./bg/bg7_small.jpg",
-            "title": "蓝色海岸"
+            "title": "沙漠风景"
         },
         {
             "pic": "./plugins/theme_switcher/bg/bg8.jpg",
             "thumb": "./bg/bg8_small.jpg",
-            "title": "冰天雪地"
+            "title": "沙漠风光"
         },
         {
             "pic": "./plugins/theme_switcher/bg/bg9.jpg",
             "thumb": "./bg/bg9_small.jpg",
-            "title": "繁花满树"
+            "title": "白天沙漠风景"
         },
         {
             "pic": "./plugins/theme_switcher/bg/bg10.jpg",
             "thumb": "./bg/bg10_small.jpg",
-            "title": "精灵小鸟"
+            "title": "Sierra风景壁纸"
         },
         {
             "pic": "./plugins/theme_switcher/bg/bg11.jpg",
             "thumb": "./bg/bg11_small.jpg",
-            "title": "炫酷跑车"
-        },
-        {
-            "pic": "./plugins/theme_switcher/bg/bg12.jpg",
-            "thumb": "./bg/bg12_small.jpg",
-            "title": "中国风"
-        },
-        {
-            "pic": "./plugins/theme_switcher/bg/bg13.jpg",
-            "thumb": "./bg/bg13_small.jpg",
-            "title": "Winxp"
-        },
-        {
-            "pic": "./plugins/theme_switcher/bg/bg14.jpg",
-            "thumb": "./bg/bg14_small.jpg",
-            "title": "淡雅唯美"
-        },
-        {
-            "pic": "./plugins/theme_switcher/bg/bg15.jpg",
-            "thumb": "./bg/bg15_small.jpg",
-            "title": "Win7"
-        },
+            "title": "秋天风景"
+        }
     ];
 
     var theme_area=$("#theme_area");