diff --git a/src/definitions/collections/grid.less b/src/definitions/collections/grid.less
index 37c5f0977..5ea9f5f75 100755
--- a/src/definitions/collections/grid.less
+++ b/src/definitions/collections/grid.less
@@ -873,64 +873,64 @@
     padding-bottom: (@rowSpacing / 2) !important;
     margin: 0em;
   }
-  .ui[class*="two column"].doubling.grid > .row > .column,
-  .ui[class*="two column"].doubling.grid > .column,
-  .ui.grid > [class*="two column"].doubling.row > .column {
+  .ui[class*="two column"].doubling:not(.stackable).grid > .row > .column,
+  .ui[class*="two column"].doubling:not(.stackable).grid > .column,
+  .ui.grid > [class*="two column"].doubling:not(.stackable).row > .column {
     width: @oneColumn !important;
   }
-  .ui[class*="three column"].doubling.grid > .row > .column,
-  .ui[class*="three column"].doubling.grid > .column,
-  .ui.grid > [class*="three column"].doubling.row > .column {
+  .ui[class*="three column"].doubling:not(.stackable).grid > .row > .column,
+  .ui[class*="three column"].doubling:not(.stackable).grid > .column,
+  .ui.grid > [class*="three column"].doubling:not(.stackable).row > .column {
     width: @twoColumn !important;
   }
-  .ui[class*="four column"].doubling.grid > .row > .column,
-  .ui[class*="four column"].doubling.grid > .column,
-  .ui.grid > [class*="four column"].doubling.row > .column {
+  .ui[class*="four column"].doubling:not(.stackable).grid > .row > .column,
+  .ui[class*="four column"].doubling:not(.stackable).grid > .column,
+  .ui.grid > [class*="four column"].doubling:not(.stackable).row > .column {
     width: @twoColumn !important;
   }
-  .ui[class*="five column"].doubling.grid > .row > .column,
-  .ui[class*="five column"].doubling.grid > .column,
-  .ui.grid > [class*="five column"].doubling.row > .column {
+  .ui[class*="five column"].doubling:not(.stackable).grid > .row > .column,
+  .ui[class*="five column"].doubling:not(.stackable).grid > .column,
+  .ui.grid > [class*="five column"].doubling:not(.stackable).row > .column {
     width: @twoColumn !important;
   }
-  .ui[class*="six column"].doubling.grid > .row > .column,
-  .ui[class*="six column"].doubling.grid > .column,
-  .ui.grid > [class*="six column"].doubling.row > .column {
+  .ui[class*="six column"].doubling:not(.stackable).grid > .row > .column,
+  .ui[class*="six column"].doubling:not(.stackable).grid > .column,
+  .ui.grid > [class*="six column"].doubling:not(.stackable).row > .column {
     width: @twoColumn !important;
   }
-  .ui[class*="seven column"].doubling.grid > .row > .column,
-  .ui[class*="seven column"].doubling.grid > .column,
-  .ui.grid > [class*="seven column"].doubling.row > .column {
+  .ui[class*="seven column"].doubling:not(.stackable).grid > .row > .column,
+  .ui[class*="seven column"].doubling:not(.stackable).grid > .column,
+  .ui.grid > [class*="seven column"].doubling:not(.stackable).row > .column {
     width: @threeColumn !important;
   }
-  .ui[class*="eight column"].doubling.grid > .row > .column,
-  .ui[class*="eight column"].doubling.grid > .column,
-  .ui.grid > [class*="eight column"].doubling.row > .column {
+  .ui[class*="eight column"].doubling:not(.stackable).grid > .row > .column,
+  .ui[class*="eight column"].doubling:not(.stackable).grid > .column,
+  .ui.grid > [class*="eight column"].doubling:not(.stackable).row > .column {
     width: @threeColumn !important;
   }
-  .ui[class*="nine column"].doubling.grid > .row > .column,
-  .ui[class*="nine column"].doubling.grid > .column,
-  .ui.grid > [class*="nine column"].doubling.row > .column {
+  .ui[class*="nine column"].doubling:not(.stackable).grid > .row > .column,
+  .ui[class*="nine column"].doubling:not(.stackable).grid > .column,
+  .ui.grid > [class*="nine column"].doubling:not(.stackable).row > .column {
     width: @threeColumn !important;
   }
-  .ui[class*="ten column"].doubling.grid > .row > .column,
-  .ui[class*="ten column"].doubling.grid > .column,
-  .ui.grid > [class*="ten column"].doubling.row > .column {
+  .ui[class*="ten column"].doubling:not(.stackable).grid > .row > .column,
+  .ui[class*="ten column"].doubling:not(.stackable).grid > .column,
+  .ui.grid > [class*="ten column"].doubling:not(.stackable).row > .column {
     width: @threeColumn !important;
   }
-  .ui[class*="twelve column"].doubling.grid > .row > .column,
-  .ui[class*="twelve column"].doubling.grid > .column,
-  .ui.grid > [class*="twelve column"].doubling.row > .column {
+  .ui[class*="twelve column"].doubling:not(.stackable).grid > .row > .column,
+  .ui[class*="twelve column"].doubling:not(.stackable).grid > .column,
+  .ui.grid > [class*="twelve column"].doubling:not(.stackable).row > .column {
     width: @fourColumn !important;
   }
-  .ui[class*="fourteen column"].doubling.grid > .row > .column,
-  .ui[class*="fourteen column"].doubling.grid > .column,
-  .ui.grid > [class*="fourteen column"].doubling.row > .column {
+  .ui[class*="fourteen column"].doubling:not(.stackable).grid > .row > .column,
+  .ui[class*="fourteen column"].doubling:not(.stackable).grid > .column,
+  .ui.grid > [class*="fourteen column"].doubling:not(.stackable).row > .column {
     width: @fourColumn !important;
   }
-  .ui[class*="sixteen column"].doubling.grid > .row > .column,
-  .ui[class*="sixteen column"].doubling.grid > .column,
-  .ui.grid > [class*="sixteen column"].doubling.row > .column {
+  .ui[class*="sixteen column"].doubling:not(.stackable).grid > .row > .column,
+  .ui[class*="sixteen column"].doubling:not(.stackable).grid > .column,
+  .ui.grid > [class*="sixteen column"].doubling:not(.stackable).row > .column {
     width: @fourColumn !important;
   }
 }
diff --git a/src/definitions/elements/header.less b/src/definitions/elements/header.less
index 4c26921aa..dc928989a 100755
--- a/src/definitions/elements/header.less
+++ b/src/definitions/elements/header.less
@@ -144,7 +144,7 @@ h5.ui.header {
 --------------------*/
 
 .ui.icon.header {
-  display: inline-block;
+  display: block;
   text-align: center;
 }
 .ui.icon.header .icon {
@@ -199,56 +199,56 @@ a.ui.black.header:hover {
 }
 
 .ui.blue.header {
-  color: @blueHeaderColor !important;
+  color: @blue !important;
 }
 a.ui.blue.header:hover {
   color: @blueHover !important;
 }
 
 .ui.green.header {
-  color: @greenHeaderColor !important;
+  color: @green !important;
 }
 a.ui.green.header:hover {
   color: @greenHover !important;
 }
 
 .ui.orange.header {
-  color: @orangeHeaderColor !important;
+  color: @orange !important;
 }
 a.ui.orange.header:hover {
   color: @orangeHover !important;
 }
 
 .ui.pink.header {
-  color: @pinkHeaderColor !important;
+  color: @pink !important;
 }
 a.ui.pink.header:hover {
   color: @pinkHover !important;
 }
 
 .ui.purple.header {
-  color: @purpleHeaderColor !important;
+  color: @purple !important;
 }
 a.ui.purple.header:hover {
   color: @purpleHover !important;
 }
 
 .ui.red.header {
-  color: @redHeaderColor !important;
+  color: @red !important;
 }
 a.ui.red.header:hover {
   color: @redHover !important;
 }
 
 .ui.teal.header {
-  color: @tealHeaderColor !important;
+  color: @teal !important;
 }
 a.ui.teal.header:hover {
   color: @tealHover !important;
 }
 
 .ui.yellow.header {
-  color: @yellowHeaderColor !important;
+  color: @yellow !important;
 }
 a.ui.yellow.header:hover {
   color: @yellowHover !important;
diff --git a/src/definitions/elements/input.less b/src/definitions/elements/input.less
index 381f83380..5ab640c7e 100755
--- a/src/definitions/elements/input.less
+++ b/src/definitions/elements/input.less
@@ -37,6 +37,7 @@
   margin: 0em;
   width: 100%;
   outline: none;
+  text-align: @textAlign;
   line-height: @lineHeight;
 
   font-family: @pageFont;
diff --git a/src/definitions/modules/dropdown.less b/src/definitions/modules/dropdown.less
index 2b19ed77f..b1c7810ad 100755
--- a/src/definitions/modules/dropdown.less
+++ b/src/definitions/modules/dropdown.less
@@ -31,6 +31,7 @@
   transition: @transition;
   tap-highlight-color: rgba(0, 0, 0, 0);
   outline: none;
+  text-align: left;
 }
 
 
diff --git a/src/themes/packages/default/elements/icon.overrides b/src/themes/packages/default/elements/icon.overrides
index d5425bddf..51f073ead 100755
--- a/src/themes/packages/default/elements/icon.overrides
+++ b/src/themes/packages/default/elements/icon.overrides
@@ -533,7 +533,6 @@ i.icon.wechat:before { content: "\f1d7"; }
 i.icon.like:before { content: "\f004"; }
 i.icon.favorite:before { content: "\f005"; }
 i.icon.video:before { content: "\f008"; }
-i.icon.sidebar:before { content: "\f00b"; }
 i.icon.check:before { content: "\f00c"; }
 i.icon.remove:before { content: "\f00d"; }
 i.icon.close:before { content: "\f00d"; }
@@ -598,6 +597,7 @@ i.icon.wrench:before { content: "\f0ad"; }
 i.icon.briefcase:before { content: "\f0b1"; }
 i.icon.group:before { content: "\f0c0"; }
 i.icon.flask:before { content: "\f0c3"; }
+i.icon.sidebar:before { content: "\f0c9"; }
 i.icon.bars:before { content: "\f0c9"; }
 i.icon.list.ul:before { content: "\f0ca"; }
 i.icon.list.ol:before { content: "\f0cb"; }
diff --git a/src/themes/packages/default/elements/input.variables b/src/themes/packages/default/elements/input.variables
index e51adb21f..96875783f 100755
--- a/src/themes/packages/default/elements/input.variables
+++ b/src/themes/packages/default/elements/input.variables
@@ -13,6 +13,7 @@
 @lineHeight: 1.2em;
 @padding: (@verticalPadding - @lineHeightOffset) @horizontalPadding;
 
+@textAlign: left;
 @background: #FFFFFF;
 @borderWidth: 1px;
 @border: @borderWidth solid rgba(0, 0, 0, 0.15);
diff --git a/src/themes/packages/default/globals/site.variables b/src/themes/packages/default/globals/site.variables
index 5d9d8f06b..ae3ae433b 100755
--- a/src/themes/packages/default/globals/site.variables
+++ b/src/themes/packages/default/globals/site.variables
@@ -302,7 +302,7 @@
 
 @circularRadius                : 500rem;
 
-@borderColor                   : rgba(0, 0, 0, 0.1);
+@borderColor                   : rgba(0, 0, 0, 0.15);
 @selectedBorderColor           : rgba(0, 0, 0, 0.2);
 
 @solidBorderColor              : #DDDDDD;