diff --git a/following.html b/following.html
index 94b528c..990d506 100644
--- a/following.html
+++ b/following.html
@@ -40,13 +40,13 @@
   <!-- MENU SUPERIOR INIT --> 
   <nav class="userMenu">
     <ul>
-      <li class="userMenu-home"><a href="home.html">Home</a></li>
-      <li class="userMenu-network"><a href="network.html">Network</a></li>
-      <li class="userMenu-profile"><a href="profile-edit.html">Profile</a></li>
+      <li class="userMenu-home"><a href="home.html"><span class="selectable_theme theme_original label">Home</span></a></li>
+      <li class="userMenu-network selectable_theme theme_original"><a class="label" href="network.html">Network</a></li>
+      <li class="userMenu-profile selectable_theme theme_original"><a class="label" href="profile-edit.html">Profile</a></li>
       <li class="userMenu-config current">
         <a class="userMenu-config-dropdown" href="#">
           <div class="config-menu dialog-modal">
-            <div class="mini-profile-info">
+            <div class="mini-profile-info selectable_theme theme_original">
               <div class="mini-profile-photo"><img src="img/grayed_avatar_placeholder_24.png" alt="user-photo"/></div>
               <a href="#" class="mini-profile-name">Fulano da Silva</a>
               <span class="mini-profile-view">View</span>
@@ -56,20 +56,21 @@
             <a class="dropdown-menu-item" href="following.html">Following users</a>
             <a class="dropdown-menu-item" href="network.html">Network config</a>
             <a class="dropdown-menu-item" href="login.html">Change user</a>
-            <a class="direct-messages" href="#">Direct Messages</a>
+            <a class="direct-messages selectable_theme theme_original" href="#">Direct Messages</a>
           </div>
         </a>
       </li>
       <li class="userMenu-connections">
         <a href="#">
-          <span class="messages-qtd" style="display:none;">12</span>
+          <span class="messages-qtd" style="display:none;">0</span>
         </a>
       </li>
       <li class="userMenu-messages">
         <a href="#">
-          <span class="messages-qtd" style="display:none;">12</span>
+          <span class="messages-qtd" style="display:none;">0</span>
         </a>
       </li>
+      <li class="userMenu-dhtindicator selectable_theme theme_calm"><a href="network.html"></a></li>
 
       <!-- BUSCA -->
       <li class="userMenu-search">
diff --git a/home.html b/home.html
index 27106f8..90b72c6 100644
--- a/home.html
+++ b/home.html
@@ -39,37 +39,38 @@
   <!-- MENU SUPERIOR INIT --> 
   <nav class="userMenu">
     <ul>
-      <li class="userMenu-home current"><a href="#">Home</a></li>
-      <li class="userMenu-network"><a href="network.html">Network</a></li>
-      <li class="userMenu-profile"><a href="profile-edit.html">Profile</a></li>
+      <li class="userMenu-home current"><a href="home.html"><span class="selectable_theme theme_original label">Home</span></a></li>
+      <li class="userMenu-network selectable_theme theme_original"><a class="label" href="network.html">Network</a></li>
+      <li class="userMenu-profile selectable_theme theme_original"><a class="label" href="profile-edit.html">Profile</a></li>
       <li class="userMenu-config">
         <a class="userMenu-config-dropdown" href="#">
           <div class="config-menu dialog-modal">
-            <div class="mini-profile-info">
+            <div class="mini-profile-info selectable_theme theme_original">
               <div class="mini-profile-photo"><img src="img/grayed_avatar_placeholder_24.png" alt="user-photo"/></div>
               <a href="#" class="mini-profile-name">Fulano da Silva</a>
               <span class="mini-profile-view">View</span>
             </div>
             <a class="dropdown-menu-item" href="options.html">Options</a>
+            <a class="dropdown-menu-item" href="network.html">Network config</a>
             <a class="dropdown-menu-item" href="profile-edit.html">Setup account</a>
             <a class="dropdown-menu-item dropdown-menu-following" href="following.html">Following users</a>
-            <a class="dropdown-menu-item" href="network.html">Network config</a>
             <a class="dropdown-menu-item" href="login.html">Change user</a>
-            <a class="dropdown-menu-item promoted-posts-only" href="#">Switch to Promoted posts</a>
-            <a class="direct-messages dropdown-menu-item" href="#">Direct Messages</a>
+            <a class="dropdown-menu-item promoted-posts-only selectable_theme theme_original" href="#">Switch to Promoted posts</a>
+            <a class="direct-messages dropdown-menu-item selectable_theme theme_original" href="#">Direct Messages</a>
           </div>
         </a>
       </li>
       <li class="userMenu-connections">
         <a href="#">
-          <span class="messages-qtd" style="display:none;">12</span>
+          <span class="messages-qtd" style="display:none;">0</span>
         </a>
       </li>
       <li class="userMenu-messages">
         <a href="#">
-          <span class="messages-qtd" style="display:none;">12</span>
+          <span class="messages-qtd" style="display:none;">0</span>
         </a>
       </li>
+      <li class="userMenu-dhtindicator selectable_theme theme_calm"><a href="network.html"></a></li>
 
       <!-- BUSCA -->
       <li class="userMenu-search">
diff --git a/js/interface_common.js b/js/interface_common.js
index b905424..4e1c8f9 100644
--- a/js/interface_common.js
+++ b/js/interface_common.js
@@ -981,16 +981,15 @@ function changeStyle() {
     {
         style = 'css/style.css';
         profile = 'css/profile.css';
-        menu = '.original_menu';
-        $(".userMenu-dhtindicator").hide();
     }else
     {
         style = 'theme_calm/css/style.css';
         profile = 'theme_calm/css/profile.css';
-        menu = '.calm_menu';
     }
     $('#stylecss').attr('href', style);
     $('#profilecss').attr('href', profile);
+    $("<style type='text/css'> .selectable_theme{display:none!important;}\n" +
+       ".theme_" + theme + "{display:block!important;}</style>").appendTo("head");
     setTimeout(function(){$(menu).removeAttr('style')}, 0);
 }
 
diff --git a/js/interface_localization.js b/js/interface_localization.js
index 4a6ee58..0221175 100644
--- a/js/interface_localization.js
+++ b/js/interface_localization.js
@@ -1829,7 +1829,6 @@ var fixedLabels = [
 
   // navbar and home
   "button",
-  ".userMenu > ul > li > a",
   ".postboard-news",
   ".post-area-new textarea",
   ".refresh-users, .view-all-users",
diff --git a/login.html b/login.html
index 9b23066..cb270f9 100644
--- a/login.html
+++ b/login.html
@@ -35,9 +35,9 @@
   <!-- MENU SUPERIOR INIT --> 
   <nav class="userMenu">
     <ul>
-    <li class="userMenu-home"><a href="home.html">Home</a></li>
-    <li class="userMenu-network"><a href="network.html">Network</a></li>
-    <li class="userMenu-profile current"><a href="login.html">Login</a></li>
+    <li class="userMenu-home"><a href="home.html"><span class="selectable_theme theme_original label">Home</span></a></li>
+    <li class="userMenu-network selectable_theme theme_original"><a class="label" href="network.html">Network</a></li>
+    <li class="userMenu-profile current"><a class="label" href="login.html">Login</a></li>
       <li class="userMenu-config">
       </li>
       
diff --git a/network.html b/network.html
index d82c939..d562c33 100644
--- a/network.html
+++ b/network.html
@@ -37,13 +37,13 @@
   <!-- MENU SUPERIOR INIT --> 
   <nav class="userMenu">
     <ul>
-        <li class="userMenu-home"><a href="home.html">Home</a></li>
-        <li class="userMenu-network current"><a href="network.html">Network</a></li>
-        <li class="userMenu-profile"><a href="profile-edit.html">Profile</a></li>
+        <li class="userMenu-home"><a href="home.html"><span class="selectable_theme theme_original label">Home</span></a></li>
+        <li class="userMenu-network current selectable_theme theme_original"><a class="label" href="network.html">Network</a></li>
+        <li class="userMenu-profile selectable_theme theme_original"><a class="label" href="profile-edit.html">Profile</a></li>
         <li class="userMenu-config">
           <a class="userMenu-config-dropdown" href="#">
             <div class="config-menu dialog-modal">
-              <div class="mini-profile-info">
+              <div class="mini-profile-info selectable_theme theme_original">
                 <div class="mini-profile-photo"><img src="img/grayed_avatar_placeholder_24.png" alt="user-photo"/></div>
                 <a href="#" class="mini-profile-name">Fulano da Silva</a>
                 <span class="mini-profile-view">View</span>
@@ -53,20 +53,10 @@
               <a class="dropdown-menu-item" href="following.html">Following users</a>
               <a class="dropdown-menu-item" href="network.html">Network config</a>
               <a class="dropdown-menu-item" href="login.html">Change user</a>
-              <a class="direct-messages" href="#">Direct Messages</a>
            </div>
           </a>
         </li>
-        <li class="userMenu-connections">
-          <a href="#">
-            <span class="messages-qtd" style="display:none;">12</span>
-          </a>
-        </li>
-        <li class="userMenu-messages">
-          <a href="#">
-            <span class="messages-qtd" style="display:none;">12</span>
-          </a>
-        </li>
+        <li class="userMenu-dhtindicator selectable_theme theme_calm"><a href="network.html"></a></li>
         <li class="userMenu-search">
           <input type="text" class="userMenu-search-field" placeholder="search"/>
         </li>
diff --git a/options.html b/options.html
index 1cd09a1..24b5209 100644
--- a/options.html
+++ b/options.html
@@ -30,8 +30,8 @@
   <!-- MENU SUPERIOR INIT --> 
   <nav class="userMenu">
     <ul>
-    <li class="userMenu-home"><a href="home.html"></a></li>
-    <li class="userMenu-options current"><a href="options.html">Options</a></li>
+    <li class="userMenu-home"><a href="home.html"><span class="selectable_theme theme_original label">Home</span></a></li>
+    <li class="userMenu-options current"><a class="label" href="options.html">Options</a></li>
       <li class="userMenu-config">
         <a class="userMenu-config-dropdown" href="#">
           <div class="config-menu dialog-modal">
@@ -83,7 +83,7 @@
                 <option value="calm">Calm</option>
               </select>
             </form>
-            <span class="calm_menu" style="display:none">
+            <span class="selectable_theme theme_calm">
                 For new features check <a href="https://github.com/iHedgehog/twister-calm">twister-calm repository</a>!
             </span>
         </div>
diff --git a/profile-edit.html b/profile-edit.html
index befa534..b6414e8 100644
--- a/profile-edit.html
+++ b/profile-edit.html
@@ -37,13 +37,13 @@
   <!-- MENU SUPERIOR INIT --> 
   <nav class="userMenu">
     <ul>
-      <li class="userMenu-home"><a href="home.html">Home</a></li>
-      <li class="userMenu-network"><a href="network.html">Network</a></li>
-      <li class="userMenu-profile current"><a href="profile-edit.html">Profile</a></li>
+      <li class="userMenu-home"><a href="home.html"><span class="selectable_theme theme_original label">Home</span></a></li>
+      <li class="userMenu-network selectable_theme theme_original"><a class="label" href="network.html">Network</a></li>
+      <li class="userMenu-profile current selectable_theme theme_original"><a class="label" href="profile-edit.html">Profile</a></li>
       <li class="userMenu-config">
         <a class="userMenu-config-dropdown" href="#">
           <div class="config-menu dialog-modal">
-            <div class="mini-profile-info">
+            <div class="mini-profile-info selectable_theme theme_original">
               <div class="mini-profile-photo"><img src="img/grayed_avatar_placeholder_24.png" alt="user-photo"/></div>
               <a href="#" class="mini-profile-name">Fulano da Silva</a>
               <span class="mini-profile-view">View</span>
@@ -53,20 +53,10 @@
             <a class="dropdown-menu-item" href="following.html">Following users</a>
             <a class="dropdown-menu-item" href="network.html">Network config</a>
             <a class="dropdown-menu-item" href="login.html">Change user</a>
-            <a class="direct-messages" href="#">Direct Messages</a>
           </div>
         </a>
       </li>
-      <li class="userMenu-connections">
-        <a href="#">
-          <span class="messages-qtd" style="display:none;">12</span>
-        </a>
-      </li>
-      <li class="userMenu-messages">
-        <a href="#">
-          <span class="messages-qtd" style="display:none;">12</span>
-        </a>
-      </li>
+      <li class="userMenu-dhtindicator selectable_theme theme_calm"><a href="network.html"></a></li>
       <li class="userMenu-search">
         <input type="text" class="userMenu-search-field" placeholder="search">
       </li>