diff --git a/rhodecode/public/css/code-block.less b/rhodecode/public/css/code-block.less
--- a/rhodecode/public/css/code-block.less
+++ b/rhodecode/public/css/code-block.less
@@ -79,6 +79,7 @@ div.diffblock {
                 min-width: 5em;
                 margin: 0;
                 padding: @button-padding @button-padding @button-padding 0;
+                font-weight: @text-semibold-weight;
                 font-family: @text-semibold;
             }
 
@@ -422,6 +423,7 @@ div.codeblock {
     .author {
         clear: both;
         vertical-align: middle;
+        font-weight: @text-bold-weight;
         font-family: @text-bold;
     }
 
diff --git a/rhodecode/public/css/comments.less b/rhodecode/public/css/comments.less
--- a/rhodecode/public/css/comments.less
+++ b/rhodecode/public/css/comments.less
@@ -62,6 +62,7 @@ tr.inline-comments div {
     line-height: .8em;
 
     font-family: @text-italic;
+    font-style: italic;
     background: #fff none;
     color: @grey4;
     border: 1px solid @grey4;
@@ -72,6 +73,8 @@ tr.inline-comments div {
 
     &.todo {
         color: @color5;
+        font-style: italic;
+        font-weight: @text-bold-italic-weight;
         font-family: @text-bold-italic;
     }
 
@@ -92,6 +95,7 @@ tr.inline-comments div {
         color: @color1;
         margin: 2px 8px;
         font-family: @text-italic;
+        font-style: italic;
     }
 }
 
diff --git a/rhodecode/public/css/diff.less b/rhodecode/public/css/diff.less
--- a/rhodecode/public/css/diff.less
+++ b/rhodecode/public/css/diff.less
@@ -95,6 +95,7 @@ div.diffblock.margined.comm tr {
 
     .compare-label {
         clear: both;
+        font-weight: @text-semibold-weight;
         font-family: @text-semibold;
     }
 }
diff --git a/rhodecode/public/css/main.less b/rhodecode/public/css/main.less
--- a/rhodecode/public/css/main.less
+++ b/rhodecode/public/css/main.less
@@ -29,16 +29,17 @@
 
 //--- BASE ------------------//
 .noscript-error {
-    top: 0;
-    left: 0;
-    width: 100%;
-    z-index: 101;
-    text-align: center;
-    font-family: @text-semibold;
-    font-size: 120%;
-    color: white;
-    background-color: @alert2;
-    padding: 5px 0 5px 0;
+  top: 0;
+  left: 0;
+  width: 100%;
+  z-index: 101;
+  text-align: center;
+  font-size: 120%;
+  color: white;
+  background-color: @alert2;
+  padding: 5px 0 5px 0;
+  font-weight: @text-semibold-weight;
+  font-family: @text-semibold;
 }
 
 html {
@@ -160,8 +161,9 @@ input.inline[type="file"] {
     }
 
     .error-branding {
-        font-family: @text-semibold;
-        color: @grey4;
+      color: @grey4;
+      font-weight: @text-semibold-weight;
+      font-family: @text-semibold;
     }
 
     .error_message {
@@ -213,8 +215,9 @@ input.inline[type="file"] {
         }
 
         h4 {
-            margin: 0 0 @padding;
-            font-family: @text-semibold;
+          margin: 0 0 @padding;
+          font-weight: @text-semibold-weight;
+          font-family: @text-semibold;
         }
     }
 }
@@ -348,10 +351,11 @@ ul.auth_plugins {
 // Pull Requests
 
 .pullrequests_section_head {
-	display: block;
-	clear: both;
-	margin: @padding 0;
-	font-family: @text-bold;
+  display: block;
+  clear: both;
+  margin: @padding 0;
+  font-weight: @text-bold-weight;
+  font-family: @text-bold;
 }
 
 .pr-origininfo, .pr-targetinfo {
@@ -390,14 +394,15 @@ ul.auth_plugins {
 
 
 #pr-title-input {
-    width: 72%;
-    font-size: 1em;
-    font-family: @text-bold;
-    margin: 0;
-    padding: 0 0 0 @padding/4;
-    line-height: 1.7em;
-    color: @text-color;
-    letter-spacing: .02em;
+  width: 72%;
+  font-size: 1em;
+  margin: 0;
+  padding: 0 0 0 @padding/4;
+  line-height: 1.7em;
+  color: @text-color;
+  letter-spacing: .02em;
+  font-weight: @text-bold-weight;
+  font-family: @text-bold;
 }
 
 #pullrequest_title {
@@ -470,19 +475,20 @@ ul.auth_plugins {
 
 // Server Announcement
 #server-announcement {
-    width: 95%;
-    margin: @padding auto;
-    padding: @padding;
-    border-width: 2px;
-    border-style: solid;
-    .border-radius(2px);
-    font-family: @text-bold;
-
-    &.info    { border-color: @alert4; background-color: @alert4-inner; }
-    &.warning { border-color: @alert3; background-color: @alert3-inner; }
-    &.error   { border-color: @alert2; background-color: @alert2-inner; }
-    &.success { border-color: @alert1; background-color: @alert1-inner; }
-    &.neutral { border-color: @grey3; background-color: @grey6; }
+  width: 95%;
+  margin: @padding auto;
+  padding: @padding;
+  border-width: 2px;
+  border-style: solid;
+  .border-radius(2px);
+  font-weight: @text-bold-weight;
+  font-family: @text-bold;
+
+  &.info    { border-color: @alert4; background-color: @alert4-inner; }
+  &.warning { border-color: @alert3; background-color: @alert3-inner; }
+  &.error   { border-color: @alert2; background-color: @alert2-inner; }
+  &.success { border-color: @alert1; background-color: @alert1-inner; }
+  &.neutral { border-color: @grey3; background-color: @grey6; }
 }
 
 // Fixed Sidebar Column
@@ -2202,9 +2208,10 @@ h3.files_location{
 		margin-left: 0.5em;
 		display: inline-block;
 
-		em{
-			font-family: @text-bold;
-		}
+		em {
+          font-weight: @text-bold-weight;
+          font-family: @text-bold;
+        }
 	}
 }
 
diff --git a/rhodecode/public/css/select2.less b/rhodecode/public/css/select2.less
--- a/rhodecode/public/css/select2.less
+++ b/rhodecode/public/css/select2.less
@@ -198,9 +198,10 @@ select.select2{height:28px;visibility:hi
         &.select2-result-with-children {
 
             .select2-result-label {
-                font-family: @text-semibold;
                 color: @rcdarkblue;
                 cursor: default;
+                font-weight: @text-semibold-weight;
+                font-family: @text-semibold;
             }
 
             ul.select2-result-sub li .select2-result-label {
diff --git a/rhodecode/public/css/summary.less b/rhodecode/public/css/summary.less
--- a/rhodecode/public/css/summary.less
+++ b/rhodecode/public/css/summary.less
@@ -62,6 +62,7 @@
             height: 30px;
             margin: 0;
             padding: 0;
+            font-weight: @text-semibold-weight;
             font-family: @text-semibold;
         }
 
@@ -165,6 +166,7 @@
         width: 25%;
         margin: 0;
         padding: 0;
+        font-weight: @text-semibold-weight;
         font-family: @text-semibold;
     }
 
diff --git a/rhodecode/public/css/tables.less b/rhodecode/public/css/tables.less
--- a/rhodecode/public/css/tables.less
+++ b/rhodecode/public/css/tables.less
@@ -67,6 +67,7 @@ table.dataTable {
 
     th {
         text-align: left;
+        font-weight: @text-semibold-weight;
         font-family: @text-semibold;
     }
 
@@ -322,6 +323,7 @@ table#repo_list_table {
 table.keyboard-mappings {
     th {
         text-align: left;
+        font-weight: @text-semibold-weight;
         font-family: @text-semibold;
     }
 }
diff --git a/rhodecode/public/css/type.less b/rhodecode/public/css/type.less
--- a/rhodecode/public/css/type.less
+++ b/rhodecode/public/css/type.less
@@ -35,12 +35,12 @@ h1, h2, h3, h4, h5, h6,
   }
 }
 
-h1, .h1 { font-size: 1.54em; font-family: @text-bold; }
-h2, .h2 { font-size: 1.23em; font-family: @text-semibold; }
-h3, .h3 { font-size: 1.23em; font-family: @text-regular; }
-h4, .h4 { font-size: 1em;    font-family: @text-bold; }
-h5, .h5 { font-size: 1em;    font-family: @text-bold-italic; }
-h6, .h6 { font-size: 1em;    font-family: @text-bold-italic; }
+h1, .h1 { font-size: 1.54em; font-weight: @text-bold-weight;     font-family: @text-bold; }
+h2, .h2 { font-size: 1.23em; font-weight: @text-semibold-weight; font-family: @text-semibold;  }
+h3, .h3 { font-size: 1.23em;                                     font-family: @text-regular; }
+h4, .h4 { font-size: 1em;    font-weight: @text-bold-weight;     font-family: @text-bold; }
+h5, .h5 { font-size: 1em;    font-weight: @text-bold-weight;     font-family: @text-bold; }
+h6, .h6 { font-size: 1em;    font-weight: @text-bold-weight;     font-family: @text-bold; }
 
 // Breadcrumbs
 .breadcrumbs {
@@ -95,15 +95,19 @@ img {
 }
 
 strong {
+  font-weight: @text-bold-weight;
   font-family: @text-bold;
 }
 
 em {
   font-family: @text-italic;
+  font-style: italic;
 }
 
 strong em,
 em strong {
+  font-style: italic;
+  font-weight: @text-bold-italic-weight;
   font-family: @text-bold-italic;
 }
 
@@ -384,6 +388,7 @@ dd {
 
 dt {
   margin: @textmargin 0 0 0;
+  font-weight: @text-bold-weight;
   font-family: @text-bold;
 }
 
diff --git a/rhodecode/public/css/variables.less b/rhodecode/public/css/variables.less
--- a/rhodecode/public/css/variables.less
+++ b/rhodecode/public/css/variables.less
@@ -57,13 +57,20 @@
 @text-monospace: 'Menlo', 'Liberation Mono', 'Consolas', 'DejaVu Sans Mono', 'Ubuntu Mono', 'Courier New', 'andale mono', 'lucida console', monospace;
 
 @text-italic: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+
 @text-bold: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+@text-bold-weight: 600;
+
 @text-semibold: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+@text-semibold-weight: 500;
+
 @text-bold-italic: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
-@text-code: 'Menlo', 'Liberation Mono', 'Consolas', 'DejaVu Sans Mono', 'Ubuntu Mono', 'Courier New', 'andale mono', 'lucida console', monospace;
+@text-bold-italic-weight: 600;
 
+@text-code: @text-monospace;
 @text-light: @text-regular;
-@text-light-italic: @text-italic;
+
+
 // Used for .close buttons
 @text-bootstrap: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;