diff --git a/src/admin/controllers/hosting-provider/add.php b/src/admin/controllers/hosting-provider/add.php
index 2c74b84..3cdfa0d 100755
--- a/src/admin/controllers/hosting-provider/add.php
+++ b/src/admin/controllers/hosting-provider/add.php
@@ -5,67 +5,67 @@ if (isset($_POST['submit'])) {
 
     if (!post('api_type')) {
         setMessage('need field: api_type', 'danger');
-        redirect('admin/hosting');
+        redirect('admin/hosting-provider');
     }
 
     if (!post('api_key')) {
         setMessage('need field: api_key', 'danger');
-        redirect('admin/hosting');
+        redirect('admin/hosting-provider');
     }
 
     if (!post('api_username')) {
         setMessage('need field: api_username', 'danger');
-        redirect('admin/hosting');
+        redirect('admin/hosting-provider');
     }
 
     if (!post('api_password')) {
         setMessage('need field: api_password', 'danger');
-        redirect('admin/hosting');
+        redirect('admin/hosting-provider');
     }
 
     if (!post('api_server_domain')) {
         setMessage('need field: api_server_domain', 'danger');
-        redirect('admin/hosting');
+        redirect('admin/hosting-provider');
     }
 
     if (!post('api_cpanel_url')) {
         setMessage('need field: api_cpanel_url', 'danger');
-        redirect('admin/hosting');
+        redirect('admin/hosting-provider');
     }
 
     if (!post('api_server_ip')) {
         setMessage('need field: api_server_ip', 'danger');
-        redirect('admin/hosting');
+        redirect('admin/hosting-provider');
     }
 
     if (!post('api_server_ftp_domain')) {
         setMessage('need field: api_server_ftp_domain', 'danger');
-        redirect('admin/hosting');
+        redirect('admin/hosting-provider');
     }
 
     if (!post('api_server_sql_domain')) {
         setMessage('need field: api_server_sql_domain', 'danger');
-        redirect('admin/hosting');
+        redirect('admin/hosting-provider');
     }
 
     if (!post('api_ns_1')) {
         setMessage('need field: api_ns_1', 'danger');
-        redirect('admin/hosting');
+        redirect('admin/hosting-provider');
     }
 
     if (!post('api_ns_2')) {
         setMessage('need field: api_ns_2', 'danger');
-        redirect('admin/hosting');
+        redirect('admin/hosting-provider');
     }
 
     if (!post('api_package')) {
         setMessage('need field: api_package', 'danger');
-        redirect('admin/hosting');
+        redirect('admin/hosting-provider');
     }
 
     if (!post('api_callback_token')) {
         setMessage('need field: api_callback_token', 'danger');
-        redirect('admin/hosting');
+        redirect('admin/hosting-provider');
     }
 
 
@@ -93,5 +93,5 @@ if (isset($_POST['submit'])) {
         setMessage("Something went's wrong !", 'danger');
     }
 
-    redirect('admin/hosting');
+    redirect('admin/hosting-provider');
 }
diff --git a/src/admin/controllers/hosting-provider/edit.php b/src/admin/controllers/hosting-provider/edit.php
index d7e80c2..0ac9000 100755
--- a/src/admin/controllers/hosting-provider/edit.php
+++ b/src/admin/controllers/hosting-provider/edit.php
@@ -5,72 +5,72 @@ if (isset($_POST['submit'])) {
     $api_id = post('api_id');
     if (!$api_id) {
         setMessage('need field: api_id', 'danger');
-        redirect('admin/hosting');
+        redirect('admin/hosting-provider');
     }
 
     if (!post('api_type')) {
         setMessage('need field: api_type', 'danger');
-        redirect('admin/hosting', '', ['action' => 'edit', 'id' => $api_id]);
+        redirect('admin/hosting-provider', '', ['action' => 'edit', 'id' => $api_id]);
     }
 
     if (!post('api_key')) {
         setMessage('need field: api_key', 'danger');
-        redirect('admin/hosting', '', ['action' => 'edit', 'id' => $api_id]);
+        redirect('admin/hosting-provider', '', ['action' => 'edit', 'id' => $api_id]);
     }
 
     if (!post('api_username')) {
         setMessage('need field: api_username', 'danger');
-        redirect('admin/hosting', '', ['action' => 'edit', 'id' => $api_id]);
+        redirect('admin/hosting-provider', '', ['action' => 'edit', 'id' => $api_id]);
     }
 
     if (!post('api_password')) {
         setMessage('need field: api_password', 'danger');
-        redirect('admin/hosting', '', ['action' => 'edit', 'id' => $api_id]);
+        redirect('admin/hosting-provider', '', ['action' => 'edit', 'id' => $api_id]);
     }
 
     if (!post('api_server_domain')) {
         setMessage('need field: api_server_domain', 'danger');
-        redirect('admin/hosting', '', ['action' => 'edit', 'id' => $api_id]);
+        redirect('admin/hosting-provider', '', ['action' => 'edit', 'id' => $api_id]);
     }
 
     if (!post('api_cpanel_url')) {
         setMessage('need field: api_cpanel_url', 'danger');
-        redirect('admin/hosting', '', ['action' => 'edit', 'id' => $api_id]);
+        redirect('admin/hosting-provider', '', ['action' => 'edit', 'id' => $api_id]);
     }
 
     if (!post('api_server_ip')) {
         setMessage('need field: api_server_ip', 'danger');
-        redirect('admin/hosting', '', ['action' => 'edit', 'id' => $api_id]);
+        redirect('admin/hosting-provider', '', ['action' => 'edit', 'id' => $api_id]);
     }
 
     if (!post('api_server_ftp_domain')) {
         setMessage('need field: api_server_ftp_domain', 'danger');
-        redirect('admin/hosting', '', ['action' => 'edit', 'id' => $api_id]);
+        redirect('admin/hosting-provider', '', ['action' => 'edit', 'id' => $api_id]);
     }
 
     if (!post('api_server_sql_domain')) {
         setMessage('need field: api_server_sql_domain', 'danger');
-        redirect('admin/hosting', '', ['action' => 'edit', 'id' => $api_id]);
+        redirect('admin/hosting-provider', '', ['action' => 'edit', 'id' => $api_id]);
     }
 
     if (!post('api_ns_1')) {
         setMessage('need field: api_ns_1', 'danger');
-        redirect('admin/hosting', '', ['action' => 'edit', 'id' => $api_id]);
+        redirect('admin/hosting-provider', '', ['action' => 'edit', 'id' => $api_id]);
     }
 
     if (!post('api_ns_2')) {
         setMessage('need field: api_ns_2', 'danger');
-        redirect('admin/hosting', '', ['action' => 'edit', 'id' => $api_id]);
+        redirect('admin/hosting-provider', '', ['action' => 'edit', 'id' => $api_id]);
     }
 
     if (!post('api_package')) {
         setMessage('need field: api_package', 'danger');
-        redirect('admin/hosting', '', ['action' => 'edit', 'id' => $api_id]);
+        redirect('admin/hosting-provider', '', ['action' => 'edit', 'id' => $api_id]);
     }
 
     if (!post('api_callback_token')) {
         setMessage('need field: api_callback_token', 'danger');
-        redirect('admin/hosting', '', ['action' => 'edit', 'id' => $api_id]);
+        redirect('admin/hosting-provider', '', ['action' => 'edit', 'id' => $api_id]);
     }
 
     $data = array(
@@ -97,7 +97,7 @@ if (isset($_POST['submit'])) {
         setMessage("Something went's wrong !", 'danger');
     }
 
-    redirect('admin/hosting', '', ['action' => 'edit', 'id' => $api_id]);
+    redirect('admin/hosting-provider', '', ['action' => 'edit', 'id' => $api_id]);
 } else {
     if (!defined('IN_CRONLITE')) {
         exit('Access Denied');
@@ -107,6 +107,6 @@ if (isset($_POST['submit'])) {
         $data = $DB->find('account_api', '*', array('api_id' => $id), null, 1);
     } else {
         setMessage('need field: id', 'danger');
-        redirect('admin/hosting');
+        redirect('admin/hosting-provider');
     }
 }
diff --git a/src/admin/controllers/ssl/details.php b/src/admin/controllers/ssl/details.php
new file mode 100755
index 0000000..c150c8f
--- /dev/null
+++ b/src/admin/controllers/ssl/details.php
@@ -0,0 +1,22 @@
+<?php
+
+$ssl_id = get('id');
+
+$SSLInfo = $DB->find('ssl', '*', array('ssl_id' => $ssl_id), null, 1);
+if (!$SSLInfo) {
+    redirect('ssl');
+}
+
+if ($SSLInfo['ssl_status'] == 'processing') {
+    $Status = '<span class="badge bg-primary">Processing</span>';
+} elseif ($SSLInfo['ssl_status'] == 'active') {
+    $Status = '<span class="badge bg-success">Active</span>';
+} elseif ($SSLInfo['ssl_status'] == 'incomplete') {
+    $Status = '<span class="badge bg-danger">Incomplete</span>';
+} elseif ($SSLInfo['ssl_status'] == 'cancelled') {
+    $Status = '<span class="badge bg-">Cancelled</span>';
+} elseif ($SSLInfo['ssl_status'] == 'expired') {
+    $Status = '<span class="badge bg-danger">Expired</span>';
+} else {
+    $Status = '';
+}
diff --git a/src/admin/settings.php b/src/admin/settings.php
index 09444b4..2430f63 100755
--- a/src/admin/settings.php
+++ b/src/admin/settings.php
@@ -17,6 +17,6 @@ require __DIR__ . '/controllers/' . $section . '/' . $action . '.php';
 require __DIR__ . '/views/header.php';
 require __DIR__ . '/views/navbar.php';
 // require __DIR__ . '/views/common/sidebar.php';
-require __DIR__ . '/views/settings/menu.php';
+
 require __DIR__ . '/views/' . $section . '/' . $action . '.php';
 require __DIR__ . '/views/footer.php';
diff --git a/src/admin/ssl.php b/src/admin/ssl.php
index af4d706..1d4a9ca 100755
--- a/src/admin/ssl.php
+++ b/src/admin/ssl.php
@@ -8,6 +8,8 @@ if (!in_array($action, array('list', 'add', 'edit', 'details'))) {
     $action = 'list';
 }
 
+$PageInfo['title'] = 'SSL ' . $lang->I18N($action);
+
 require __DIR__ . '/controllers/ssl/' . $action . '.php';
 require __DIR__ . '/views/header.php';
 require __DIR__ . '/views/navbar.php';
diff --git a/src/admin/views/accounts/details.php b/src/admin/views/accounts/details.php
index c28a77f..44deb32 100755
--- a/src/admin/views/accounts/details.php
+++ b/src/admin/views/accounts/details.php
@@ -2,7 +2,7 @@
 <div class="content-wrapper">
     <div class="container">
         <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('home'); ?></a></li>
+            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
             <li><a href="accounts.php"><?php echo $lang->I18N('Account List'); ?></a></li>
             <li class="active"><?php echo $lang->I18N('Account Details'); ?></li>
         </ol>
diff --git a/src/admin/views/accounts/edit.php b/src/admin/views/accounts/edit.php
index 1e129a9..77ef295 100755
--- a/src/admin/views/accounts/edit.php
+++ b/src/admin/views/accounts/edit.php
@@ -1,7 +1,7 @@
 <div class="content-wrapper">
     <div class="container">
         <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('home'); ?></a></li>
+            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
             <li><a href="accounts.php"><?php echo $lang->I18N('Account List'); ?></a></li>
             <li><a href="accounts.php?action=details&account_id=<?php echo $account_id; ?>"><?php echo $lang->I18N('Account Details'); ?></a></li>
             <li class="active"><?php echo $lang->I18N('Account Settings'); ?></li>
diff --git a/src/admin/views/accounts/list.php b/src/admin/views/accounts/list.php
index a3c94db..1bfd8d4 100755
--- a/src/admin/views/accounts/list.php
+++ b/src/admin/views/accounts/list.php
@@ -2,7 +2,7 @@
 <div class="content-wrapper">
     <div class="container">
         <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('home'); ?></a></li>
+            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
             <li class="active"><?php echo $lang->I18N('Hosting Accounts'); ?></li>
         </ol>
         <div class="panel panel-default">
diff --git a/src/admin/views/clients/add.php b/src/admin/views/clients/add.php
index 50bbab6..7f26b70 100644
--- a/src/admin/views/clients/add.php
+++ b/src/admin/views/clients/add.php
@@ -2,7 +2,7 @@
 <div class="content-wrapper">
     <div class="container">
         <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('home'); ?></a></li>
+            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
             <li><a href="clients.php"><?php echo $lang->I18N('Client List'); ?></a></li>
             <li class="active"><?php echo $lang->I18N('details'); ?></li>
         </ol>
diff --git a/src/admin/views/clients/details.php b/src/admin/views/clients/details.php
index bb251f6..44f570c 100755
--- a/src/admin/views/clients/details.php
+++ b/src/admin/views/clients/details.php
@@ -2,7 +2,7 @@
 <div class="content-wrapper">
     <div class="container">
         <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('home'); ?></a></li>
+            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
             <li><a href="clients.php"><?php echo $lang->I18N('Client List'); ?></a></li>
             <li class="active"><?php echo $lang->I18N('details'); ?></li>
         </ol>
diff --git a/src/admin/views/clients/edit.php b/src/admin/views/clients/edit.php
index 21d440b..9a64482 100755
--- a/src/admin/views/clients/edit.php
+++ b/src/admin/views/clients/edit.php
@@ -2,7 +2,7 @@
 <div class="content-wrapper">
     <div class="container">
         <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('home'); ?></a></li>
+            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
             <li><a href="clients.php"><?php echo $lang->I18N('Client List'); ?></a></li>
             <li><a href="<?php echo setURL('admin/clients', '', array('action' => 'details', 'id' => $ClientInfo['client_id'])); ?>"><?php echo $lang->I18N('details'); ?></a></li>
             <li class="active"><?php echo $lang->I18N('edit'); ?></li>
diff --git a/src/admin/views/clients/list.php b/src/admin/views/clients/list.php
index 672c576..be7cdef 100755
--- a/src/admin/views/clients/list.php
+++ b/src/admin/views/clients/list.php
@@ -1,7 +1,7 @@
 <div class="content-wrapper">
     <div class="container">
         <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('home'); ?></a></li>
+            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
             <li class="active"><?php echo $lang->I18N('Clients List'); ?></li>
         </ol>
         <div class="panel panel-default">
diff --git a/src/admin/views/footer.php b/src/admin/views/footer.php
index 402a356..a61b102 100755
--- a/src/admin/views/footer.php
+++ b/src/admin/views/footer.php
@@ -6,8 +6,8 @@
                     <li>
                         <span class="co">&copy;&nbsp;2013-<?php echo date("Y"); ?>&nbsp;<a href="<?php echo $site_url; ?>" target="_blank"><?php echo $SiteConfig['site_brand']; ?></a>&nbsp;</span>
                         <span class="co">&nbsp;Powered by <a href="https://crogram.org" target="_blank">Crogram</a>&nbsp;</span>
-                        <span class="co">&nbsp;Partnered with <a href="https://ifastnet.com/" name="jump-ifastnet" target="_blank">iFastNet</a>&nbsp;</span>
-                        <span>time: <?php echo get_execution_time();?>s</span>
+                        <span class="co hidden-xs">&nbsp;Partnered with <a href="https://ifastnet.com/" name="jump-ifastnet" target="_blank">iFastNet</a>&nbsp;</span>
+                        <span class="hidden-xs">time: <?php echo get_execution_time();?>s</span>
                     </li>
                 </ul>
                 <ul class="legal navbar-right list-inline text-center">
@@ -18,9 +18,9 @@
                         </div>
                         <ul class="dropdown-menu language-change"><?php echo $lang->get_languages_tags(); ?></ul>
                     </li>
-                    <li><a href="<?php echo $site_url; ?>/about.php" target="_blank"><?php echo $lang->I18N('about'); ?></a></li>
-                    <li><a href="<?php echo $site_url; ?>/contact.php" target="_blank"><?php echo $lang->I18N('contact'); ?></a></li>
-                    <li><a href="<?php echo $site_url; ?>/news.php" target="_blank"><?php echo $lang->I18N('News'); ?></a></li>
+                    <li><a href="<?php echo $site_url; ?>" target="_blank"><?php echo $lang->I18N('home'); ?></a></li>
+                    <li class="hidden-xs"><a href="<?php echo $site_url; ?>/contact.php" target="_blank"><?php echo $lang->I18N('contact'); ?></a></li>
+                    <li class="hidden-xs"><a href="<?php echo $site_url; ?>/news.php" target="_blank"><?php echo $lang->I18N('News'); ?></a></li>
                 </ul>
             </div>
         </div>
diff --git a/src/admin/views/header.php b/src/admin/views/header.php
index 35bfff0..cb943ad 100755
--- a/src/admin/views/header.php
+++ b/src/admin/views/header.php
@@ -20,6 +20,7 @@
 
     <link href="<?php echo $site_url; ?>/assets/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
     <link href="<?php echo $site_url; ?>/assets/css/font-awesome.min.css" rel="stylesheet" />
+    <link href="<?php echo $site_url; ?>/assets/theme.switcher/css/auto.css" id="theme" type="text/css" rel="stylesheet" media="screen,projection" />
     <link href="<?php echo $site_url; ?>/assets/css/common.css?_=<?php echo $static_release; ?>" rel="stylesheet" />
     <link href="<?php echo $site_url; ?>/assets/css/admin.css" rel="stylesheet" />
     <script type="text/javascript">
@@ -28,6 +29,8 @@
         var ifastnet_aff = "<?php echo $ifastnet_aff; ?>";
     </script>
     <?php echo $PageInfo['rel']; ?>
+
+    <script src="<?php echo $site_url; ?>/assets/theme.switcher/theme.switcher.js" type="text/javascript"></script>
 </head>
 
 <body>
diff --git a/src/admin/views/hosting-provider/add.php b/src/admin/views/hosting-provider/add.php
index 5b407eb..82aec36 100755
--- a/src/admin/views/hosting-provider/add.php
+++ b/src/admin/views/hosting-provider/add.php
@@ -6,7 +6,7 @@ if (!defined('IN_CRONLITE')) {
 <div class="content-wrapper">
     <div class="container">
         <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('home'); ?></a></li>
+            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
             <li><a href="hosting-provider.php"><?php echo $lang->I18N('Hosting Provider'); ?></a></li>
             <li class="active"><?php echo $lang->I18N('add'); ?></li>
         </ol>
diff --git a/src/admin/views/hosting-provider/details.php b/src/admin/views/hosting-provider/details.php
index e844930..8c56a0a 100755
--- a/src/admin/views/hosting-provider/details.php
+++ b/src/admin/views/hosting-provider/details.php
@@ -6,14 +6,14 @@ if (!defined('IN_CRONLITE')) {
 <div class="content-wrapper">
     <div class="container">
         <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('home'); ?></a></li>
+            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
             <li><a href="hosting-provider.php"><?php echo $lang->I18N('Hosting Provider'); ?></a></li>
             <li class="active"><?php echo $lang->I18N('details'); ?></li>
         </ol>
         <div class="panel panel-default">
             <div class="panel-heading">
                 <div class="pull-right">
-                    <a href="<?php echo setURL('admin/hosting', '', array('action' => 'edit', 'id' => $data['api_id'])); ?>" class="btn btn-success btn-xs">
+                    <a href="<?php echo setURL('admin/hosting-provider', '', array('action' => 'edit', 'id' => $data['api_id'])); ?>" class="btn btn-success btn-xs">
                         <i class="fa fa-edit"></i> <?php echo $lang->I18N('edit'); ?>
                     </a>
                     <a href="hosting-provider.php?action=add" class="btn btn-primary btn-xs">
@@ -117,7 +117,7 @@ if (!defined('IN_CRONLITE')) {
                 <div class="row">
                     <div class="col-md-12">
                         <div class="mb-20 px-10">
-                            <a href="<?php echo setURL('admin/hosting', '', array('action' => 'edit', 'id' => $data['api_id'])); ?>" class="btn btn-success btn-xs"><i class="fa fa-edit"></i> <?php echo $lang->I18N('edit'); ?></a>
+                            <a href="<?php echo setURL('admin/hosting-provider', '', array('action' => 'edit', 'id' => $data['api_id'])); ?>" class="btn btn-success btn-xs"><i class="fa fa-edit"></i> <?php echo $lang->I18N('edit'); ?></a>
                         </div>
                     </div>
                 </div>
diff --git a/src/admin/views/hosting-provider/edit.php b/src/admin/views/hosting-provider/edit.php
index 9979595..728e6dd 100755
--- a/src/admin/views/hosting-provider/edit.php
+++ b/src/admin/views/hosting-provider/edit.php
@@ -6,15 +6,15 @@ if (!defined('IN_CRONLITE')) {
 <div class="content-wrapper">
     <div class="container">
         <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('home'); ?></a></li>
+            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
             <li><a href="hosting-provider.php"><?php echo $lang->I18N('Hosting Provider'); ?></a></li>
-            <li><a href="<?php echo setURL('admin/hosting', '', array('action' => 'details', 'id' => $data['api_id'])); ?>"><?php echo $lang->I18N('details'); ?></a></li>
+            <li><a href="<?php echo setURL('admin/hosting-provider', '', array('action' => 'details', 'id' => $data['api_id'])); ?>"><?php echo $lang->I18N('details'); ?></a></li>
             <li class="active"><?php echo $lang->I18N('edit'); ?></li>
         </ol>
         <div class="panel panel-default">
             <div class="panel-heading">
                 <div class="pull-right">
-                    <a href="<?php echo setURL('admin/hosting', '', array('action' => 'details', 'id' => $data['api_id'])); ?>" class="btn btn-success btn-xs">
+                    <a href="<?php echo setURL('admin/hosting-provider', '', array('action' => 'details', 'id' => $data['api_id'])); ?>" class="btn btn-success btn-xs">
                         <i class="fa fa-info-circle"></i> <?php echo $lang->I18N('details'); ?>
                     </a>
                     <a href="hosting-provider.php?action=add" class="btn btn-primary btn-xs">
diff --git a/src/admin/views/hosting-provider/list.php b/src/admin/views/hosting-provider/list.php
index f978868..d619d45 100755
--- a/src/admin/views/hosting-provider/list.php
+++ b/src/admin/views/hosting-provider/list.php
@@ -6,7 +6,7 @@ if (!defined('IN_CRONLITE')) {
 <div class="content-wrapper">
     <div class="container">
         <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('home'); ?></a></li>
+            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
             <li class="active"><?php echo $lang->I18N('Hosting Provider'); ?></li>
         </ol>
         <div class="panel panel-default">
diff --git a/src/admin/views/knowledgebase/add.php b/src/admin/views/knowledgebase/add.php
index e16e999..bde3cb1 100755
--- a/src/admin/views/knowledgebase/add.php
+++ b/src/admin/views/knowledgebase/add.php
@@ -6,7 +6,7 @@ if (!defined('IN_CRONLITE')) {
 <div class="content-wrapper">
     <div class="container">
         <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('home'); ?></a></li>
+            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
             <li><a href="knowledgebase.php"><?php echo $lang->I18N('Knowledgebase'); ?></a></li>
             <li class="active"><?php echo $lang->I18N('add'); ?></li>
         </ol>
diff --git a/src/admin/views/knowledgebase/details.php b/src/admin/views/knowledgebase/details.php
index 361dfbc..7cc0d89 100755
--- a/src/admin/views/knowledgebase/details.php
+++ b/src/admin/views/knowledgebase/details.php
@@ -6,7 +6,7 @@ if (!defined('IN_CRONLITE')) {
 <div class="content-wrapper">
     <div class="container">
         <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('home'); ?></a></li>
+            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
             <li><a href="knowledgebase.php"><?php echo $lang->I18N('Knowledgebase'); ?></a></li>
             <li class="active"><?php echo $lang->I18N('details'); ?></li>
         </ol>
diff --git a/src/admin/views/knowledgebase/edit.php b/src/admin/views/knowledgebase/edit.php
index 307edb2..10b0e69 100755
--- a/src/admin/views/knowledgebase/edit.php
+++ b/src/admin/views/knowledgebase/edit.php
@@ -6,7 +6,7 @@ if (!defined('IN_CRONLITE')) {
 <div class="content-wrapper">
     <div class="container">
         <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('home'); ?></a></li>
+            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
             <li><a href="knowledgebase.php"><?php echo $lang->I18N('Knowledgebase'); ?></a></li>
             <li><a href="knowledgebase.php?action=details&id=<?php echo $id; ?>"><?php echo $lang->I18N('details'); ?></a></li>
             <li class="active"><?php echo $lang->I18N('edit'); ?></li>
diff --git a/src/admin/views/knowledgebase/list.php b/src/admin/views/knowledgebase/list.php
index 7568507..e27b0c1 100755
--- a/src/admin/views/knowledgebase/list.php
+++ b/src/admin/views/knowledgebase/list.php
@@ -6,7 +6,7 @@ if (!defined('IN_CRONLITE')) {
 <div class="content-wrapper">
     <div class="container">
         <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('home'); ?></a></li>
+            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
             <li class="active"><?php echo $lang->I18N('Knowledgebase'); ?></li>
         </ol>
         <div class="panel panel-default">
diff --git a/src/admin/views/login/footer.php b/src/admin/views/login/footer.php
index f864748..f130b11 100755
--- a/src/admin/views/login/footer.php
+++ b/src/admin/views/login/footer.php
@@ -11,6 +11,14 @@
                 <ul class="legal navbar-right list-inline text-center">
                     <li><a href="<?php echo $site_url; ?>" target="_blank"><?php echo $lang->I18N('home'); ?></a></li>
                     <li><a href="<?php echo $site_url; ?>/about.php" target="_blank"><?php echo $lang->I18N('about'); ?></a></li>
+                    <li>
+                        <a href="#" aria-hidden="true"><i id="theme-selector"></i></a>
+                        <script type="text/javascript">
+                            var sel = document.getElementById('theme-selector');
+                            sel.className = getThemeClasses(getTheme());
+                            sel.onclick = themeSelectorClicked;
+                        </script>
+                    </li>
                     <li class="dropup">
                         <div class="dropdown-toggle" id="changelanguage" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                             <span class="fa fa-language"></span>
diff --git a/src/admin/views/login/header.php b/src/admin/views/login/header.php
index 53dd592..a6071e1 100755
--- a/src/admin/views/login/header.php
+++ b/src/admin/views/login/header.php
@@ -20,6 +20,7 @@
 
     <link href="<?php echo $site_url; ?>/assets/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
     <link href="<?php echo $site_url; ?>/assets/css/font-awesome.min.css" rel="stylesheet" />
+    <link href="<?php echo $site_url; ?>/assets/theme.switcher/css/auto.css" id="theme" type="text/css" rel="stylesheet" media="screen,projection" />
     <link href="<?php echo $site_url; ?>/assets/css/common.css?_=<?php echo $static_release; ?>" rel="stylesheet" />
     <!-- <link href="<?php echo $site_url; ?>/assets/css/admin.css" rel="stylesheet" /> -->
     <script type="text/javascript">
@@ -28,6 +29,8 @@
         var ifastnet_aff = "<?php echo $ifastnet_aff; ?>";
     </script>
     <?php echo $PageInfo['rel']; ?>
+
+    <script src="<?php echo $site_url; ?>/assets/theme.switcher/theme.switcher.js" type="text/javascript"></script>
 </head>
 
 <body>
diff --git a/src/admin/views/navbar.php b/src/admin/views/navbar.php
index 7da11f7..f11af4c 100755
--- a/src/admin/views/navbar.php
+++ b/src/admin/views/navbar.php
@@ -12,7 +12,7 @@
         <div id="navbar" class="collapse navbar-collapse">
             <ul class="nav navbar-nav navbar-right">
                 <li class="<?php echo checkIfActive('index,') ?>">
-                    <a href="./"><i class="fa fa-home" aria-hidden="true"></i> <?php echo $lang->I18N('home'); ?></a>
+                    <a href="./"><i class="fa fa-tachometer-alt" aria-hidden="true"></i> <?php echo $lang->I18N('Dashboard'); ?></a>
                 </li>
                 <li class="<?php echo checkIfActive('clients') ?>">
                     <a href="clients.php"><i class="fa fa-users fa-fw"></i> <?php echo $lang->I18N('Clients List'); ?></a>
@@ -61,6 +61,14 @@
                         <li><a href="#" onclick="return logout();"><i class="fa fa-sign-out-alt fa-fw" aria-hidden="true"></i> <?php echo $lang->I18N('logout'); ?></a></li>
                     </ul>
                 </li>
+                <li>
+                    <a href="#" aria-hidden="true"><i id="theme-selector"></i></a>
+                    <script type="text/javascript">
+                        var sel = document.getElementById('theme-selector');
+                        sel.className = getThemeClasses(getTheme());
+                        sel.onclick = themeSelectorClicked;
+                    </script>
+                </li>
             </ul>
         </div>
     </div>
diff --git a/src/admin/views/news/add.php b/src/admin/views/news/add.php
index 0d7a633..0d9689c 100755
--- a/src/admin/views/news/add.php
+++ b/src/admin/views/news/add.php
@@ -7,7 +7,7 @@ if (!defined('IN_CRONLITE')) {
 <div class="content-wrapper">
     <div class="container">
         <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('home'); ?></a></li>
+            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
             <li><a href="news.php"><?php echo $lang->I18N('News List'); ?></a></li>
             <li class="active"><?php echo $lang->I18N('add'); ?></li>
         </ol>
diff --git a/src/admin/views/news/edit.php b/src/admin/views/news/edit.php
index aa29d95..de2d913 100755
--- a/src/admin/views/news/edit.php
+++ b/src/admin/views/news/edit.php
@@ -7,7 +7,7 @@ if (!defined('IN_CRONLITE')) {
 <div class="content-wrapper">
     <div class="container">
         <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('home'); ?></a></li>
+            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
             <li><a href="news.php"><?php echo $lang->I18N('News List'); ?></a></li>
             <li><a href="<?php echo setURL('admin/news', '', array('action' => 'view', 'id' => $id)); ?>"><?php echo $lang->I18N('details'); ?></a></li>
             <li class="active"><?php echo $lang->I18N('edit'); ?></li>
diff --git a/src/admin/views/news/list.php b/src/admin/views/news/list.php
index 3c11fb3..2e4f5cb 100755
--- a/src/admin/views/news/list.php
+++ b/src/admin/views/news/list.php
@@ -7,7 +7,7 @@ if (!defined('IN_CRONLITE')) {
 <div class="content-wrapper">
     <div class="container">
         <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('home'); ?></a></li>
+            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
             <li class="active"><?php echo $lang->I18N('News List'); ?></li>
         </ol>
 
diff --git a/src/admin/views/news/view.php b/src/admin/views/news/view.php
index 46a5edb..5f81830 100755
--- a/src/admin/views/news/view.php
+++ b/src/admin/views/news/view.php
@@ -8,7 +8,7 @@ if (!defined('IN_CRONLITE')) {
 <div class="content-wrapper">
     <div class="container">
         <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('home'); ?></a></li>
+            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
             <li><a href="news.php"><?php echo $lang->I18N('News List'); ?></a></li>
             <li class="active"><?php echo $lang->I18N('details'); ?></li>
         </ol>
diff --git a/src/admin/views/settings/menu.php b/src/admin/views/settings/menu.php
index 37ba7db..c156917 100644
--- a/src/admin/views/settings/menu.php
+++ b/src/admin/views/settings/menu.php
@@ -1,21 +1,11 @@
-
-<div class="content-wrapper">
-<div class="container-fluid">
-    <div class="px-10 m-20">
-        <a href="<?php echo setRouter('settings');?>" class="btn<?php if ($section == 'settings') echo ' btn-primary'; ?>">
-            <i class="fa fa-cog"></i> <?php echo $lang->I18N('System Settings'); ?>
-        </a>
-        <a href="<?php echo setRouter('settings', 'smtp');?>" class="btn<?php if ($section == 'smtp') echo ' btn-primary'; ?>">
-            <i class="fa fa-inbox"></i></span>
-            <?php echo $lang->I18N('SMTP Settings'); ?>
-        </a>
-        <a href="<?php echo setRouter('settings', 'sslapi');?>" class="btn<?php if ($section == 'sslapi') echo ' btn-primary'; ?>">
-            <i class="fa fa-lock"></i></span>
-            <?php echo $lang->I18N('SSL API Settings'); ?>
-        </a>
-        <a href="<?php echo setRouter('settings', 'sitepro');?>" class="btn<?php if ($section == 'sitepro') echo ' btn-primary'; ?>">
-            <i class="fa fa-tools"></i></span>
-            <?php echo $lang->I18N('SitePro Settings'); ?>
-        </a>
-    </div>
-</div>
+<a href="<?php echo setRouter('settings'); ?>" class="btn<?php if ($section == 'settings') echo ' btn-primary'; ?>">
+    <i class="fa fa-cog"></i> <?php echo $lang->I18N('System Settings'); ?>
+</a>
+<a href="<?php echo setRouter('settings', 'smtp'); ?>" class="btn<?php if ($section == 'smtp') echo ' btn-primary'; ?>">
+    <i class="fa fa-inbox"></i></span>
+    <?php echo $lang->I18N('SMTP Settings'); ?>
+</a>
+<a href="<?php echo setRouter('settings', 'sitepro'); ?>" class="btn<?php if ($section == 'sitepro') echo ' btn-primary'; ?>">
+    <i class="fa fa-tools"></i></span>
+    <?php echo $lang->I18N('SitePro Settings'); ?>
+</a>
diff --git a/src/admin/views/sidebar.php b/src/admin/views/sidebar.php
index 74e0b29..3ce930f 100755
--- a/src/admin/views/sidebar.php
+++ b/src/admin/views/sidebar.php
@@ -19,7 +19,7 @@ $avatar_path = $AdminInfo['admin_email'] ? md5($AdminInfo['admin_email']) : 'def
         <div class="sidebar-divider"></div>
         <a href="./" class="sidebar-link sidebar-link-with-icon">
             <span class="sidebar-icon bg-transparent"><i class="fa fa-home" aria-hidden="true"></i></span>
-            <?php echo $lang->I18N('home'); ?>
+            <?php echo $lang->I18N('Dashboard'); ?>
         </a>
         <a href="clients.php" class="sidebar-link sidebar-link-with-icon">
             <span class="sidebar-icon bg-transparent"><i class="fa fa-users" aria-hidden="true"></i></span>
diff --git a/src/admin/views/sitepro/view.php b/src/admin/views/sitepro/view.php
index 85734bf..fb10684 100755
--- a/src/admin/views/sitepro/view.php
+++ b/src/admin/views/sitepro/view.php
@@ -1,32 +1,50 @@
-
-<div class="container-fluid">
-    <div class="card">
-        <div class="card-header d-flex justify-content-between align-items-center">
-            <h3 class="m-0"><?php echo $PageInfo['title']; ?></h3>
-            <a href="index.php" class="btn btn-danger btn-sm">
-                <i class="fa fa-backward"></i> <?php echo $lang->I18N('Return'); ?>
-            </a>
+<?php
+if (!defined('IN_CRONLITE')) {
+    exit('Access Denied');
+}
+?>
+<div class="content-wrapper">
+    <div class="container">
+        <ol class="breadcrumb page-breadcrumb">
+            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
+            <li><a href="settings.php"><?php echo $lang->I18N('System Settings'); ?></a></li>
+            <li class="active"><?php echo $lang->I18N('SitePro'); ?></li>
+        </ol>
+        <div class="panel panel-default">
+            <div class="panel-body">
+                <?php require __DIR__ . '/menu.php'; ?>
+            </div>
         </div>
-        <hr />
-        <form class="card-body" action="controllers/sitepro/edit.php" method="post">
-            <div class="row">
-                <div class="col-md-6">
-                    <div class="mb-10 px-10">
-                        <label class="form-label required">SitePro API Username</label>
-                        <input type="text" name="username" value="<?php echo $SitePro['builder_username']; ?>" class="form-control" required>
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <div class="pull-right">
+                    <a href="settings.php" class="btn btn-primary btn-xs">
+                        <i class="fa fa-list"></i> <?php echo $lang->I18N('Return'); ?>
+                    </a>
+                </div>
+                <span class="panel-title"><?php echo $PageInfo['title']; ?></span>
+            </div>
+            <form class="card-body" action="controllers/sitepro/edit.php" method="post">
+                <div class="panel-body">
+                    <div class="row">
+                        <div class="col-md-6">
+                            <div class="mb-10 px-10">
+                                <label class="form-label required">SitePro API Username</label>
+                                <input type="text" name="username" value="<?php echo $SitePro['builder_username']; ?>" class="form-control" required>
+                            </div>
+                        </div>
+                        <div class="col-md-6">
+                            <div class="mb-10 px-10">
+                                <label class="form-label required">SitePro API Password</label>
+                                <input type="text" name="password" value="<?php echo $SitePro['builder_password']; ?>" class="form-control" required>
+                            </div>
+                        </div>
                     </div>
                 </div>
-                <div class="col-md-6">
-                    <div class="mb-10 px-10">
-                        <label class="form-label required">SitePro API Password</label>
-                        <input type="text" name="password" value="<?php echo $SitePro['builder_password']; ?>" class="form-control" required>
-                    </div>
-                </div>
-                <div class="col-md-12">
-                    <hr />
+                <div class="panel-footer">
                     <button name="submit" class="btn btn-primary"><?php echo $lang->I18N('Save'); ?></button>
                 </div>
-            </div>
-        </form>
+            </form>
+        </div>
     </div>
 </div>
diff --git a/src/admin/views/ssl-provider/add.php b/src/admin/views/ssl-provider/add.php
index bacf62c..a605837 100755
--- a/src/admin/views/ssl-provider/add.php
+++ b/src/admin/views/ssl-provider/add.php
@@ -6,7 +6,7 @@ if (!defined('IN_CRONLITE')) {
 <div class="content-wrapper">
     <div class="container">
         <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('home'); ?></a></li>
+            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
             <li><a href="ssl-provider.php"><?php echo $lang->I18N('SSL Provider'); ?></a></li>
             <li class="active"><?php echo $lang->I18N('add'); ?></li>
         </ol>
diff --git a/src/admin/views/ssl-provider/details.php b/src/admin/views/ssl-provider/details.php
index f1624a1..5825bce 100755
--- a/src/admin/views/ssl-provider/details.php
+++ b/src/admin/views/ssl-provider/details.php
@@ -6,7 +6,7 @@ if (!defined('IN_CRONLITE')) {
 <div class="content-wrapper">
     <div class="container">
         <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('home'); ?></a></li>
+            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
             <li><a href="ssl-provider.php"><?php echo $lang->I18N('SSL Provider'); ?></a></li>
             <li class="active"><?php echo $lang->I18N('details'); ?></li>
         </ol>
diff --git a/src/admin/views/ssl-provider/edit.php b/src/admin/views/ssl-provider/edit.php
index 281ee82..b4e2171 100755
--- a/src/admin/views/ssl-provider/edit.php
+++ b/src/admin/views/ssl-provider/edit.php
@@ -6,7 +6,7 @@ if (!defined('IN_CRONLITE')) {
 <div class="content-wrapper">
     <div class="container">
         <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('home'); ?></a></li>
+            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
             <li><a href="ssl-provider.php"><?php echo $lang->I18N('SSL Provider'); ?></a></li>
             <li class="active"><?php echo $lang->I18N('details'); ?></li>
         </ol>
diff --git a/src/admin/views/ssl-provider/list.php b/src/admin/views/ssl-provider/list.php
index 8fa16a7..bab1e5e 100755
--- a/src/admin/views/ssl-provider/list.php
+++ b/src/admin/views/ssl-provider/list.php
@@ -6,7 +6,7 @@ if (!defined('IN_CRONLITE')) {
 <div class="content-wrapper">
     <div class="container">
         <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('home'); ?></a></li>
+            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
             <li class="active"><?php echo $lang->I18N('SSL Provider'); ?></li>
         </ol>
         <div class="panel panel-default">
diff --git a/src/admin/views/ssl/details.php b/src/admin/views/ssl/details.php
new file mode 100755
index 0000000..7628c81
--- /dev/null
+++ b/src/admin/views/ssl/details.php
@@ -0,0 +1,98 @@
+<?php
+if (!defined('IN_CRONLITE')) {
+    exit('Access Denied');
+}
+?>
+<div class="content-wrapper">
+    <div class="container">
+        <ol class="breadcrumb page-breadcrumb">
+            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
+            <li class="active"><?php echo $lang->I18N('SSL Provider'); ?></li>
+        </ol>
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <div class="pull-right">
+                    <a href="ssl.php?action=add" class="btn btn-primary btn-xs">
+                        <i class="fa fa-plus"></i> <?php echo $lang->I18N('add'); ?>
+                    </a>
+                    <a href="ssl.php" class="btn btn-primary btn-xs">
+                        <i class="fa fa-list"></i> <?php echo $lang->I18N('list'); ?>
+                    </a>
+                </div>
+                <span class="panel-title"><?php echo $PageInfo['title']; ?> ID: <?php echo $SSLInfo['ssl_id']; ?></span>
+            </div>
+            <div class="panel-body">
+                <div class="row mb-10">
+                    <div class="col-md-6"><b><?php echo $lang->I18N('Status'); ?> : </b><?php echo $Status;?></div>
+                    <div class="col-md-6"><b><?php echo $lang->I18N('Domain Name'); ?> : </b><?php echo $SSLInfo['ssl_domain'];?></div>
+                </div>
+                <div class="row mb-10">
+                    <div class="col-md-6"><b><?php echo $lang->I18N('Start Date'); ?></b> : <?php echo $SSLInfo['ssl_begin_date'];?></span></div>
+                    <div class="col-md-6"><b><?php echo $lang->I18N('End Date'); ?></b> : <span><?php echo $SSLInfo['ssl_end_date'];?></span></div>
+                </div>
+                <div class="row mb-10">
+                    <div class="col-md-6">
+                        <div class="d-flex justify-content-between align-items-center mx-10 my-5">
+                            <b>Method:</b>
+                            <span>DNS</span>
+                        </div>
+                    </div>
+                </div>
+                <div class="row mb-10">
+                    <?php if($SSLInfo['ssl_status']=='processing') {
+                        // 处理中
+                        $Record = explode(' ',$SSLInfo['approver_method']['dns']['record']);
+                    ?>
+                        <div class="col-md-12 mb-10">
+                            <div class="my-5 mx-10">
+                                <b>CSR Code:</b>
+                                <pre class="my-0"><?php echo htmlspecialchars_decode($SSLInfo['ssl_csr_code']); ?></pre>
+                            </div>
+                            <div class="my-10 mx-10">
+                                <b>CNAME Record:</b>
+                                <pre class="my-0"><input type="text" class="form-control" value="<?php echo $Record['0'];?>" readonly></pre>
+                            </div>
+                            <div class="my-10 mx-10">
+                                <b>Record Content:</b>
+                                <pre class="my-0"><?php echo $Record['2'];?></pre>
+                            </div>
+                        </div>
+                    <?php } elseif($SSLInfo['ssl_status']=='active') { ?>
+                        <div class="col-lg-12 mb-10">
+                            <div class="my-5 mx-10">
+                                <p><b>Certificate Code:</b></p>
+                                <pre class="my-0"><textarea class="form-control" style="height: 250px" readonly><?php echo $SSLInfo['ssl_crt_code'];?></textarea></pre>
+                            </div>
+                        </div>
+                        <div class="col-lg-12">
+                            <div class="my-5 mx-10">
+                                <b>CA Bundle:</b>
+                                <pre class="my-0"><textarea class="form-control" style="height: 250px" readonly><?php echo $SSLInfo['ssl_ca_code'];?></textarea></pre>
+                            </div>
+                        </div>
+                    <?php } elseif($SSLInfo['ssl_status']=='cancelled'){ ?>
+                    <div class="col-lg-12">
+                        <div class="my-5 mx-10">
+                            <b>CSR Code:</b>
+                            <pre class="my-0"><textarea class="form-control" style="height: 250px" readonly><?php echo $SSLInfo['csr_code'];?></textarea></pre>
+                        </div>
+                    </div>
+                    <?php } elseif($SSLInfo['ssl_status']=='expired'){ ?>
+                    <div class="col-lg-12">
+                        <div class="my-5 mx-10">
+                            <b>Certificate Code:</b>
+                            <pre class="my-0"><textarea class="form-control" style="height: 250px" readonly>-----</textarea></pre>
+                        </div>
+                    </div>
+                    <div class="col-lg-12">
+                        <div class="my-5 mx-10">
+                            <b>CA Bundle:</b>
+                            <pre class="my-0"><textarea class="form-control" style="height: 250px" readonly>-----</textarea></pre>
+                        </div>
+                    </div>
+                    <?php } ?>
+                </div>
+        </div>
+    </div>
+</div>
+</div>
diff --git a/src/admin/views/ssl/list.php b/src/admin/views/ssl/list.php
index fd1b6bc..e56ff41 100755
--- a/src/admin/views/ssl/list.php
+++ b/src/admin/views/ssl/list.php
@@ -6,7 +6,7 @@ if (!defined('IN_CRONLITE')) {
 <div class="content-wrapper">
     <div class="container">
         <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('home'); ?></a></li>
+            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
             <li class="active"><?php echo $lang->I18N('SSL Certificates'); ?></li>
         </ol>
         <div class="panel panel-default">
@@ -52,7 +52,7 @@ if ($row['ssl_status'] == 'processing') {
 }
 ?></td>
                             <td>
-                                <a href="<?php echo setRouter('ssl', '', array('action' => 'details', 'ssl_id' => $row['ssl_id'])); ?>" class="btn btn-primary btn-xs">
+                                <a href="<?php echo setRouter('ssl', '', array('action' => 'details', 'id' => $row['ssl_id'])); ?>" class="btn btn-primary btn-xs">
                                     <i class="fa fa-info-circle"></i> <?php echo $lang->I18N('details'); ?>
                                 </a>
                             </td>
diff --git a/src/admin/views/tickets/details.php b/src/admin/views/tickets/details.php
index e235396..39ea05b 100755
--- a/src/admin/views/tickets/details.php
+++ b/src/admin/views/tickets/details.php
@@ -6,7 +6,7 @@ if (!defined('IN_CRONLITE')) {
 <div class="content-wrapper">
     <div class="container">
         <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('home'); ?></a></li>
+            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
             <li><a href="tickets.php"><?php echo $lang->I18N('Tickets List'); ?></a></li>
             <li class="active"><?php echo $lang->I18N('Ticket Details'); ?></li>
         </ol>
diff --git a/src/admin/views/tickets/list.php b/src/admin/views/tickets/list.php
index c0c8bfa..7ab6428 100755
--- a/src/admin/views/tickets/list.php
+++ b/src/admin/views/tickets/list.php
@@ -1,7 +1,7 @@
 <div class="content-wrapper">
     <div class="container">
         <ol class="breadcrumb page-breadcrumb">
-            <li><a href="index.php"><?php echo $lang->I18N('home'); ?></a></li>
+            <li><a href="index.php"><?php echo $lang->I18N('Dashboard'); ?></a></li>
             <li class="active"><?php echo $lang->I18N('Tickets List'); ?></li>
         </ol>
         <div class="panel panel-default">
diff --git a/src/assets/theme.switcher/css/auto.css b/src/assets/theme.switcher/css/auto.css
new file mode 100644
index 0000000..b64decf
--- /dev/null
+++ b/src/assets/theme.switcher/css/auto.css
@@ -0,0 +1 @@
+@import url("./dark.css") (prefers-color-scheme: dark);
\ No newline at end of file
diff --git a/src/assets/theme.switcher/css/dark.css b/src/assets/theme.switcher/css/dark.css
new file mode 100644
index 0000000..bf06d33
--- /dev/null
+++ b/src/assets/theme.switcher/css/dark.css
@@ -0,0 +1,100 @@
+html,
+body,
+.form-control,
+.dropdown-menu {
+    background-color: #1a1a1a !important;
+    color: #e6e6e6;
+}
+
+.dropdown-menu {
+    border-color: #ccc;
+}
+
+.form-control[disabled],
+.form-control[readonly],
+fieldset[disabled] .form-control {
+    background-color: #2b2b2b !important;
+}
+
+.navbar,
+.breadcrumb,
+.panel-default,
+.panel-default > .panel-heading,
+.panel-footer,
+.table,
+.list-group-item {
+    background-color: #2b2b2b !important;
+}
+
+.table-hover > tbody > tr:hover {
+    background-color: #585858 !important;
+}
+
+.navbar-default .navbar-nav > .active > a,
+.navbar-default .navbar-nav > .active > a:hover,
+.navbar-default .navbar-nav > .active > a:focus,
+.navbar-default .navbar-nav > .open > a,
+.navbar-default .navbar-nav > .open > a:focus,
+.navbar-default .navbar-nav > .open > a:hover {
+    color: #ffffff;
+    background-color: #585858;
+}
+
+.navbar-default .navbar-nav > li > a:focus,
+.navbar-default .navbar-nav > li > a:hover {
+    color: #ffffff;
+}
+
+.form-control:focus {
+    color: #ffffff;
+}
+
+pre,
+code,
+span,
+.breadcrumb > .active,
+.dropdown-menu > li > a,
+.panel-title,
+.navbar-default .navbar-nav>li>a,
+.panel-footer {
+    color: #fff;
+}
+
+hr {
+    border-color: #808080;
+}
+
+/* nav .navbar-brand #logo-img {
+    background-image: url(../img/logo-light.svg);
+    background-repeat: no-repeat;
+    background-size: contain;
+} */
+
+nav .nav-item {
+    color: rgba(255, 255, 255, 0.5);
+}
+
+.nav-navbar .nav-item.nav-link.active {
+    color: #ffffff;
+}
+
+.navbar-toggler {
+    color: rgba(255, 255, 255, 0.5);
+    border-color: rgba(255, 255, 255, 0.1);
+}
+
+a {
+    color: rgb(0, 183, 255);
+}
+
+.jumbotron {
+    background-color: #000;
+}
+
+.jumbotron h1 {
+    text-shadow: #000 0px 0px 10px;
+}
+
+.border {
+    border: 1px solid #404040 !important;
+}
diff --git a/src/assets/theme.switcher/theme.switcher.js b/src/assets/theme.switcher/theme.switcher.js
new file mode 100644
index 0000000..dd23975
--- /dev/null
+++ b/src/assets/theme.switcher/theme.switcher.js
@@ -0,0 +1,62 @@
+// theme Selector Switcher
+linkLoader(getTheme());
+
+function themeSelectorClicked() {
+    var next = nextTheme(getTheme());
+    linkLoader(next);
+    saveTheme(next);
+    this.className = getThemeClasses(next);
+}
+
+// This function loads a css file according to the value of its parameter
+function linkLoader(param) {
+    var link = document.getElementById('theme');
+    if (param == 'light') {
+        link.removeAttribute('href');
+    } else if (param == 'dark') {
+        link.setAttribute('href', location.origin + '/assets/theme.switcher/css/dark.css');
+    } else {
+        link.setAttribute('href', location.origin + '/assets/theme.switcher/css/auto.css');
+    }
+    document.getElementsByTagName("head")[0].appendChild(link);
+}
+
+function getTheme() {
+    try {
+        var theme = localStorage.getItem('theme');
+        if (!theme) {
+            return 'auto';
+        }
+        return theme;
+    } catch {
+        return 'auto';
+    }
+}
+
+function getThemeClasses(theme) {
+    if (theme == 'light') {
+        return 'fa fa-sun fa-fw"';
+    } else if (theme == 'dark') {
+        return 'fa fa-moon fa-fw';
+    } else {
+        return 'fa fa-adjust fa-fw';
+    }
+}
+
+function nextTheme(current) {
+    if (current == 'light') {
+        return 'dark';
+    } else if (current == 'dark') {
+        return 'auto';
+    } else {
+        return 'light';
+    }
+}
+
+function saveTheme(theme) {
+    try {
+        localStorage.setItem('theme', theme);
+    } catch (e) {
+        console.log(e);
+    }
+}
diff --git a/src/clientarea/controllers/myssl/new.php b/src/clientarea/controllers/myssl/new.php
index 23efc85..55beb1e 100755
--- a/src/clientarea/controllers/myssl/new.php
+++ b/src/clientarea/controllers/myssl/new.php
@@ -100,7 +100,7 @@ if (count($result) > 4) {
             'message' => email_build_body('New SSL',
                 'Administrator',
                 '<p>You have successfully created a new ssl and you need to verify your domain using dns record in order to issue an ssl certificate.</p>',
-                '<a href="' . setURL('admin/sslcert', '', array('action' => 'view', 'ssl_id' => $result['order_id'])) . '" target="_blank">View SSL</a>'
+                '<a href="' . setURL('admin/ssl', '', array('action' => 'view', 'ssl_id' => $result['order_id'])) . '" target="_blank">View SSL</a>'
             ),
             'subject' => 'New SSL #' . $FormData['order_id'],
         ));
diff --git a/src/clientarea/views/sidebar.php b/src/clientarea/views/sidebar.php
index 6e79d5d..d686c99 100755
--- a/src/clientarea/views/sidebar.php
+++ b/src/clientarea/views/sidebar.php
@@ -21,7 +21,7 @@ $avatar_path = $ClientInfo['client_email'] ? md5($ClientInfo['client_email']) :
         <div class="sidebar-divider"></div>
         <a href="index.php" class="sidebar-link sidebar-link-with-icon">
             <span class="sidebar-icon bg-transparent"><i class="fa fa-home" aria-hidden="true"></i></span>
-            <?php echo $lang->I18N('home'); ?>
+            <?php echo $lang->I18N('Dashboard'); ?>
         </a>
         <a href="accounts.php" class="sidebar-link sidebar-link-with-icon">
             <span class="sidebar-icon bg-transparent"><i class="fa fa-server" aria-hidden="true"></i></span>
diff --git a/src/core/language/zh-CN/language.php b/src/core/language/zh-CN/language.php
index 8086cef..203801c 100755
--- a/src/core/language/zh-CN/language.php
+++ b/src/core/language/zh-CN/language.php
@@ -83,6 +83,7 @@ return array(
     'list'                => '列表',
     'close'               => '关闭',
     'open'                => '打开',
+    'Dashboard'           => '仪表盘',
     'managearea'          => '管理中心',
     'delete'              => '删除',
     'Deleted'             => '已删除',
diff --git a/src/public/views/common/header.php b/src/public/views/common/header.php
index 7b6b950..350ae9c 100755
--- a/src/public/views/common/header.php
+++ b/src/public/views/common/header.php
@@ -26,6 +26,7 @@ if (!defined('IN_CRONLITE')) {
     <link href="assets/image/favicon.ico?_=<?php echo $static_release; ?>" rel="icon" />
     <link href="assets/bootstrap/css/bootstrap.min.css?_=<?php echo $static_release; ?>" rel="stylesheet" />
     <link href="assets/css/font-awesome.min.css" rel="stylesheet" />
+    <link href="<?php echo $site_url; ?>/assets/theme.switcher/css/auto.css" id="theme" type="text/css" rel="stylesheet" media="screen,projection" />
     <link href="assets/css/common.css?_=<?php echo $static_release; ?>" rel="stylesheet" />
     <!--[if lt IE 9]>
     <script src="assets/html5shiv/html5shiv.min.js?_=<?php echo $static_release; ?>"></script>
@@ -36,6 +37,7 @@ if (!defined('IN_CRONLITE')) {
         var cur_lang = "<?php echo $lang->language_current; ?>";
         var ifastnet_aff = <?php echo $ifastnet_aff; ?>;
     </script>
+    <script src="<?php echo $site_url; ?>/assets/theme.switcher/theme.switcher.js" type="text/javascript"></script>
 </head>
 
 <body>
\ No newline at end of file
diff --git a/src/public/views/common/navbar.php b/src/public/views/common/navbar.php
index ac32dac..1f5cf74 100755
--- a/src/public/views/common/navbar.php
+++ b/src/public/views/common/navbar.php
@@ -43,6 +43,14 @@ if (!defined('IN_CRONLITE')) {
                     <li><a href="<?php echo setRouter('login');?>"><?php echo $lang->I18N('login'); ?></a></li>
                     <li><a href="<?php echo setRouter('register');?>"><?php echo $lang->I18N('register'); ?></a></li>
                     <li><a href="clientarea/index.php"><?php echo $lang->I18N('clientarea'); ?></a></li>
+                    <li>
+                        <a href="#" aria-hidden="true"><i id="theme-selector"></i></a>
+                        <script type="text/javascript">
+                            var sel = document.getElementById('theme-selector');
+                            sel.className = getThemeClasses(getTheme());
+                            sel.onclick = themeSelectorClicked;
+                        </script>
+                    </li>
                 </ul>
             </div>
         </div>