diff --git a/config/config.ini.example b/config/config.ini.example
index 77233f1e..7c3b7be9 100644
--- a/config/config.ini.example
+++ b/config/config.ini.example
@@ -203,5 +203,5 @@ views.root = "themes/twentysixteen"
 ; Framework config. No need to edit.
 views.layout = "layout"
 
-; Admin theme: light or dark mode
-admin.theme = "dark"
\ No newline at end of file
+; Admin theme mode: light or dark
+admin.theme = "light"
\ No newline at end of file
diff --git a/lang/en_US.ini b/lang/en_US.ini
index 452b2475..0c988f3a 100644
--- a/lang/en_US.ini
+++ b/lang/en_US.ini
@@ -321,4 +321,6 @@ msg_error_field_req_feedurl = "You need to specify the feed url."
 rss_feeds_description_select = "RSS Description"
 rss_description_body = "Post Body"
 rss_description_meta = "Post Meta Description"
-admin_theme = "Admin theme"
\ No newline at end of file
+admin_theme = "Admin theme"
+admin_theme_light = "Light"
+admin_theme_dark = "Dark"
\ No newline at end of file
diff --git a/system/admin/editor/css/editor.css b/system/admin/editor/css/editor.css
index e1ad6803..580172f0 100644
--- a/system/admin/editor/css/editor.css
+++ b/system/admin/editor/css/editor.css
@@ -18,10 +18,14 @@ blockquote {
     margin-bottom: 10px;
     width: 100%;
     border: 1px solid #CFDAE5;
+	border-radius:5px;
     display: block;
     float: left;
 }
-
+.dark-mode .wmd-button-bar {
+	background-color: #292d32;
+	border-color: #292d32 !important;
+}
 .wmd-button-bar:hover {
     border: 1px solid #CCCCCC;
 }
@@ -77,10 +81,19 @@ blockquote {
 .wmd-button > span {
     background-repeat: no-repeat;
     background-position: 0px 0px;
-
     display: inline-block;
 }
 
+.dark-mode .wmd-button > span.btn-light {
+	color: #fff;
+	background-color: #292d32;
+	border-color: #292d32;
+	box-shadow: none;
+}
+.dark-mode .wmd-button > span.btn-light:not(.disabled):hover {
+	background-color: #171a1d;
+	border-color: #343a40;
+}
 .wmd-spacer1 {
     left: 50px;
 }
diff --git a/system/admin/views/add-content.html.php b/system/admin/views/add-content.html.php
index 68c19375..a36b9806 100644
--- a/system/admin/views/add-content.html.php
+++ b/system/admin/views/add-content.html.php
@@ -88,7 +88,7 @@ function extractLast( term ) {
 <?php } ?>
 <div class="notice" id="response"></div>
 <div class="row">
-    <div class="hide-button" style="margin-bottom:1em;width:100%;text-align:right;"><button type="button" title="<?php echo i18n('Focus_mode');?>" id="hideButton" class="note-btn btn btn-light btn-sm" style="width:38px;height:38px;font-size:18px;" ><i class="fa fa-eye" aria-hidden="true"></i></button></div>
+    <div class="hide-button" style="margin-bottom:1em;width:100%;text-align:right;"><button type="button" title="<?php echo i18n('Focus_mode');?>" id="hideButton" class="note-btn btn btn-sm <?php echo ((config('admin.theme') === 'light' || is_null(config('admin.theme'))) ? "btn-light" : "btn-dark");?>" style="width:38px;height:38px;font-size:18px;" ><i class="fa fa-eye" aria-hidden="true"></i></button></div>
     <div class="wmd-panel" style="width:100%;">
         <form method="POST">
             <div id="post-settings" class="row">
@@ -178,7 +178,7 @@ function extractLast( term ) {
             </div>
             <div class="row">
                 <div class="col-sm-12" style="text-align:right;">
-                    <button class="note-btn btn btn-light btn-sm" style="width:38px;height:38px;font-size:18px;" type="button" title="Toggle <?php echo i18n('Preview');?>" id="preview-toggle" class="btn btn-secondary btn-xs"><i class="fa fa-columns" aria-hidden="true"></i></button>
+                    <button class="note-btn btn btn-sm <?php echo ((config('admin.theme') === 'light' || is_null(config('admin.theme'))) ? "btn-light" : "btn-dark");?>" style="width:38px;height:38px;font-size:18px;" type="button" title="Toggle <?php echo i18n('Preview');?>" id="preview-toggle" class="btn btn-secondary btn-xs"><i class="fa fa-columns" aria-hidden="true"></i></button>
                 </div>
             </div>
             <div class="row">
diff --git a/system/admin/views/add-page.html.php b/system/admin/views/add-page.html.php
index 3231c289..db8fa36e 100644
--- a/system/admin/views/add-page.html.php
+++ b/system/admin/views/add-page.html.php
@@ -14,7 +14,7 @@
 <?php } ?>
 <div class="notice" id="response"></div>
 <div class="row">
-    <div class="hide-button" style="margin-bottom:1em;width:100%;text-align:right;"><button type="button" title="<?php echo i18n('Focus_mode');?>" id="hideButton" class="note-btn btn btn-light btn-sm" style="width:38px;height:38px;font-size:18px;" ><i class="fa fa-eye" aria-hidden="true"></i></button></div>
+    <div class="hide-button" style="margin-bottom:1em;width:100%;text-align:right;"><button type="button" title="<?php echo i18n('Focus_mode');?>" id="hideButton" class="note-btn btn btn-sm <?php echo ((config('admin.theme') === 'light' || is_null(config('admin.theme'))) ? "btn-light" : "btn-dark");?>" style="width:38px;height:38px;font-size:18px;" ><i class="fa fa-eye" aria-hidden="true"></i></button></div>
     <div class="wmd-panel" style="width:100%;">
         <form method="POST">
             <div id="post-settings" class="row">
@@ -36,7 +36,7 @@
             </div>
              <div class="row">
                 <div class="col-sm-12" style="text-align:right;">
-                    <button class="note-btn btn btn-light btn-sm" style="width:38px;height:38px;font-size:18px;" type="button" title="Toggle <?php echo i18n('Preview');?>" id="preview-toggle" class="btn btn-secondary btn-xs"><i class="fa fa-columns" aria-hidden="true"></i></button>
+                    <button class="note-btn btn btn-sm <?php echo ((config('admin.theme') === 'light' || is_null(config('admin.theme'))) ? "btn-light" : "btn-dark");?>" style="width:38px;height:38px;font-size:18px;" type="button" title="Toggle <?php echo i18n('Preview');?>" id="preview-toggle" class="btn btn-secondary btn-xs"><i class="fa fa-columns" aria-hidden="true"></i></button>
                 </div>
             </div>           
             <div class="row">
diff --git a/system/admin/views/config.html.php b/system/admin/views/config.html.php
index 395fc308..d8998e6e 100644
--- a/system/admin/views/config.html.php
+++ b/system/admin/views/config.html.php
@@ -176,13 +176,13 @@
         <div class="form-check">
           <input class="form-check-input" type="radio" name="-config-admin.theme" id="admin.theme1" value="light" <?php if (config('admin.theme') === 'light' || is_null(config('admin.theme'))):?>checked<?php endif;?>>
           <label class="form-check-label" for="admin.theme1">
-            Light
+            <?php echo i18n('admin_theme_light');?>
           </label>
         </div>
         <div class="form-check">
           <input class="form-check-input" type="radio" name="-config-admin.theme" id="admin.theme2" value="dark" <?php if (config('admin.theme') === 'dark'):?>checked<?php endif;?>>
           <label class="form-check-label" for="admin.theme2">
-            Dark
+            <?php echo i18n('admin_theme_dark');?>
           </label>
         </div>
       </div>
diff --git a/system/admin/views/edit-content.html.php b/system/admin/views/edit-content.html.php
index f800796c..462bdddb 100644
--- a/system/admin/views/edit-content.html.php
+++ b/system/admin/views/edit-content.html.php
@@ -133,7 +133,7 @@ function extractLast( term ) {
 <?php } ?>
 <div class="notice" id="response"></div>
 <div class="row">
-    <div class="hide-button" style="margin-bottom:1em;width:100%;text-align:right;"><button type="button" title="<?php echo i18n('Focus_mode');?>" id="hideButton" class="note-btn btn btn-light btn-sm" style="width:38px;height:38px;font-size:18px;" ><i class="fa fa-eye" aria-hidden="true"></i></button></div>
+    <div class="hide-button" style="margin-bottom:1em;width:100%;text-align:right;"><button type="button" title="<?php echo i18n('Focus_mode');?>" id="hideButton" class="note-btn btn btn-sm <?php echo ((config('admin.theme') === 'light' || is_null(config('admin.theme'))) ? "btn-light" : "btn-dark");?>" style="width:38px;height:38px;font-size:18px;" ><i class="fa fa-eye" aria-hidden="true"></i></button></div>
     <div class="wmd-panel" style="width:100%;">
         <form method="POST">
             <div id="post-settings" class="row">
@@ -224,7 +224,7 @@ function extractLast( term ) {
             </div>
             <div class="row">
                 <div class="col-sm-12" style="text-align:right;">
-                    <button class="note-btn btn btn-light btn-sm" style="width:38px;height:38px;font-size:18px;" type="button" title="Toggle <?php echo i18n('Preview');?>" id="preview-toggle" class="btn btn-secondary btn-xs"><i class="fa fa-columns" aria-hidden="true"></i></button>
+                    <button class="note-btn btn btn-sm <?php echo ((config('admin.theme') === 'light' || is_null(config('admin.theme'))) ? "btn-light" : "btn-dark");?>" style="width:38px;height:38px;font-size:18px;" type="button" title="Toggle <?php echo i18n('Preview');?>" id="preview-toggle" class="btn btn-secondary btn-xs"><i class="fa fa-columns" aria-hidden="true"></i></button>
                 </div>
             </div>
             <div class="row">
diff --git a/system/admin/views/edit-page.html.php b/system/admin/views/edit-page.html.php
index 90e4bc0c..54cf9a59 100644
--- a/system/admin/views/edit-page.html.php
+++ b/system/admin/views/edit-page.html.php
@@ -97,7 +97,7 @@
 <?php } ?>
 <div class="notice" id="response"></div>
 <div class="row">
-    <div class="hide-button" style="margin-bottom:1em;width:100%;text-align:right;"><button type="button" title="<?php echo i18n('Focus_mode');?>" id="hideButton" class="note-btn btn btn-light btn-sm" style="width:38px;height:38px;font-size:18px;" ><i class="fa fa-eye" aria-hidden="true"></i></button></div>
+    <div class="hide-button" style="margin-bottom:1em;width:100%;text-align:right;"><button type="button" title="<?php echo i18n('Focus_mode');?>" id="hideButton" class="note-btn btn btn-sm <?php echo ((config('admin.theme') === 'light' || is_null(config('admin.theme'))) ? "btn-light" : "btn-dark");?>" style="width:38px;height:38px;font-size:18px;" ><i class="fa fa-eye" aria-hidden="true"></i></button></div>
     <div class="wmd-panel" style="width:100%;">
         <form method="POST">
             <div id="post-settings" class="row">
@@ -137,7 +137,7 @@
             </div>
              <div class="row">
                 <div class="col-sm-12" style="text-align:right;">
-                    <button class="note-btn btn btn-light btn-sm" style="width:38px;height:38px;font-size:18px;" type="button" title="Toggle <?php echo i18n('Preview');?>" id="preview-toggle" class="btn btn-secondary btn-xs"><i class="fa fa-columns" aria-hidden="true"></i></button>
+                    <button class="note-btn btn btn-sm <?php echo ((config('admin.theme') === 'light' || is_null(config('admin.theme'))) ? "btn-light" : "btn-dark");?>" style="width:38px;height:38px;font-size:18px;" type="button" title="Toggle <?php echo i18n('Preview');?>" id="preview-toggle" class="btn btn-secondary btn-xs"><i class="fa fa-columns" aria-hidden="true"></i></button>
                 </div>
             </div>                
             <div class="row">
diff --git a/system/admin/views/layout.html.php b/system/admin/views/layout.html.php
index 04aa9269..2941b403 100644
--- a/system/admin/views/layout.html.php
+++ b/system/admin/views/layout.html.php
@@ -31,7 +31,7 @@
 <body class="hold-transition sidebar-mini <?php echo ((config('admin.theme') === 'light' || is_null(config('admin.theme'))) ? "light-mode" : "dark-mode"); ?>">
 <div id="top"></div>
 <div class="wrapper">
-<style>.error-message ul {margin:0;padding:0;}</style>
+<style>.error-message ul {margin:0;padding:0;list-style-type:none;}</style>
   <!-- Navbar -->
   <nav class="main-header navbar navbar-expand <?php echo ((config('admin.theme') === 'light' || is_null(config('admin.theme'))) ? "navbar-white navbar-light" : "navbar-gray-dark navbar-dark"); ?>">
     <!-- Left navbar links -->