diff --git a/src/assets/scss/themes/light/theme.scss b/src/assets/scss/themes/light/theme.scss
index 31caef7..f1fe393 100644
--- a/src/assets/scss/themes/light/theme.scss
+++ b/src/assets/scss/themes/light/theme.scss
@@ -5,7 +5,7 @@ $disabledOpacity: 0.35;
 
 //Header
 $headerBorderWidth: 1px;
-$headerBorderColor: #d9d9d9;
+$headerBorderColor: #d9d9d9; //d9d9d9
 $headerBgColor: #f6f7f9;
 $headerTextColor: #1b1d1f;
 $headerFontWeight: normal;
@@ -29,9 +29,9 @@ $stateActiveBgColor: #d6d6d6;
 $stateActiveTextColor: #212121;
 
 //Highlight State
-$stateHighlightBorderColor: #156090;
-$stateHighlightBgColor: #186ba0;
-$stateHighlightTextColor: #FFFFFF;
+$stateHighlightBorderColor: #156090; //156090
+$stateHighlightBgColor: #186ba0; //186ba0
+$stateHighlightTextColor: #FFFFFF;//FFFFFF
 
 //Focus State
 $stateFocusBorderColor: #c0c0c0;
@@ -145,9 +145,9 @@ $inputGroupTextColor: #222222;
 }
 
 .ui-spinner:not(.ui-state-disabled) .ui-spinner-button:enabled:active {
-    border: 1px solid #156090;
-    background: #186ba0;
-    color: #ffffff;
+    border: 1px solid $stateHighlightBorderColor;
+    background: $stateHighlightBgColor;
+    color: $stateHighlightTextColor;
 }
 
 .ui-slider { position: relative; text-align: left; background: #838688; border: none; -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.6) inset; -moz-box-shadow: 0 1px 3px rgba(0,0,0,0.6) inset; box-shadow: 0 1px 3px rgba(0,0,0,0.6) inset;}
@@ -211,9 +211,9 @@ $inputGroupTextColor: #222222;
     }
 
     &:enabled:active {
-        border: 1px solid #156090;
-    	background: #186ba0;
-        color: #ffffff;
+        border: 1px solid $stateHighlightBorderColor;
+    	background: $stateHighlightBgColor;
+        color: $stateHighlightTextColor;
     }
 }
 
@@ -252,17 +252,17 @@ $inputGroupTextColor: #222222;
 }
 
 .ui-fileupload-choose:not(.ui-state-disabled):active {
-    border: 1px solid #156090;
-    background: #186ba0;
-    color: #ffffff;
+    border: 1px solid $stateHighlightBorderColor;
+    background: $stateHighlightBgColor;
+    color: $stateHighlightTextColor;
 }
 
 /* Checkbox and Radio */
 .ui-chkbox-box.ui-state-active,
 .ui-radiobutton-box.ui-state-active {
-    border: 1px solid #156090;
-    background: #186ba0;
-    color: #FFFFFF;
+    border: 1px solid $stateHighlightBorderColor;
+    background: $stateHighlightBgColor;
+    color: $stateHighlightTextColor;
 }
 
 .ui-chkbox-box.ui-state-focus,
@@ -273,7 +273,7 @@ $inputGroupTextColor: #222222;
 }
 
 .ui-chkbox-box.ui-state-focus.ui-state-active {
-    background: #186ba0;
+    background: $stateHighlightBgColor;
 }
 
 /* Inputs */
@@ -303,9 +303,9 @@ $inputGroupTextColor: #222222;
 }
 
 .ui-paginator .ui-paginator-page.ui-state-active {
-	background: #186ba0;
-	color: #ffffff;
-	border-color: #156090;
+	background: $stateHighlightBgColor;
+	color: $stateHighlightTextColor;
+	border-color: $stateHighlightBorderColor;
 }
 
 /* DataTable  */
@@ -313,23 +313,23 @@ $inputGroupTextColor: #222222;
     th {
         &.ui-state-default {
             background: #ebedf0;
-            border-color: #d9d9d9;
+            border-color: $headerBorderColor;
         }
 
         &.ui-sortable-column:not(.ui-state-active):hover {
             background: #d3d5d8;
-            border-color: #d9d9d9;
+            border-color: $headerBorderColor;
         }
 
         &.ui-state-active {
-            background: #186ba0;
+            background: $stateHighlightBgColor;
             color: #ffffff;
         }
     }
 
     tbody {
         > tr.ui-widget-content {
-            border-color: #d9d9d9;
+            border-color: $headerBorderColor;
 
             &.ui-datatable-odd {
                 background-color: #fafafb;
@@ -346,7 +346,7 @@ $inputGroupTextColor: #222222;
         td {
             &.ui-state-default {
                 background: #ebedf0;
-                border-color: #d9d9d9;
+                border-color: $headerBorderColor;
             }
         }
     }
@@ -357,12 +357,12 @@ $inputGroupTextColor: #222222;
     .ui-table-thead > tr > th,
     .ui-table-tfoot > tr > td {
         background-color: #ebedf0;
-        border-color: #d9d9d9;
+        border-color: $headerBorderColor;
     }
 
     .ui-sortable-column:not(.ui-state-highlight):hover {
         background-color: #d3d5d8;
-        border-color: #d9d9d9;
+        border-color: $headerBorderColor;
     }
 
     .ui-table-tbody > tr:nth-child(even) {
@@ -385,12 +385,12 @@ $inputGroupTextColor: #222222;
     .ui-treetable-thead > tr > th,
     .ui-treetable-tfoot > tr > td {
         background-color: #ebedf0;
-        border-color: #d9d9d9;
+        border-color: $headerBorderColor;
     }
 
     .ui-sortable-column:not(.ui-state-highlight):hover {
         background-color: #d3d5d8;
-        border-color: #d9d9d9;
+        border-color: $headerBorderColor;
     }
 }
 
@@ -422,7 +422,7 @@ $inputGroupTextColor: #222222;
 .ui-treetable {
     th.ui-state-default {
         background: #ebedf0;
-        border-color: #d9d9d9;
+        border-color: $headerBorderColor;
     }
 }
 
@@ -453,9 +453,9 @@ $inputGroupTextColor: #222222;
 
 .ui-togglebutton.ui-button.ui-state-active,
 .ui-selectbutton .ui-button.ui-state-active {
-   border: 1px solid #156090;
-   background: #186ba0;
-   color: #FFFFFF;
+   border: 1px solid $stateHighlightBorderColor;
+   background: $stateHighlightBgColor;
+   color: $stateHighlightTextColor;
 }
 
 .ui-multiselect {
@@ -558,9 +558,9 @@ $inputGroupTextColor: #222222;
 /* PanelMenu */
 .ui-panelmenu .ui-panelmenu-header.ui-state-active,
 .ui-panelmenu .ui-panelmenu-header.ui-state-active a {
-    border-color: #156090;
-    background: #186ba0;
-    color: #FFFFFF;
+    border-color: $stateHighlightBorderColor;
+    background: $stateHighlightBgColor;
+    color: $stateHighlightTextColor;
 }
 
 /* DatePicker */
@@ -599,7 +599,7 @@ $inputGroupTextColor: #222222;
                 }
 
                 &.ui-state-active {
-                    background-color: #186ba0;
+                    background-color: $stateHighlightBgColor;
                     color: #ffffff;
                 }
             }
@@ -612,7 +612,7 @@ $inputGroupTextColor: #222222;
 
     .ui-monthpicker {
         a.ui-state-active {
-            background-color: #186ba0;
+            background-color: $stateHighlightBgColor;
             color: #ffffff;
         }
     }
@@ -655,9 +655,9 @@ $inputGroupTextColor: #222222;
 .fc {
     .fc-button-group {
         .ui-state-active {
-            border: 1px solid #156090;
-            background: #186ba0;
-            color: #ffffff;
+            border: 1px solid $stateHighlightBorderColor;
+            background: $stateHighlightBgColor;
+            color: $stateHighlightTextColor;
         }
     }
 }
\ No newline at end of file
diff --git a/src/commons/component/nic-dropdown.component.scss b/src/commons/component/nic-dropdown.component.scss
index e69de29..2ca159a 100644
--- a/src/commons/component/nic-dropdown.component.scss
+++ b/src/commons/component/nic-dropdown.component.scss
@@ -0,0 +1,10 @@
+#nic-list-border .ui-widget-content {
+  border: 0px;
+}
+
+#nic-list-border .ui-listbox .ui-listbox-list {
+  line-height: 2em;
+}
+#nic-list-border .ui-listbox .ui-listbox-item {
+  padding: 0.5em;
+}
\ No newline at end of file