diff --git a/src/dede/images/alb1.gif b/src/dede/images/alb1.gif
deleted file mode 100755
index 8e787b01..00000000
Binary files a/src/dede/images/alb1.gif and /dev/null differ
diff --git a/src/dede/images/alb1.jpg b/src/dede/images/alb1.jpg
new file mode 100644
index 00000000..10452309
Binary files /dev/null and b/src/dede/images/alb1.jpg differ
diff --git a/src/dede/images/alb2.gif b/src/dede/images/alb2.gif
deleted file mode 100755
index b0bd7363..00000000
Binary files a/src/dede/images/alb2.gif and /dev/null differ
diff --git a/src/dede/images/alb2.jpg b/src/dede/images/alb2.jpg
new file mode 100644
index 00000000..d50e978e
Binary files /dev/null and b/src/dede/images/alb2.jpg differ
diff --git a/src/dede/images/alb3.gif b/src/dede/images/alb3.gif
deleted file mode 100755
index 6b072cbe..00000000
Binary files a/src/dede/images/alb3.gif and /dev/null differ
diff --git a/src/dede/images/alb3.jpg b/src/dede/images/alb3.jpg
new file mode 100644
index 00000000..2d88ccab
Binary files /dev/null and b/src/dede/images/alb3.jpg differ
diff --git a/src/dede/images/g_t1.gif b/src/dede/images/g_t1.gif
deleted file mode 100755
index afdc418a..00000000
Binary files a/src/dede/images/g_t1.gif and /dev/null differ
diff --git a/src/dede/images/g_t1.jpg b/src/dede/images/g_t1.jpg
new file mode 100644
index 00000000..08cd2400
Binary files /dev/null and b/src/dede/images/g_t1.jpg differ
diff --git a/src/dede/images/g_t2.gif b/src/dede/images/g_t2.gif
deleted file mode 100755
index 5bd22497..00000000
Binary files a/src/dede/images/g_t2.gif and /dev/null differ
diff --git a/src/dede/images/g_t2.jpg b/src/dede/images/g_t2.jpg
new file mode 100644
index 00000000..7adc28b1
Binary files /dev/null and b/src/dede/images/g_t2.jpg differ
diff --git a/src/dede/images/g_t3.gif b/src/dede/images/g_t3.gif
deleted file mode 100755
index fdcd3962..00000000
Binary files a/src/dede/images/g_t3.gif and /dev/null differ
diff --git a/src/dede/images/g_t3.jpg b/src/dede/images/g_t3.jpg
new file mode 100644
index 00000000..96903529
Binary files /dev/null and b/src/dede/images/g_t3.jpg differ
diff --git a/src/dede/images/g_t4.gif b/src/dede/images/g_t4.gif
deleted file mode 100755
index 50a7ce03..00000000
Binary files a/src/dede/images/g_t4.gif and /dev/null differ
diff --git a/src/dede/images/g_t4.jpg b/src/dede/images/g_t4.jpg
new file mode 100644
index 00000000..18791ea0
Binary files /dev/null and b/src/dede/images/g_t4.jpg differ
diff --git a/src/dede/js/main.js b/src/dede/js/main.js
index 3e532a6b..0bf4ae11 100755
--- a/src/dede/js/main.js
+++ b/src/dede/js/main.js
@@ -759,7 +759,7 @@ $(document).ready(function () {
 	// 截取缩略图
 	function SetThumb(srcURL) {
 		var footer =
-			"<p><a href='javascript:useDefault(\"~modalID~\");' class='btn btn-outline-primary'>使用原图</a> <a href='?' class='btn btn-outline-primary' data-dismiss='modal' aria-label='Close'>确定</a></p>";
+			"<p><a href='javascript:useDefault(\"~modalID~\");' class='btn btn-secondary'>使用原图</a> <a href='?' class='btn btn-secondary' data-dismiss='modal' aria-label='Close'>确定</a></p>";
 		var optButton = `<p><div class="form-group">
 			  <label for="aspectRatio">比例</label>
 			  <select class="form-control" id="aspectRatio" onchange="setAspectRatio(this.selectedIndex)">
diff --git a/src/dede/templets/album_add.htm b/src/dede/templets/album_add.htm
index 1d5ba79b..a22bcebc 100755
--- a/src/dede/templets/album_add.htm
+++ b/src/dede/templets/album_add.htm
@@ -254,17 +254,17 @@
             <tr>
               <td width="90">&nbsp;<b>表现方式：</b></td>
               <td>
-                <input name="pagestyle" class="np" type="radio" id="pagestyle1" onClick="checkMuList()" value="1"
+                <label><input name="pagestyle" class="np" type="radio" id="pagestyle1" onClick="checkMuList()" value="1"
                   <?php if($cfg_album_style==1) echo " checked='checked'"; ?> />
-                <img src='images/alb2.gif' alt='单页多图样式' title='单页多图样式' />
+                <img src='images/alb2.jpg' alt='单页多图样式' title='单页多图样式' /></label>
                 &nbsp;&nbsp;
-                <input name="pagestyle" class="np" type="radio" id="pagestyle2" onClick="checkMuList()" value="2"
+                <label><input name="pagestyle" class="np" type="radio" id="pagestyle2" onClick="checkMuList()" value="2"
                   <?php if($cfg_album_style==2) echo " checked='checked'"; ?> />
-                <img src='images/alb1.gif' alt='幻灯片样式' title='幻灯片样式' />
+                <img src='images/alb1.jpg' alt='幻灯片样式' title='幻灯片样式' /></label>
                 &nbsp;&nbsp;
-                <input name="pagestyle" class="np" type="radio" id="pagestyle3" onClick="checkMuList()" value="3"
+                <label><input name="pagestyle" class="np" type="radio" id="pagestyle3" onClick="checkMuList()" value="3"
                   <?php if($cfg_album_style==3) echo " checked='checked'"; ?> />
-                <img src='images/alb3.gif' alt='多缩略图样式' title='多缩略图样式' />
+                <img src='images/alb3.jpg' alt='多缩略图样式' title='多缩略图样式' /></label>
               </td>
             </tr>
           </table>
diff --git a/src/dede/templets/album_edit.htm b/src/dede/templets/album_edit.htm
index 9c7ec903..f3588916 100755
--- a/src/dede/templets/album_edit.htm
+++ b/src/dede/templets/album_edit.htm
@@ -344,12 +344,13 @@ if($cfg_need_typeid2=='Y') {
       <td height="24" colspan="4" class="bline"><table width="800" border="0" cellspacing="0" cellpadding="0">
           <tr>
             <td width="90">&nbsp;表现方式：</td>
-            <td><input name="pagestyle" class="np" type="radio" id="pagestyle1" onClick="checkMuList()" value="1"<?php if($pagestyle==1) echo " checked='checked'"; ?> />
-              <img src='images/alb2.gif' alt='单页多图样式' title='单页多图样式' /> &nbsp;&nbsp;
-              <input name="pagestyle" class="np" type="radio" id="pagestyle2" onClick="checkMuList()" value="2"<?php if($pagestyle==2) echo " checked='checked'"; ?> />
-              <img src='images/alb1.gif' alt='幻灯片样式' title='幻灯片样式' /> &nbsp;&nbsp;
-              <input name="pagestyle" class="np" type="radio" id="pagestyle3" onClick="checkMuList()" value="3"<?php if($pagestyle==3) echo " checked='checked'"; ?>/>
-              <img src='images/alb3.gif' alt='多缩略图样式' title='多缩略图样式' /></td>
+            <td>
+              <label><input name="pagestyle" class="np" type="radio" id="pagestyle1" onClick="checkMuList()" value="1"<?php if($pagestyle==1) echo " checked='checked'"; ?> />
+              <img src='images/alb2.jpg' alt='单页多图样式' title='单页多图样式' /></label>&nbsp;&nbsp;
+              <label><input name="pagestyle" class="np" type="radio" id="pagestyle2" onClick="checkMuList()" value="2"<?php if($pagestyle==2) echo " checked='checked'"; ?> />
+              <img src='images/alb1.jpg' alt='幻灯片样式' title='幻灯片样式' /></label> &nbsp;&nbsp;
+              <label><input name="pagestyle" class="np" type="radio" id="pagestyle3" onClick="checkMuList()" value="3"<?php if($pagestyle==3) echo " checked='checked'"; ?>/>
+              <img src='images/alb3.jpg' alt='多缩略图样式' title='多缩略图样式' /></label></td>
           </tr>
         </table></td>
     </tr>
diff --git a/src/dede/templets/catalog_edit.htm b/src/dede/templets/catalog_edit.htm
index 8e95a49d..eb6e7210 100755
--- a/src/dede/templets/catalog_edit.htm
+++ b/src/dede/templets/catalog_edit.htm
@@ -364,12 +364,12 @@ $i = 0;
             style="border:1px solid #cfcfcf;background:#ffffff;display:none;text-align:left;" id="adset" class="table">
             <tr>
               <td class='bline' width="150" height="24" style="padding-left:10px;">多站点支持：</td>
-              <td class='bline'> <input name="moresite" type="radio" class="np" value="0"
+              <td class='bline'> <label><input name="moresite" type="radio" class="np" value="0"
                   <?php if($myrow['moresite']==0) echo " checked='1' ";?> />
-                不启用
-                <input type="radio" name="moresite" class="np" value="1"
+                不启用</label>
+                <label><input type="radio" name="moresite" class="np" value="1"
                   <?php if($myrow['moresite']==1) echo " checked='1' ";?> />
-                启用 </td>
+                启用</label> </td>
             </tr>
             <tr>
               <td height="24" bgcolor="#F9FCEF" style="padding-left:10px;">说明：</td>
diff --git a/src/dede/templets/freelist_add.htm b/src/dede/templets/freelist_add.htm
index 2491a6dd..a7cb5a74 100755
--- a/src/dede/templets/freelist_add.htm
+++ b/src/dede/templets/freelist_add.htm
@@ -166,15 +166,22 @@
                 <td height="72" align="left">
                   <table width="99%" border="0" cellspacing="0" cellpadding="0">
                     <tr>
-                      <td width="25%" height="126"><img src="images/g_t2.gif" width="130" height="100">
-                        <input name="liststyle" type="radio" onClick="ChangeListStyle()" value="1">
+                      <td width="25%" height="126">
+                        <label><img src="images/g_t2.jpg" width="130" height="100">
+                        <input name="liststyle" type="radio" onClick="ChangeListStyle()" value="1"></label>
                       </td>
-                      <td width="25%"><img src="images/g_t1.gif" width="130" height="110">
-                        <input type="radio" onClick="ChangeListStyle()" name="liststyle" value="2"></td>
-                      <td width="25%"><img src="images/g_t3.gif" width="130" height="110">
-                        <input type="radio" onClick="ChangeListStyle()" name="liststyle" value="3"></td>
-                      <td><img src="images/g_t4.gif" width="130" height="110"> <input name="liststyle" type="radio"
-                          onClick="ChangeListStyle()" value="4" checked></td>
+                      <td width="25%">
+                        <label><img src="images/g_t1.jpg" width="130" height="110">
+                        <input type="radio" onClick="ChangeListStyle()" name="liststyle" value="2"></label>
+                      </td>
+                      <td width="25%">
+                        <label><img src="images/g_t3.jpg" width="130" height="110">
+                        <input type="radio" onClick="ChangeListStyle()" name="liststyle" value="3"></label>
+                      </td>
+                      <td>
+                        <label><img src="images/g_t4.jpg" width="130" height="110"> <input name="liststyle" type="radio"
+                          onClick="ChangeListStyle()" value="4" checked></label>
+                        </td>
                     </tr>
                   </table>
                 </td>
diff --git a/src/dede/templets/mytag_tag_guide.htm b/src/dede/templets/mytag_tag_guide.htm
index 191dbc72..2d6eb0ec 100755
--- a/src/dede/templets/mytag_tag_guide.htm
+++ b/src/dede/templets/mytag_tag_guide.htm
@@ -8,27 +8,12 @@
 	<link rel="stylesheet" href="../static/css/bootstrap.min.css">
 	<link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
   <link href="css/base.css" rel="stylesheet" type="text/css">
-  <script language="JavaScript">
-    function ChangeListStyle() {
-      var itxt = document.getElementById("myinnertext");
-      var myems = document.getElementsByName("liststyle");
-      if (myems[0].checked) itxt.value = document.getElementById("list1").innerHTML;
-      else if (myems[1].checked) itxt.value = document.getElementById("list2").innerHTML;
-      else if (myems[2].checked) itxt.value = document.getElementById("list3").innerHTML;
-      else if (myems[3].checked) itxt.value = document.getElementById("list4").innerHTML;
-      itxt.value = itxt.value.replace("<BR>", "<BR/>");
-      itxt.value = itxt.value.toLowerCase();
-    }
-    function DoSubmit(j) {
-      document.form1.dopost.value = j;
-      document.form1.submit();
-    }
-    function SelectArcList(fname) {
-      var posLeft = 10;
-      var posTop = 10;
-      window.open("content_select_list.php?f=" + fname, "selArcList", "scrollbars=yes,resizable=yes,statebar=no,width=700,height=500,left=" + posLeft + ", top=" + posTop);
-    }
-  </script>
+  <link rel="stylesheet" type="text/css" href="css/codemirror.css">
+  <script type="text/javascript" src="js/codemirror.js"></script>
+  <script type="text/javascript" src="js/mode/xml/xml.js"></script>
+  <script type="text/javascript" src="js/mode/javascript/javascript.js"></script>
+  <script type="text/javascript" src="js/mode/css/css.js"></script>
+  <script type="text/javascript" src="js/mode/htmlmixed/htmlmixed.js"></script>
 </head>
 
 <body background='images/allbg.gif' leftmargin='8' topmargin='8'>
@@ -78,18 +63,18 @@
                   <table width="99%" border="0" cellspacing="0" cellpadding="0">
                     <tr>
                       <td width="25%" height="126">
-                        <img src="images/g_t2.gif" width="130" height="100" />
+                        <label><img src="images/g_t2.jpg" width="130" height="100" />
                         <input name="liststyle" class="np" type="radio" onClick="ChangeListStyle()" value="1"
-                          checked='1' /> </td>
+                          checked='1' /></label> </td>
                       <td width="25%">
-                        <img src="images/g_t1.gif" width="130" height="110" />
-                        <input type="radio" class="np" onClick="ChangeListStyle()" name="liststyle" value="2" /> </td>
+                        <label><img src="images/g_t1.jpg" width="130" height="110" />
+                        <input type="radio" class="np" onClick="ChangeListStyle()" name="liststyle" value="2" /></label></td>
                       <td width="25%">
-                        <img src="images/g_t3.gif" width="130" height="110" />
-                        <input type="radio" class="np" onClick="ChangeListStyle()" name="liststyle" value="3" /> </td>
+                        <label><img src="images/g_t3.jpg" width="130" height="110" />
+                        <input type="radio" class="np" onClick="ChangeListStyle()" name="liststyle" value="3" /></label></td>
                       <td>
-                        <img src="images/g_t4.gif" width="130" height="110" />
-                        <input type="radio" class="np" onClick="ChangeListStyle()" name="liststyle" value="4" /> </td>
+                        <label><img src="images/g_t4.jpg" width="130" height="110" />
+                        <input type="radio" class="np" onClick="ChangeListStyle()" name="liststyle" value="4" /></label></td>
                     </tr>
                   </table>
                 </td>
@@ -222,6 +207,32 @@
       </tr>
     </table>
   </center>
+  <script language="JavaScript">
+    var editor = CodeMirror.fromTextArea(document.getElementById('myinnertext'), {
+      lineNumbers: true,
+      lineWrapping: true,
+      mode: 'text/html'
+    });
+    function ChangeListStyle() {
+      var itxt = document.getElementById("myinnertext");
+      var myems = document.getElementsByName("liststyle");
+      if (myems[0].checked) editor.setValue(document.getElementById("list1").innerHTML);
+      else if (myems[1].checked) editor.setValue(document.getElementById("list2").innerHTML);
+      else if (myems[2].checked) editor.setValue(document.getElementById("list3").innerHTML);
+      else if (myems[3].checked) editor.setValue(document.getElementById("list4").innerHTML);
+      itxt.value = itxt.value.replace("<BR>", "<BR/>");
+      itxt.value = itxt.value.toLowerCase();
+    }
+    function DoSubmit(j) {
+      document.form1.dopost.value = j;
+      document.form1.submit();
+    }
+    function SelectArcList(fname) {
+      var posLeft = 10;
+      var posTop = 10;
+      window.open("content_select_list.php?f=" + fname, "selArcList", "scrollbars=yes,resizable=yes,statebar=no,width=700,height=500,left=" + posLeft + ", top=" + posTop);
+    }
+  </script>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/src/static/defaultpic.gif b/src/static/defaultpic.gif
index 7124bce6..c7e31c2a 100755
Binary files a/src/static/defaultpic.gif and b/src/static/defaultpic.gif differ
diff --git a/src/templets/default/index.htm b/src/templets/default/index.htm
index 2bc14f2d..b02fc6ba 100755
--- a/src/templets/default/index.htm
+++ b/src/templets/default/index.htm
@@ -103,7 +103,7 @@
         </div>
         <div class="row">
             <div class="col-12 col-lg-9 index-left">
-              <div class="spec">
+              <div class="spec row">
                 <div class="col-md-12">
                     <div class="dede-title">
                         <h4 class="dede">图文资讯</h4>