diff --git a/themes/beauty/views/list/bydate.php b/themes/beauty/views/list/bydate.php
index 4001529..075c7cc 100644
--- a/themes/beauty/views/list/bydate.php
+++ b/themes/beauty/views/list/bydate.php
@@ -54,8 +54,10 @@ $cacheData = !empty($viewData['cacheData']) ? $viewData['cacheData'] : [];
                 <?php if (!empty($viewData['isAdminIp'])) { ?>
                 <img class="svg icon1 svgimg verMiddle cleanCacheJS" src="/img/beauty/refresh.svg" alt="清空缓存数据" title="刷新缓存数据" style="padding-top:2px;margin-top:2px">
                 <?php } ?>
-                <img class="svg icon1 svgimg iconr2 lampJS verMiddle" src="/img/beauty/buld.svg" alt="点击关灯/开灯" title="点击关灯/开灯">
-                <img class="icon1 svg connectmeJS svgimg iconr2 verMiddle" src="/img/beauty/contactUs.svg" alt="联系我们" title="联系我们" />
+                <a href="javascript:;" class="light-switcher lampJS">
+                    <img class="svg icon1 svgimg verMiddle" src="/img/beauty/buld.svg" alt="点击关灯/开灯" title="点击关灯/开灯">
+                </a>
+                <img class="icon1 svg connectmeJS svgimg verMiddle" src="/img/beauty/contactUs.svg" alt="联系我们" title="联系我们">
             </div>
 
             <!--侧边栏-->
diff --git a/themes/beauty/views/site/index.php b/themes/beauty/views/site/index.php
index 52f014f..fce6a6c 100644
--- a/themes/beauty/views/site/index.php
+++ b/themes/beauty/views/site/index.php
@@ -55,8 +55,10 @@ $main_view_cls = $menu_ext_status == 'opened' ? '' : 'full';
                 <?php if (!empty($viewData['isAdminIp'])) { ?>
                 <img class="svg icon1 svgimg verMiddle cleanCacheJS" src="/img/beauty/refresh.svg" alt="清空缓存数据" title="刷新缓存数据" style="padding-top:2px;margin-top:2px">
                 <?php } ?>
-                <img class="svg icon1 svgimg iconr2 lampJS verMiddle" src="/img/beauty/buld.svg" alt="点击关灯/开灯" title="点击关灯/开灯">
-                <img class="icon1 svg connectmeJS svgimg iconr2 verMiddle" src="/img/beauty/contactUs.svg" alt="联系我们" title="联系我们" />
+                <a href="javascript:;" class="light-switcher lampJS">
+                    <img class="svg icon1 svgimg verMiddle" src="/img/beauty/buld.svg" alt="点击关灯/开灯" title="点击关灯/开灯">
+                </a>
+                <img class="icon1 svg connectmeJS svgimg verMiddle" src="/img/beauty/contactUs.svg" alt="联系我们" title="联系我们" />
             </div>
             
             <?php /*
diff --git a/www/css/beauty.css b/www/css/beauty.css
index e10c072..72bfd02 100644
--- a/www/css/beauty.css
+++ b/www/css/beauty.css
@@ -51,7 +51,6 @@ a:link{text-decoration:none}
 .navbar .navbar-toggle:focus,
 .navbar .navbar-toggle:hover{background:none}
 .nb_right{padding:10px 13px 0 0}
-.nb_right .iconr2{margin:3px 0 0 10px}
 
 .navbar-fixed-left{
     position: fixed;
@@ -189,9 +188,10 @@ a:link{text-decoration:none}
 .has-slideshow.is-idle .fancybox__toolbar{display:none}
 .has-slideshow.is-idle .fancybox__slide.has-image>.fancybox__content{width:100% !important;height:100% !important}
 
+.light-switcher{display:inline-block;margin:0 10px;padding:3px}
 
 a:focus,button.btn:focus{outline-color:lightblue}
-.lampshow .nav-tabs>li>a:focus,.lampshow .navbar-fixed-left a:focus{background-color:lightgray;color:#444}
+.lampshow .nav>li>a:focus,.lampshow .navbar-fixed-left a:focus{background-color:lightgray;color:#444}
 .im_item a:focus{outline:none;border:2px solid blue;border-radius:12px}
 .lampshow .im_item a:focus{border-color:orange}
 .lampshow .expand-icon button:focus{background-color:lightgray}
@@ -204,7 +204,7 @@ a:focus,button.btn:focus{outline-color:lightblue}
 .lampshow .right_sidebox{background-color:#222;color:#FFF}
 .lampshow .right_sidebox>h5{border-color: #363636}
 .lampshow .text_dark{color:#808080}
-.lampshow .text_dark a, .lampshow .nav-tabs a{color:#f4f7fd}
+.lampshow .text_dark a, .lampshow .nav a{color:#f4f7fd}
 .lampshow .nav-tabs a:hover{background-color:#CCC;color:#444}
 .lampshow .othervideos{background-color:inherit}
 .lampshow .btn-default{background-color:#EEE}
diff --git a/www/js/beauty.js b/www/js/beauty.js
index 8c8f48d..ecba848 100644
--- a/www/js/beauty.js
+++ b/www/js/beauty.js
@@ -1027,7 +1027,7 @@ var getNextSibling = function(el, way) {
         next = tagName == 'a' ? $(el).parent().prev() : $(el).prev();
 
         if (next.length == 0) {
-            next = $('.navbar-fixed-left li.active a').first();
+            next = $('.navbar-fixed-left li a').first();
             if (next.length > 0) {
                 next.focus();
             }
@@ -1037,8 +1037,27 @@ var getNextSibling = function(el, way) {
     }else if (way == 'up' && $(el).parents('.img_main').length > 0) {
         if ($(el).parent('li').length > 0) {
             next = $(el).parents('ul').prevAll('.nav').find('li').first();
-        }else if ($(el).parent('div').length > 0) {
-            next = $(el).parent('div').prevAll('ul').first().find('li').first();
+            if (next.length == 0) {
+                next = $(el).parents('ul').prev('.im_mainl').find('.im_item').first();
+            }
+        }else if ($(el).parent('.im_item').length > 0) {
+            next = $(el).parent().prevAll('.im_item');       //6 images in one row
+            if (next.length >= 6) {
+                next = $(next.get(5));
+            }else {
+                next = null;
+            }
+
+            if (!next) {
+                next = $(el).parent('.im_item').prevAll('ul').first().find('li').first();
+                if (next.length == 0) {
+                    next = $(el).parents('.im_mainl').prev('.nav').find('li.active');
+                }
+            }
+        }
+
+        if (next && next.length == 0) {
+            next = $('.light-switcher').parent();
         }
     }else if (way == 'down' && $(el).parents('.navbar-fixed-left').length > 0) {
         next = tagName == 'a' ? $(el).parent().nextAll('li:not(.menu-title)').first() : $(el).next();
@@ -1053,8 +1072,22 @@ var getNextSibling = function(el, way) {
                 }
             }
         }else if ($(el).parent('.im_item').length > 0) {
-            next = $('div.pagination-con').find('li.active').next();
+            next = $(el).parent().nextAll('.im_item');       //6 images in one row
+            if (next.length >= 6) {
+                next = $(next.get(5));
+            }else {
+                next = null;
+            }
+
+            if (!next && $(el).parents('.im_mainl').next('.nav').length > 0) {
+                next = $(el).parents('.im_mainl').next('.nav').find('li.active');
+            }else if (!next && $('div.pagination-con').length > 0) {
+                next = $('div.pagination-con').find('li.active').next();
+            }
         }
+    }else if (way == 'down' && $(el).hasClass('light-switcher')) {
+        next = $('.im_item').first();
+        console.log('light switcher');
     }
 
     if (next && next.length > 0) {