diff --git a/package.json b/package.json
index 0a685244db..028784dd4a 100644
--- a/package.json
+++ b/package.json
@@ -6,6 +6,7 @@
     "bower-files": "^3.11.3",
     "browser-sync": "^2.10.0",
     "del": "^2.0.2",
+    "gulp": "^3.9.0",
     "gulp-autoprefixer": "^3.1.0",
     "gulp-concat": "^2.6.0",
     "gulp-concat-util": "^0.5.4",
@@ -23,5 +24,9 @@
     "tmp": "0.0.23",
     "uglify-js": "latest",
     "wrench": "^1.5.8"
+  },
+  "scripts": {
+    "build": "./node_modules/.bin/gulp build;",
+    "postinstall": "./node_modules/.bin/gulp install;"
   }
 }
diff --git a/resources/gulp/components/prod.js b/resources/gulp/components/prod.js
index 8bb84162ee..6e62a562a9 100644
--- a/resources/gulp/components/prod.js
+++ b/resources/gulp/components/prod.js
@@ -73,6 +73,7 @@ gulp.task('build-prod', ['copy-prod-images', 'build-prod-css'], function(){
         config.paths.vendors + 'blueimp-load-image/js/load-image.js', // @TODO > extra files
         config.paths.vendors + 'jquery-file-upload/js/jquery.iframe-transport.js',
         config.paths.vendors + 'jquery-file-upload/js/jquery.fileupload.js',
+        config.paths.vendors + 'geonames-server-jquery-plugin/jquery.geonames.js',
         config.paths.src + 'prod/js/jquery.form.2.49.js',
         config.paths.src + 'prod/js/jquery.Selection.js',
         config.paths.src + 'prod/js/jquery.Edit.js',
diff --git a/resources/www/_shared/styles/_main-menu.scss b/resources/www/_shared/styles/_main-menu.scss
index 402ba57980..0f607b7065 100644
--- a/resources/www/_shared/styles/_main-menu.scss
+++ b/resources/www/_shared/styles/_main-menu.scss
@@ -1,74 +1,61 @@
 @import 'variables';
 
-#mainMenu{
-  height:35px;
-  bottom:auto;
-  -moz-border-radius-bottomleft:4px;
-  -moz-border-radius-bottomright:4px;
-  z-index:100;
-  line-height:30px;
+#mainMenu {
+  height: $mainMenuHeight;
+  line-height: $mainMenuLineHeight;
+  // bottom:auto;
+  z-index: 100;
+  ol {
+    display: block;
+    margin: 0;
+    padding: 0;
+    list-style: none outside none;
+  }
+  li {
+    display: inline-block;
+    float: left;
+    line-height: 30px;
+    padding: 0;
+    position: relative;
+    vertical-align: top;
+  }
+  span {
+    color: #b1b1b1;
+    font-size: 12px;
+    font-weight: normal;
+    border-top: 3px solid transparent;
+    display: block;
+    padding: 0 5px;
+    &.selected {
+      border-top: 3px solid white;
+    }
+  }
+  .title {
+    font-size: 18px;
+    color: #F7F7F7;
+    margin: 0 5px;
+  }
+  a {
+    text-decoration: none;
+    display: inline-block;
+    &:hover {
+      span {
+        background-color: #FFFFFF;
+        color: black;
+      }
+    }
+  }
+  #notification_box a {
+    margin-left: 0;
+  }
+  .account a {
+    text-decoration: underline;
+  }
+  b {
+    color: #EDEDED;
+    font-weight: bold;
+  }
+  nobr {
+    padding: 0 5px;
+  }
 }
-
-#mainMenu ol{
-  display: block;
-  margin:0;
-  padding:0;
-  list-style: none outside none;
-}
-
-#mainMenu li{
-  display: inline-block;
-  float:left;
-  line-height: 30px;
-  padding: 0;
-  position: relative;
-  vertical-align: top;
-}
-#mainMenu span.selected{
-  border-top:3px solid white;
-}
-
-#mainMenu span{
-  display: block;
-  padding:0 5px;
-}
-
-#mainMenu .title{
-  font-size:18px;
-  color:#F7F7F7;
-  margin:0 5px;
-}
-
-#mainMenu a:hover span{
-  background-color:#FFFFFF;
-  color:black;
-}
-
-#mainMenu span{
-  color:#b1b1b1;
-  font-size:12px;
-  font-weight:normal;
-  border-top:3px solid transparent;
-}
-
-#mainMenu a{
-  text-decoration:none;
-  display:inline-block;
-}
-
-#mainMenu #notification_box a {
-  margin-left:0;
-}
-
-#mainMenu .account a{
-  text-decoration:underline;
-}
-
-#mainMenu b{
-  color:#EDEDED;
-  font-weight:bold;
-}
-
-#mainMenu nobr{
-  padding:0 5px;
-}
\ No newline at end of file
diff --git a/resources/www/_shared/styles/_variables.scss b/resources/www/_shared/styles/_variables.scss
index 1f6fbb095d..cb9cebd37b 100644
--- a/resources/www/_shared/styles/_variables.scss
+++ b/resources/www/_shared/styles/_variables.scss
@@ -1,2 +1,5 @@
 $fontAwesomePath:   '/assets/common/font' !default; // dist path
-$iconsPath: '/assets/common/images/icons/' !default;
\ No newline at end of file
+$iconsPath: '/assets/common/images/icons/' !default;
+
+$mainMenuHeight: 40px;
+$mainMenuLineHeight: 36px;
\ No newline at end of file
diff --git a/resources/www/prod/skins/000000/skin-000000.scss b/resources/www/prod/skins/000000/skin-000000.scss
index dc756c65d7..288cc671b2 100644
--- a/resources/www/prod/skins/000000/skin-000000.scss
+++ b/resources/www/prod/skins/000000/skin-000000.scss
@@ -1,15 +1,56 @@
+/**
+// @TODO define base colors
+$black: #000000;
+$gg: #111111;
+$gg: #141414;
+$gg: #1a1a1a;
+$gg: #292929;
+$gg: #303030;
+$gg: lighten(#000000, 23); //#3b3b3b; // primary color
+$gg: #404040;
+$gg: #606060;
+$gg: #666666;
+$gg: #999999;
+$gg: #b1b1b1; // text color
+$gg: #EAEAEA;
+$gg: #FFFFFF;
+
+
+$gg: #222222;
+$gg: #393939;
+$gg: #515151;
+$gg: #aaaaaa;
+$gg: #313131;
+
+// color themed:
+$gg: #b1b1b1;
+$gg: #292929;
+$gg: #076882;
+$gg: #0088CC;
+*/
 $col1: #3b3b3b;
 $col2: #1a1a1a;
 $skinsImagesPath: '/assets/vendors/jquery-ui/images/dark-hive/';
 
+$defaultBorderColor: #303030;
+$defaultBorderRadius: 2px;
 $backgroudPrimaryColor: #1A1A1A;
-$backgroudSecondaryColor: #404040;
+$backgroudSecondaryColor: #3b3b3b;
+$backgroudAltColor: #404040;
 $backgroundAltPrimaryColor: #1a1a1a;
-$textPrimaryColor: #FFFFFF;
+
+$textPrimaryColor: #b1b1b1;
+$textPrimaryHoverColor: #FFFFFF;
+$textPrimaryActiveColor: #FFFFFF;
 $textPrimaryInverseColor: #3b3b3b;
 $textSecondaryColor: #999999;
 
+// inverse
+$textInverseColor: #FFFFFF;
+$textInverseHoverColor: #000;
+$bgInverseHoverColor: #FFF;
 /******* GLOBAL PROD **********************************************************/
+
 $mainMenuColor: #b1b1b1;
 $mainMenuRightListBorderLeft: #292929;
 
@@ -21,17 +62,18 @@ $paginateTextColor: #FFFFFF;
 $paginateBg1: #141414;
 $paginateBg2: #076882;
 
+
 $uploadBg1: #FFFFFF;
 $uploadBg2: #FFFFFF;
 $uploadLoaderImg: 'loaderFFF.gif';
 
-$publishDialogBg: #000000;
-$publishDialogBg2: #414141;
-$publishDialogBg3: #404040;
-$publishDialogBg4: #111111;
-$publishFeedBorder: #414141;
+$bridgeDialogBg: #000000;
+$bridgeDialogBg2: #404040;
+$bridgeDialogBg3: #404040;
+$bridgeDialogBg4: #111111;
+$publishFeedBorder: #404040;
 $publishFeedColor: #FFFFFF;
-$publishFeedOddBg: #414141;
+$publishFeedOddBg: #404040;
 $publishFeedOddColor: #FFFFFF;
 $publishFeedHoverBg: #606060;
 $publishFeedHoverColor: #FFFFFF;
@@ -53,7 +95,7 @@ $thesaurusBg2: #404040;
 
 $thesaurusContextMenuColor: #c0c0c0;
 $proposalsBg: #292929;
-$proposalsBorder: #303030;
+$proposalsBorder: $defaultBorderColor;
 $proposalsTitle: #A6A6A6;
 $proposalsTitleBorder: #303030;
 
@@ -65,12 +107,12 @@ $basketsBg1: #212121;
 $guiSplitterImg: 'vsplitter2.png';
 
 $workzoneBg: #3b3b3b;
-$workzoneBorderTop: #000;
+$workzoneBorderTop: $defaultBorderColor;
 $workzoneColor1: inherit;
 $workzoneColor2: inherit;
 $workzoneColor3: #EAEAEA;
 $workzoneTabBgHover: #666666;
-$workzoneTabBgActive: #333;
+$workzoneTabBgActive: #333333;
 $workzoneTabBorderTop: #303030;
 $workzoneTabBorderBottom: #303030;
 $workzoneBasketAlertDataBg: #fff190;
@@ -117,7 +159,7 @@ $searchSbasListSelectedBorder: #404040;
 
 $editCarouselBg: #1a1a1a;
 $editCarouselBorder: #B1B1B1;
-$editStatusFieldOdd: #5F5F5F;
+$editStatusFieldOdd: #606060;
 $editStatusFieldHover: #B1B1B1;
 $editStatusFieldActive: #FEFEFE;
 $editTextMultiValueBg: #444444;
@@ -129,7 +171,7 @@ $preferencesLabelColor: #999999;
 $uiColor1: #111111;
 $activeStateIcon: 'ui-icons_cccccc_256x240.png';
 $accordionLoaderImg: 'loader000.gif';
-$accordionBorderColor: #000;
+$accordionBorderColor: $defaultBorderColor;
 $accordionBgHeaderHover: #474747;
 $accordionBgContent: #212121;
 
@@ -137,6 +179,9 @@ $popoverBg: #000;
 $popoverBorder: #444;
 $popoverColor: $textPrimaryColor;
 $popoverInnerBg: #000;
+$modalBorder: 1px solid #555555;
+$modalBackground: #212121;
+
 
 $dropdownDividerBg: #515151;
 $dropdownDividerBorder: #404040;
@@ -148,9 +193,15 @@ $tabsNavBgActive: #404040;
 $sliderBg: #1a1a1a;
 $dialogLoaderImg: 'loader000.gif';
 
+$btnBackground: #EAEAEA;
+$btnBackgroundHighlight: #D6D6D6;
+$btnColor: #8e8e8e;
+$btnTextShadow: 0 -1px 0 rgba(0,0,0,0);
+
 $btnInverseBackground: #444444;
 $btnInverseBackgroundHighlight: #393939;
 $btnInverseColor: #AAAAAA;
+$btnInverseTextShadow: 0 -1px 0 rgba(0,0,0,.25);
 $btnGrpSeparatorColor: #242424;
 
 $widgetContentColor: $textPrimaryColor;
@@ -158,4 +209,7 @@ $widgetContentColor: $textPrimaryColor;
 $linkDefaultColor: #b1b1b1;
 $linkDefaultHover: #838383;
 
+
+
+
 @import '../skin-shared';
diff --git a/resources/www/prod/skins/959595/skin-959595.scss b/resources/www/prod/skins/959595/skin-959595.scss
index 649b826949..0a9b4318bb 100644
--- a/resources/www/prod/skins/959595/skin-959595.scss
+++ b/resources/www/prod/skins/959595/skin-959595.scss
@@ -2,6 +2,8 @@ $col1: #B1B1B1;
 $col2: #D9D9D9;
 $skinsImagesPath: '/assets/vendors/jquery-ui/images/ui-lightness/';
 
+$defaultBorderColor: #666666;
+$defaultBorderRadius: 2px;
 
 
 // @TODO borders:
@@ -12,9 +14,16 @@ $backgroudPrimaryColor: #D9D9D9;
 $backgroudSecondaryColor: #D9D9D9;
 $backgroundAltPrimaryColor: #1a1a1a;
 $textPrimaryColor: #333333;
+$textPrimaryHoverColor: #1a1a1a;
+$textPrimaryActiveColor: #1a1a1a;
 $textPrimaryInverseColor: #3b3b3b;
 $textSecondaryColor: #999999;
 
+// inverse
+$textInverseColor: #000;
+$textInverseHoverColor: #000;
+$bgInverseHoverColor: #FFF;
+
 /******* GLOBAL PROD **********************************************************/
 $mainMenuColor: #FFF;
 $mainMenuRightListBorderLeft: #999;
@@ -31,10 +40,10 @@ $uploadBg1: #FFFFFF;
 $uploadBg2: transparent;
 $uploadLoaderImg: 'loaderB1B1B1.gif';
 
-$publishDialogBg: #D9D9D9;
-$publishDialogBg2: #B1B1B1;
-$publishDialogBg3: #B1B1B1;
-$publishDialogBg4: #D9D9D9;
+$bridgeDialogBg: #D9D9D9;
+$bridgeDialogBg2: #B1B1B1;
+$bridgeDialogBg3: #B1B1B1;
+$bridgeDialogBg4: #D9D9D9;
 $publishFeedBorder: #959595;
 $publishFeedColor: #333333;
 $publishFeedOddBg: #959595;
@@ -59,7 +68,7 @@ $thesaurusBg2: #FFFFFF;
 
 $thesaurusContextMenuColor: #FFFFFF;
 $proposalsBg: #999;
-$proposalsBorder: #666666;
+$proposalsBorder: $defaultBorderColor;
 $proposalsTitle: #FFFFFF;
 $proposalsTitleBorder: #666666;
 
@@ -133,7 +142,7 @@ $preferencesLabelColor: #333333;
 $uiColor1: #D9D9D9;
 $activeStateIcon: 'ui-icons_ffffff_256x240.png';
 $accordionLoaderImg: 'loaderd9d9d9.gif';
-$accordionBorderColor: #999;
+$accordionBorderColor: $defaultBorderColor;
 $accordionBgHeaderHover: #999;
 $accordionBgContent: #D9D9D9;
 
@@ -141,6 +150,8 @@ $popoverBg: #999999;
 $popoverBorder: #444;
 $popoverColor: $textPrimaryColor;
 $popoverInnerBg: #D9D9D9;
+$modalBorder: 1px solid #444;
+$modalBackground: #D9D9D9;
 
 $dropdownDividerBg: #515151;
 $dropdownDividerBorder: #404040;
@@ -152,10 +163,16 @@ $tabsNavBgActive: #D9D9D9;
 $sliderBg: #1a1a1a;
 $dialogLoaderImg: 'loaderd9d9d9.gif';
 
+$btnBackground: #444444; //#B9B9B9;
+$btnBackgroundHighlight: #393939;
+$btnColor: #AAAAAA;
+$btnTextShadow: 0 -1px 0 rgba(0,0,0,.25);
+
 $btnInverseBackground: #B9B9B9;
 $btnInverseBackgroundHighlight: #A4A4A4;
 $btnInverseColor: #EAEAEA;
-$btnGrpSeparatorColor: #999999;
+$btnInverseTextShadow: 0 -1px 0 rgba(0,0,0,.25);
+$btnGrpSeparatorColor: $defaultBorderColor;
 
 $widgetContentColor: $textPrimaryInverseColor;
 
diff --git a/resources/www/prod/skins/skin-shared.scss b/resources/www/prod/skins/skin-shared.scss
index f2f52e7fb9..8c7c36aafc 100644
--- a/resources/www/prod/skins/skin-shared.scss
+++ b/resources/www/prod/skins/skin-shared.scss
@@ -1,3 +1,7 @@
+$proposalColor: #4c5d84;
+$thesaurusColor: #884c92;
+$basketsColor: #076882;
+
 @import '../../_shared/styles/variables';
 
 ::-webkit-scrollbar-track
@@ -34,11 +38,11 @@
 input::selection, textarea::selection,
 input::-moz-selection, textarea::-moz-selection {
   background: #404040;
-  color: #FFFFFF;
+  color: $textInverseColor;
 }
 
 label {
-  color: #FFFFFF;
+  color: $textInverseColor;
 }
 
 legend {
@@ -305,9 +309,7 @@ span.ww_winTitle {
 
 
 
-.ui-dialog-titlebar {
-  min-height: 20px;
-}
+
 
 .chim-wrapper {
   position: relative;
@@ -387,23 +389,7 @@ span.ww_winTitle {
   position: relative;
 }
 
-.ui-dialog-content.dialog-Small select,
-.ui-dialog-content.dialog-Small input[type="text"],
-.ui-dialog-content.dialog-Small textarea {
-  width: 100%;
-}
 
-.ui-dialog-content.dialog-Small textarea {
-  height: 60px;
-}
-
-.ui-dialog-content label {
-  line-height: 18px;
-}
-
-.ui-dialog-content p {
-  line-height: 18px;
-}
 
 /******* ORDER MANAGER ********************************************************/
 
@@ -494,7 +480,7 @@ H4 {
   font-weight: bold;
   line-height: 14px;
   text-align: center;
-  color: #FFFFFF;
+  color: $textInverseColor;
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
   float: left;
 }
@@ -515,18 +501,7 @@ H4 {
 
 
 
-@media screen and (max-width: 1200px) {
-  #idFrameT .tools button.btn-inverse img {
-    display: none;
-  }
-  #idFrameT .tools #settings {
-    text-indent: -9000px;
-    padding-right: 0px;
-    padding-left: 0px;
-    margin-right: 8px;
-    width: 26px;
-  }
-}
+
 /******* POPOVERS *************************************************************/
 
 #tooltip .popover {
diff --git a/resources/www/prod/skins/ui-components/_actions.scss b/resources/www/prod/skins/ui-components/_actions.scss
index 08396c7fbc..5a1976d12c 100644
--- a/resources/www/prod/skins/ui-components/_actions.scss
+++ b/resources/www/prod/skins/ui-components/_actions.scss
@@ -122,3 +122,15 @@
   background-position: center center;
   background-repeat: no-repeat;
 }
+
+.contextMenuTrigger {
+  color: $textPrimaryColor;
+  font-size: 10px;
+  margin-left: 5px;
+  line-height: 18px;
+  vertical-align: middle;
+}
+
+.contextMenuTrigger:hover {
+  color: $textPrimaryColor;
+}
diff --git a/resources/www/prod/skins/ui-components/_answers-tools.scss b/resources/www/prod/skins/ui-components/_answers-tools.scss
index 88e0fcc8b8..e91bbec046 100644
--- a/resources/www/prod/skins/ui-components/_answers-tools.scss
+++ b/resources/www/prod/skins/ui-components/_answers-tools.scss
@@ -14,7 +14,7 @@
 #idFrameT .btn-toolbar {
   margin-bottom: 0px;
   margin-top: 0px;
-  background-color: $col1;
+  background-color: $backgroudSecondaryColor;
   font-size:10px;
   z-index:100;
   height:45px;
@@ -47,7 +47,7 @@
 #idFrameT .tools .classicButton button.btn-inverse,
 #idFrameT .tools .dropdownButton button.btn-inverse {
   background-image: none;
-  background-color: $col1;
+  background-color: $backgroudSecondaryColor;
   border-radius: 0;
   margin: 0;
   height: 45px;
@@ -67,7 +67,7 @@
 #idFrameT .tools .dropdownButton button.btn-inverse:hover {
   background-color: $answersToolsBtnBg;
   *background-color: $answersToolsBtnBg;
-  color: #FFFFFF;
+  color: $textPrimaryHoverColor;
 }
 
 #idFrameT .tools .classicButton button.btn-inverse img,
@@ -102,14 +102,27 @@
   display: block;
   float: right;
   line-height: 45px;
-  padding-right: 30px;
+  padding-right: 51px;
   padding-left: 21px;
-  margin-right: 21px;
+  margin-right: 0;
   color: $answersToolsBtnSettingsColor;
   background: url('#{$iconsPath}icone_settings.png') right 15px no-repeat;
+  background-position: right 21px top 15px;
   border-left: 1px solid $answersToolsBtnSettingsBorder;
 }
 
 #idFrameT .tools #settings:hover {
   background-color: $answersToolsBtnSettingsHoverBg;
+}
+@media screen and (max-width: 1200px) {
+  #idFrameT .tools button.btn-inverse img {
+    display: none;
+  }
+  #idFrameT .tools #settings {
+    text-indent: -9000px;
+    padding-right: 0px;
+    padding-left: 0px;
+    margin-right: 8px;
+    width: 26px;
+  }
 }
\ No newline at end of file
diff --git a/resources/www/prod/skins/ui-components/_answers.scss b/resources/www/prod/skins/ui-components/_answers.scss
index 8afaf2204d..67fcffcf18 100644
--- a/resources/www/prod/skins/ui-components/_answers.scss
+++ b/resources/www/prod/skins/ui-components/_answers.scss
@@ -3,18 +3,6 @@
   margin: 0;
 }
 
-.contextMenuTrigger {
-  color: #FFFFFF;
-  font-size: 10px;
-  margin-left: 5px;
-  line-height: 18px;
-  vertical-align: middle;
-}
-
-.contextMenuTrigger:hover {
-  color: #FFFFFF;
-}
-
 .captionRolloverTips, .previewTips, .infoTips,
 .baskAdder, .printer, .downloader, .baskDeleter {
   background-image: url('#{$iconsPath}zoom.gif');
@@ -50,23 +38,6 @@
   background-image: url('#{$iconsPath}download.gif');
 }
 
-#tool_navigate input {
-  text-align: center;
-}
-
-#tool_navigate a {
-  padding: 1px 5px;
-  margin: 0 4px;
-  background-color: #0077BC;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-  font-size: 12px;
-  line-height: 14px;
-  font-weight: bold;
-  cursor: pointer;
-}
-
 .diapo div.title {
   overflow: hidden;
   text-overflow: ellipsis;
@@ -194,7 +165,7 @@ div.diapo {
 
 
 #answers .feed .btn-inverse:hover {
-  color: #FFFFFF;
+  color: $textPrimaryHoverColor;
 }
 
 #answers .feed .btn-group.open .btn-inverse.dropdown-toggle {
diff --git a/resources/www/prod/skins/ui-components/_buttons.scss b/resources/www/prod/skins/ui-components/_buttons.scss
index 37e0e1cf9c..d086a4d513 100644
--- a/resources/www/prod/skins/ui-components/_buttons.scss
+++ b/resources/www/prod/skins/ui-components/_buttons.scss
@@ -1,13 +1,14 @@
 @import '../../../../../www/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap/_mixins.scss';
-.btn {
+button, .btn, input[type="file"] {
   //font-family: verdana,"Helvetica Neue",Helvetica,Arial,sans-serif;
   //font-size: 12px;
   //font-weight: bold;
   // soften button edges:
   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+  @include buttonBackground($btnBackground, $btnBackgroundHighlight, $btnColor, $btnTextShadow);
 }
 .btn.btn-inverse {
-  @include buttonBackground($btnInverseBackground, $btnInverseBackgroundHighlight, $btnInverseColor);
+  @include buttonBackground($btnInverseBackground, $btnInverseBackgroundHighlight, $btnInverseColor, $btnInverseTextShadow);
 }
 
 // @TODO .btn-primary
diff --git a/resources/www/prod/skins/ui-components/_context-menu.scss b/resources/www/prod/skins/ui-components/_context-menu.scss
index a8c5985fc3..3ebf7527ad 100644
--- a/resources/www/prod/skins/ui-components/_context-menu.scss
+++ b/resources/www/prod/skins/ui-components/_context-menu.scss
@@ -33,7 +33,7 @@ Menu contextuel
 
 .context-menu-theme-default .context-menu-item-hover {
   background-color: #0A246A;
-  color: #FFFFFF;
+  color: $textPrimaryHoverColor;
 }
 
 .context-menu-theme-default .context-menu-item-disabled-hover {
diff --git a/resources/www/prod/skins/ui-components/_diapo.scss b/resources/www/prod/skins/ui-components/_diapo.scss
index bba3158c71..1df2a38449 100644
--- a/resources/www/prod/skins/ui-components/_diapo.scss
+++ b/resources/www/prod/skins/ui-components/_diapo.scss
@@ -22,7 +22,7 @@
 #reorder_dialog .ui-sortable-placeholderfollow {
   width: 100px;
   height: 130px;
-  background-color: #414141;
+  background-color: $backgroudSecondaryColor;
 }
 
 .diapo .thumb {
diff --git a/resources/www/prod/skins/ui-components/_gui-misc.scss b/resources/www/prod/skins/ui-components/_gui-misc.scss
index 4b21060767..d3d24c6419 100644
--- a/resources/www/prod/skins/ui-components/_gui-misc.scss
+++ b/resources/www/prod/skins/ui-components/_gui-misc.scss
@@ -47,7 +47,7 @@ TABLE.ulist TBODY TR {
 }
 
 TABLE.ulist TBODY TR.selected {
-  COLOR: #FFFFFF;
+  COLOR: $textPrimaryActiveColor;
   BACKGROUND-COLOR: #191970
 }
 
diff --git a/resources/www/prod/skins/ui-components/_gui.scss b/resources/www/prod/skins/ui-components/_gui.scss
index 7d6c29b7fe..8c34dba1c4 100644
--- a/resources/www/prod/skins/ui-components/_gui.scss
+++ b/resources/www/prod/skins/ui-components/_gui.scss
@@ -16,7 +16,7 @@
   height: 54px;
   position: absolute;
   background-image:  url('#{$iconsPath}vsplitter.png');
-  background-color: $col1;
+  background-color: $backgroudSecondaryColor;
   background-position:  center center;
   background-repeat:  no-repeat;
   right: 0;
diff --git a/resources/www/prod/skins/ui-components/_jquery-ui.scss b/resources/www/prod/skins/ui-components/_jquery-ui.scss
index ad5a3395ef..f716917a15 100644
--- a/resources/www/prod/skins/ui-components/_jquery-ui.scss
+++ b/resources/www/prod/skins/ui-components/_jquery-ui.scss
@@ -20,31 +20,52 @@
   background: none;
   border: transparent 0px none;
 }
+.ui-tabs {
+  .ui-tabs-nav {
+    li {
+      background-color: $tabsNavBg;
+      height: 30px;
+      border: none;
+      overflow: hidden;
+      a {
+        padding: 5px 8px;
+        font-size: 0.8em;
+        font-weight: normal;
+      }
+      &.ui-tabs-active {
+        background-color: $tabsNavBgActive;
+        border: none;
+      }
+      &.ui-tabs-active a,
+      &.ui-state-disabled a,
+      &.ui-state-processing a {
+        cursor: pointer;
+        color: $workzoneColor1
+      }
 
-.ui-tabs .ui-tabs-nav li {
-  background-color: $tabsNavBg;
-  height: 30px;
-  border: none;
-  overflow: hidden;
+    }
+  }
+  .ui-tabs-panel {
+    overflow-x: hidden;
+    overflow-y: auto;
+    display: block;
+    border-width: 0;
+    padding: 0px;
+    background-color: $backgroudSecondaryColor;
+    &.tabBox {
+      height: 405px;
+      overflow: auto;
+      position: relative;
+      padding: 10px;
+
+    }
+  }
+  .ui-tabs-hide {
+    display: none !important;
+  }
 }
 
-.ui-tabs .ui-tabs-nav li.ui-tabs-active {
-  background-color: $tabsNavBgActive;
-  border: none;
-}
 
-.ui-tabs .ui-tabs-nav li a {
-  padding: 10px 8px;
-  font-size: 0.8em;
-  font-weight: normal;
-}
-
-.ui-tabs .ui-tabs-nav li.ui-tabs-active a,
-.ui-tabs .ui-tabs-nav li.ui-state-disabled a,
-.ui-tabs .ui-tabs-nav li.ui-state-processing a {
-  cursor: pointer;
-  color: $workzoneColor1
-}
 
 .ui-tabs .ui-tabs-nav li a,
 .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a {
@@ -52,27 +73,6 @@
   color: $workzoneColor2;
 }
 
-.ui-tabs .ui-tabs-panel {
-  overflow-x: hidden;
-  overflow-y: auto;
-  display: block;
-  border-width: 0;
-  padding: 0px;
-  background-color: $col1;
-}
-
-.ui-tabs .ui-tabs-panel.tabBox {
-  height: 405px;
-  overflow: auto;
-  position: relative;
-  padding: 10px;
-
-}
-
-.ui-tabs .ui-tabs-hide {
-  display: none !important;
-}
-
 .ui-state-default, .ui-widget-content .ui-state-default {
   background: none;
 }
@@ -115,7 +115,7 @@
 }
 
 .ui-state-active .ui-icon {
-  background-image: url('#{$skinsImagesPath}#{$activeStateIcon}.png');
+  background-image: url('#{$skinsImagesPath}#{$activeStateIcon}');
 }
 
 
@@ -136,15 +136,11 @@
   margin-bottom: 0;
   height: 44px;
   line-height: 44px;
-  background-color: $col1;
+  background-color: $backgroudSecondaryColor;
   border-bottom: 1px solid $accordionBorderColor;
   border-radius: 0;
 }
 
-.ui-accordion>div {
-  border-top: 1px solid $accordionBorderColor;
-}
-
 .ui-accordion .ui-accordion-header.unread .workzone-menu-title {
   font-style: italic;
   font-weight: bold;
@@ -178,3 +174,52 @@
   border-top: none;
 }
 
+// override jqurey ui theme value:
+.ui-corner-all, .ui-corner-br {
+  border-radius: $defaultBorderRadius;
+}
+.ui-corner-top {
+  border-top-left-radius: $defaultBorderRadius;
+  border-top-right-radius: $defaultBorderRadius;
+}
+.ui-corner-bottom {
+  border-bottom-right-radius: $defaultBorderRadius;
+  border-bottom-left-radius: $defaultBorderRadius;
+}
+.ui-corner-right {
+  border-top-right-radius: $defaultBorderRadius;
+  border-bottom-right-radius: $defaultBorderRadius;
+}
+.ui-corner-left {
+  border-top-left-radius: $defaultBorderRadius;
+  border-bottom-left-radius: $defaultBorderRadius;
+}
+
+.ui-dialog.ui-widget-content {
+  border: $modalBorder;
+  background: $modalBackground;
+  //background: #000000 url("../images/dark-hive/ui-bg_loop_25_000000_21x21.png") 50% 50% repeat;
+  // color: #ffffff;
+}
+
+.ui-dialog-titlebar {
+  min-height: 20px;
+}
+
+.ui-dialog-content.dialog-Small select,
+.ui-dialog-content.dialog-Small input[type="text"],
+.ui-dialog-content.dialog-Small textarea {
+  width: 100%;
+}
+
+.ui-dialog-content.dialog-Small textarea {
+  height: 60px;
+}
+
+.ui-dialog-content label {
+  line-height: 18px;
+}
+
+.ui-dialog-content p {
+  line-height: 18px;
+}
\ No newline at end of file
diff --git a/resources/www/prod/skins/ui-components/_main-menu.scss b/resources/www/prod/skins/ui-components/_main-menu.scss
index 3acda3041b..57bb3cae13 100644
--- a/resources/www/prod/skins/ui-components/_main-menu.scss
+++ b/resources/www/prod/skins/ui-components/_main-menu.scss
@@ -1,8 +1,10 @@
+@import '../../../_shared/styles/variables';
+@import '../../../_shared/styles/main-menu';
 /*******  MAINMENU ************************************************************/
 
 #mainMenu {
-  height: 40px;
-  line-height: 40px;
+  height: $mainMenuHeight;
+  line-height: $mainMenuLineHeight;
   vertical-align: middle;
 }
 
@@ -13,7 +15,7 @@
 
 #mainMenu li, #mainMenu li span {
   height: 40px;
-  line-height: 40px;
+  line-height: $mainMenuLineHeight;
   color: $mainMenuColor;
 }
 
@@ -31,12 +33,12 @@
 }
 
 #mainMenu .PNB.right li.user:hover {
-  background-color: #FFFFFF;
-  color: black;
+  background-color: $bgInverseHoverColor;
+  color: $textInverseHoverColor;
 }
 
 #mainMenu, .publi_group {
-  background-color: $col1;
+  background-color: $backgroudSecondaryColor;
 }
 
 .context-menu-item a {
diff --git a/resources/www/prod/skins/ui-components/_modal-bridge.scss b/resources/www/prod/skins/ui-components/_modal-bridge.scss
index 575af18881..3d5659d8f2 100644
--- a/resources/www/prod/skins/ui-components/_modal-bridge.scss
+++ b/resources/www/prod/skins/ui-components/_modal-bridge.scss
@@ -20,3 +20,93 @@
   background-color: $bridgeDropdownMenuHoverBg;
   color: $bridgeDropdownMenuHoverColor;
 }
+
+#dialog_publicator .ui-tabs-panel {
+  left: 200px;
+}
+
+#dialog_publicator .notice_box,
+#dialog_publicator .error_box {
+  color: #404040;
+  font-weight: bold;
+  margin: 5px auto;
+  padding: 5px 0;
+  text-align: center;
+  width: 90%;
+}
+
+#dialog_publicator .notice_box {
+  background-color: green;
+  color: $textPrimaryColor;
+}
+
+#dialog_publicator .error_box {
+  background-color: orange;
+}
+
+#dialog_publicator .api_banner {
+  height: 30px;
+  bottom: auto;
+  background-color: $bridgeDialogBg2;
+}
+
+#dialog_publicator .api_banner button {
+  border: 1px solid #515151;
+  background-color: #404040;
+}
+
+#dialog_publicator .api_banner .submenu.ui-buttonset {
+  z-index: 600;
+}
+
+#dialog_publicator .api_content {
+  top: 30px;
+  bottom: 25px;
+  color: $textPrimaryColor;
+}
+
+#dialog_publicator .api_content .blockmenu {
+  bottom: auto;
+  background-repeat: repeat-x;
+  background-position: left bottom;
+  z-index: 1000;
+  width:100%;
+  height:40px
+}
+
+#dialog_publicator .api_content .blockmenu a.selected,
+#dialog_publicator .api_banner a.selected {
+  font-weight: bold;
+  color: #0088CC;
+}
+
+#dialog_publicator .api_content .blockresponse {
+  padding: 0 10px;
+  top: 40px;
+  overflow: auto;
+  z-index: 200;
+}
+
+#dialog_publicator .api_content .blockresponse .form-actions {
+  background-color: $bridgeDialogBg;
+  border-top: none;
+  margin: 0;
+}
+
+#dialog_publicator .api_infos {
+  top: auto;
+  height: 25px;
+  background-image: url('#{$iconsPath}api_info.png');
+  background-repeat: repeat-x;
+  background-position: 0 0;
+  color: $textSecondaryColor;
+}
+
+#dialog_publicator .main_menu {
+  float: left;
+}
+
+#dialog_publicator .diapo .title {
+  height: 16px;
+  overflow: hidden;
+}
\ No newline at end of file
diff --git a/resources/www/prod/skins/ui-components/_modal-edit.scss b/resources/www/prod/skins/ui-components/_modal-edit.scss
index 11a9efce44..f4c902e926 100644
--- a/resources/www/prod/skins/ui-components/_modal-edit.scss
+++ b/resources/www/prod/skins/ui-components/_modal-edit.scss
@@ -91,10 +91,9 @@
 #EDIT_MID_R {
   width: 400px;
   right: 0;
-}
-
-#EDIT_MID_R .ui-tabs-panel {
-  background-color: $backgroudSecondaryColor;
+  .ui-tabs-panel {
+    background-color: $backgroudSecondaryColor;
+  }
 }
 
 #EDIT_MID_R li.ui-tabs-active,
@@ -120,32 +119,27 @@
   left: 0px;
   bottom: 0px;
   right: 10px;
-}
-
-#divS div.edit_field {
-  cursor: pointer;
-  font-weight: bold;
-  padding: 2px;
-  margin-right: 10px;
-  position: relative;
-}
-
-#divS div.edit_field.odd {
-  background-color: $editStatusFieldOdd;
-}
-
-#divS div.edit_field.hover, #divS div.edit_field.active {
-  background-color: $editStatusFieldHover;
-  color: #404040;
-}
-
-#divS div.edit_field.active {
-  border: 1px solid $editStatusFieldActive;
-}
-
-#divS span.fieldvalue {
-  white-space: normal;
-  font-weight: normal;
+  div.edit_field {
+    cursor: pointer;
+    font-weight: bold;
+    padding: 2px;
+    margin-right: 10px;
+    position: relative;
+  }
+  div.edit_field.odd {
+    background-color: $editStatusFieldOdd;
+  }
+  div.edit_field.hover, #divS div.edit_field.active {
+    background-color: $editStatusFieldHover;
+    color: #404040;
+  }
+  div.edit_field.active {
+    border: 1px solid $editStatusFieldActive;
+  }
+  span.fieldvalue {
+    white-space: normal;
+    font-weight: normal;
+  }
 }
 
 #idEditZone {
@@ -198,28 +192,20 @@
   display: none;
 }
 
-#idFrameE .ui-datepicker-inline {
-  background-color: #111111;
-  background-image: url('../images/000000/images/ui-bg_gloss-wave_20_111111_500x100.png');
-  background-repeat: repeat-x;
-  background-position: 50% top;
-}
 
 #idExplain {
   top: auto;
   height: 20px;
   color: #FFB300;
   text-align: right;
-}
-
-#idExplain img {
-  vertical-align: middle;
-  width: 20px;
-  height: 20px;
-}
-
-#idExplain .metadatas_restrictionsTips {
-  cursor: help;
+  img {
+    vertical-align: middle;
+    width: 20px;
+    height: 20px;
+  }
+  .metadatas_restrictionsTips {
+    cursor: help;
+  }
 }
 
 #idDivButtons {
@@ -275,7 +261,7 @@
 }
 
 #Edit_copyPreset_dlg form span {
-  color: #FFFFFF;
+  color: $textPrimaryColor;
 }
 
 .Edit_preset_item {
@@ -300,94 +286,175 @@
   overflow-x: auto;
   overflow-y: scroll;
 }
+#idFrameE {
+  .ui-datepicker-inline {
+    background-color: #111111;
+    background-image: url('#{$skinsImagesPath}ui-bg_gloss-wave_20_111111_500x100.png');
+    background-repeat: repeat-x;
+    background-position: 50% top;
+  }
 
-#idFrameE #ZTextMultiValued_values div {
-  cursor: pointer;
-  height: 20px;
-  padding: 2px 14px 2px 2px;
+  #ZTextMultiValued_values {
+    div {
+      cursor: pointer;
+      height: 20px;
+      padding: 2px 14px 2px 2px;
+      table {
+        width: 100%;
+        border: none;
+        td {
+          vertical-align: middle;
+          &.options {
+            width: 40px;
+            text-align: right;
+            .add_all {
+              display: none;
+            }
+          }
+        }
+      }
+      &.hetero {
+        table {
+          td.options {
+            .add_all {
+              display: inline;
+            }
+          }
+        }
+      }
+      &.hilighted {
+        background-color: $editTextMultiValueHighlightBg;
+      }
+      i {
+        color: #FFFF00;
+        font-style: normal;
+        font-weight: 700;
+        background-color: #222222;
+      }
+    }
+  }
+  .hetero {
+    color: #ff8000;
+  }
+  .EDIT_presets_list {
+    padding-left: 3px;
+    padding-right: 6px;
+    li {
+      margin: 0px;
+      &.opened{
+        div {
+          display: block;
+        }
+        .triRight {
+          display: none;
+        }
+        .triDown {
+          display: inherit;
+        }
+      }
+      .triDown {
+        display: none;
+      }
+    }
+    div {
+      display: none;
+      padding-left: 15px;
+      padding-bottom: 5px;
+      p {
+        font-size: 9px;
+        padding: 0px;
+        margin: 0px;
+      }
+    }
+    h1 {
+      margin: 0px;
+      padding: 0px;
+      font-size: 12px;
+      a.delete {
+        font-weight: 100;
+        font-size: 10px;
+      }
+    }
+  }
 }
 
-#idFrameE #ZTextMultiValued_values div table {
+
+/******* THESAURUS ************************************************************/
+$thesaurusBorderColor: #a9a9a9 !default;
+div.thesaurus {
+  margin-left: 2px;
+  white-space: nowrap;
+  p {
+    margin: 0;
+  }
+  div.c {
+    display: none
+  }
+}
+
+#idFrameE #TH_Ofull, #idFrameTH #TH_Oprop, #idFrameTH #TH_Oclip {
+  margin: 0;
+  padding: 0;
   width: 100%;
-  border: none;
 }
 
-#idFrameE #ZTextMultiValued_values div table td {
-  vertical-align: middle;
+#idFrameE {
+  div.searchZone {
+    position: absolute;
+    top: 0px;
+    left: 0px;
+    width: 100%;
+    height: 100%;
+    padding: 0px;
+    margin: 0px;
+    background: $thesaurusBg2;
+    border: $thesaurusBorderColor 1px solid;
+  }
+  div.thesaurus {
+    div.c {
+      display: none
+    }
+    div.o {
+      margin-bottom: 1px;
+      padding-bottom: 2px;
+      padding-left: 5px;
+      margin-left: 3px;
+      border-left: $thesaurusBorderColor 1px solid;
+      border-bottom: $thesaurusBorderColor 1px solid;
+    }
+    div.h {
+      margin-bottom: 1px;
+      padding-bottom: 2px;
+      padding-left: 5px;
+      margin-left: 3px;
+      border-left: $thesaurusBorderColor 1px solid;
+      border-bottom: $thesaurusBorderColor 1px solid;
+    }
+    u {
+      width: 9px;
+      height: 10px;
+      margin-right: 2px;
+      text-align: center;
+      display: inline-block;
+      font-size: 8px;
+      text-decoration: none;
+      background-color: #f0f0f0;
+      cursor: pointer;
+      color: black;
+      line-height: 10px;
+      &.w {
+        cursor: auto;
+      }
+    }
+    b {
+      cursor: pointer;
+    }
+  }
 }
-
-#idFrameE #ZTextMultiValued_values div table td.options {
-  width: 40px;
-  text-align: right;
-}
-
-#idFrameE #ZTextMultiValued_values div table td.options .add_all {
-  display: none;
-}
-
-#idFrameE #ZTextMultiValued_values div.hetero table td.options .add_all {
-  display: inline;
-}
-
-#idFrameE .hetero {
-  color: #ff8000;
-}
-
-#idFrameE #ZTextMultiValued_values DIV.hilighted {
-  background-color: $editTextMultiValueHighlightBg;
-}
-
-#idFrameE #ZTextMultiValued_values DIV I {
-  color: #FFFF00;
-  font-style: normal;
-  font-weight: 700;
-  background-color: #222222;
-}
-
-#idFrameE .EDIT_presets_list {
-  padding-left: 3px;
-  padding-right: 6px;
-}
-
-#idFrameE .EDIT_presets_list LI {
-  margin: 0px;
-}
-
-#idFrameE .EDIT_presets_list DIV {
-  display: none;
-  padding-left: 15px;
-  padding-bottom: 5px;
-}
-
-#idFrameE .EDIT_presets_list DIV P {
-  font-size: 9px;
-  padding: 0px;
-  margin: 0px;
-}
-
-#idFrameE .EDIT_presets_list LI.opened DIV {
-  display: block;
-}
-
-#idFrameE .EDIT_presets_list H1 {
-  margin: 0px;
-  padding: 0px;
-  font-size: 12px;
-}
-
-#idFrameE .EDIT_presets_list H1 A.delete {
-  font-weight: 100;
-  font-size: 10px;
-}
-
-#idFrameE .EDIT_presets_list LI .triDown {
-  display: none;
-}
-
-#idFrameE .EDIT_presets_list LI.opened .triRight {
-  display: none;
-}
-
-#idFrameE .EDIT_presets_list LI.opened .triDown {
-  display: inherit;
+#idFrameE .ui-tabs {
+  position: absolute;
+  top: 0px;
+  left: 10px;
+  bottom: 0px;
+  right: 0;
 }
diff --git a/resources/www/prod/skins/ui-components/_modal-export.scss b/resources/www/prod/skins/ui-components/_modal-export.scss
index 0761fecb15..e45e7d9de5 100644
--- a/resources/www/prod/skins/ui-components/_modal-export.scss
+++ b/resources/www/prod/skins/ui-components/_modal-export.scss
@@ -13,14 +13,14 @@
   font-weight: bold;
   font-size: 14px;
   line-height: 18px;
-  color: #FFFFFF;
+  color: $textPrimaryColor;
   text-decoration: none;
 }
 
 #printBox label, #download label,
 #sendmail label, #ftp label {
   line-height: 18px;
-  color: #FFFFFF;
+  color: $textPrimaryColor;
 }
 
 #sendmail p, #ftp p,
diff --git a/resources/www/prod/skins/ui-components/_modal-preferences.scss b/resources/www/prod/skins/ui-components/_modal-preferences.scss
index 390ce359b6..7c3b496e23 100644
--- a/resources/www/prod/skins/ui-components/_modal-preferences.scss
+++ b/resources/www/prod/skins/ui-components/_modal-preferences.scss
@@ -24,7 +24,7 @@
 
 #look_box h1, #basket_preferences h1 {
   margin: 5px 0;
-  color: #FFFFFF;
+  color: $textPrimaryColor;
   font-size: 12px;
   font-weight: bold;
 }
diff --git a/resources/www/prod/skins/ui-components/_modal-preview.scss b/resources/www/prod/skins/ui-components/_modal-preview.scss
index 3a87def32c..83e03ae2f7 100644
--- a/resources/www/prod/skins/ui-components/_modal-preview.scss
+++ b/resources/www/prod/skins/ui-components/_modal-preview.scss
@@ -24,7 +24,7 @@
 }
 
 #PREVIEWCURRENT li.selected {
-  background-color: #FFFFFF;
+  background-color: $bgInverseHoverColor;
 }
 
 #PREVIEWBOX li {
@@ -213,5 +213,5 @@
 
 .prevTrainCurrent .duration, .diapo .duration {
   background-color: black;
-  color: #FFFFFF;
+  color: $textPrimaryColor;
 }
diff --git a/resources/www/prod/skins/ui-components/_modal-publish.scss b/resources/www/prod/skins/ui-components/_modal-publish.scss
index 20df5bc078..09c7577434 100644
--- a/resources/www/prod/skins/ui-components/_modal-publish.scss
+++ b/resources/www/prod/skins/ui-components/_modal-publish.scss
@@ -31,13 +31,13 @@
 #publicator_selection {
   height: 190px;
   bottom: auto;
-  background-color: $publishDialogBg3;
+  background-color: $bridgeDialogBg3;
 }
 
 #publicator_selection > .PNB10 {
   overflow: auto;
   bottom: 50px;
-  background-color: $publishDialogBg4;
+  background-color: $bridgeDialogBg4;
 }
 
 #publicator_selection .btn {
@@ -83,95 +83,6 @@
   right: auto;
 }
 
-#dialog_publicator .ui-tabs-panel {
-  left: 200px;
-}
-
-#dialog_publicator .notice_box,
-#dialog_publicator .error_box {
-  color: #414141;
-  font-weight: bold;
-  margin: 5px auto;
-  padding: 5px 0;
-  text-align: center;
-  width: 90%;
-}
-
-#dialog_publicator .notice_box {
-  background-color: green;
-  color: #FFFFFF;
-}
-
-#dialog_publicator .error_box {
-  background-color: orange;
-}
-
-#dialog_publicator .api_banner {
-  height: 30px;
-  bottom: auto;
-  background-color: $publishDialogBg2;
-}
-
-#dialog_publicator .api_banner button {
-  border: 1px solid #515151;
-  background-color: #404040;
-}
-
-#dialog_publicator .api_banner .submenu.ui-buttonset {
-  z-index: 600;
-}
-
-#dialog_publicator .api_content {
-  top: 30px;
-  bottom: 25px;
-  color: $textPrimaryColor;
-}
-
-#dialog_publicator .api_content .blockmenu {
-  bottom: auto;
-  background-repeat: repeat-x;
-  background-position: left bottom;
-  z-index: 1000;
-  width:100%;
-  height:40px
-}
-
-#dialog_publicator .api_content .blockmenu a.selected,
-#dialog_publicator .api_banner a.selected {
-  font-weight: bold;
-  color: #0088CC;
-}
-
-#dialog_publicator .api_content .blockresponse {
-  padding: 0 10px;
-  top: 40px;
-  overflow: auto;
-  z-index: 200;
-}
-
-#dialog_publicator .api_content .blockresponse .form-actions {
-  background-color: $publishDialogBg;
-  border-top: none;
-  margin: 0;
-}
-
-#dialog_publicator .api_infos {
-  top: auto;
-  height: 25px;
-  background-image: url('#{$iconsPath}api_info.png');
-  background-repeat: repeat-x;
-  background-position: 0 0;
-  color: $textSecondaryColor;
-}
-
-#dialog_publicator .main_menu {
-  float: left;
-}
-
-#dialog_publicator .diapo .title {
-  height: 16px;
-  overflow: hidden;
-}
 
 #ul_main_pub_tabs {
   width: 200px;
@@ -206,7 +117,7 @@
 
 #dialog_publicator .duration_time {
   background-color: #000000;
-  color: #FFFFFF;
+  color: $textPrimaryColor;
   font-weight: bold;
   padding: 2px 4px;
   position: absolute;
@@ -295,11 +206,11 @@
 
 #dialog_publicator .api_content .element {
   padding: 5px;
-  color: #FFFFFF;
+  color: $textPrimaryColor;
 }
 
 #dialog_publicator .api_content .element.odd {
-  background-color: #414141;
+  background-color: #404040;
   -webkit-box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.25) inset, -2px -2px 4px rgba(0, 0, 0, 0.25) inset;
   -moz-box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.25) inset, -2px -2px 4px rgba(0, 0, 0, 0.25) inset;
   box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.25) inset, -2px -2px 4px rgba(0, 0, 0, 0.25) inset;
diff --git a/resources/www/prod/skins/ui-components/_pagination.scss b/resources/www/prod/skins/ui-components/_pagination.scss
index 93d15d2390..7471ff4d77 100644
--- a/resources/www/prod/skins/ui-components/_pagination.scss
+++ b/resources/www/prod/skins/ui-components/_pagination.scss
@@ -1,4 +1,22 @@
 
+#tool_navigate input {
+  text-align: center;
+}
+
+#tool_navigate a {
+  padding: 1px 5px;
+  margin: 0 4px;
+  background-color: #0077BC;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  font-size: 12px;
+  line-height: 14px;
+  font-weight: bold;
+  cursor: pointer;
+}
+
+
 #paginate {
   float: right;
   margin: 0 65px 15px 0;
diff --git a/resources/www/prod/skins/ui-components/_search-form.scss b/resources/www/prod/skins/ui-components/_search-form.scss
index 9d4c65bc6a..5bc6bee276 100644
--- a/resources/www/prod/skins/ui-components/_search-form.scss
+++ b/resources/www/prod/skins/ui-components/_search-form.scss
@@ -1,4 +1,10 @@
 /******* FORMULAIRE DE RECHERCHE **********************************************/
+form.phrasea_query input.query {
+  padding-left: 30px;
+  font-size: 16px;
+  margin: 0;
+  width: 59%;
+}
 
 .searchFormWrapper {
   margin: 30px 0 0 5px;
diff --git a/resources/www/prod/skins/ui-components/_thumb-extractor.scss b/resources/www/prod/skins/ui-components/_thumb-extractor.scss
index 8ac0a5e2c4..f5af2a0592 100644
--- a/resources/www/prod/skins/ui-components/_thumb-extractor.scss
+++ b/resources/www/prod/skins/ui-components/_thumb-extractor.scss
@@ -140,7 +140,7 @@
 }
 
 #thumbExtractor #thumb_wrapper img.selected {
-  border: 2px solid #FFFFFF;
+  border: 2px solid $bgInverseHoverColor;
 }
 
 #thumbExtractor #thumb_camera_button {
diff --git a/resources/www/prod/skins/ui-components/_upload.scss b/resources/www/prod/skins/ui-components/_upload.scss
index e8d67bafcd..27e41b77fb 100644
--- a/resources/www/prod/skins/ui-components/_upload.scss
+++ b/resources/www/prod/skins/ui-components/_upload.scss
@@ -4,18 +4,34 @@
 
 #uploadBox {
   height: 100%;
-}
-
-#uploadBox .clear {
-  clear: both;
-}
-
-#uploadBox .upload-tabs {
-  height: 100%;
-}
-
-#uploadBox .ui-tabs .ui-tabs-panel {
-  padding: 20px;
+  h5 {
+    margin-top: 20px;
+    margin-bottom: 10px;
+    font-size: 13px;
+    font-weight: bold;
+    text-align: left;
+  }
+  .clear {
+    clear: both;
+  }
+  .upload-tabs {
+    height: 100%;
+  }
+  .ui-tabs .ui-tabs-panel {
+    padding: 20px;
+  }
+  .well {
+    margin: 0;
+    padding: 0.5%;
+    color: $textPrimaryInverseColor;
+  }
+  #fileupload {
+    height: 97%;
+  }
+  span.comment {
+    font-style: italic;
+    color: $textSecondaryColor;
+  }
 }
 
 #uploadBoxLeft, #uploadBoxRight {
@@ -33,64 +49,6 @@
   float: right;
 }
 
-#uploadBox .well {
-  margin: 0;
-  padding: 0.5%;
-  color: $textPrimaryInverseColor;
-}
-
-#uploadBox #fileupload {
-  height: 97%;
-}
-
-#uploadBox h5 {
-  margin-top: 20px;
-  margin-bottom: 10px;
-  font-size: 13px;
-  font-weight: bold;
-  text-align: left;
-}
-
-#uploadBox span.comment {
-  font-style: italic;
-  color: $textSecondaryColor;
-}
-
-#uploadBox button.btn, #uploadBox span.btn {
-  font-family: verdana,"Helvetica Neue",Helvetica,Arial,sans-serif;
-  font-size: 12px;
-  font-weight: bold;
-  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-  -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-}
-
-#uploadBox .btn-inverse {
-  background-color: #D6D6D6;
-  *background-color: #D6D6D6;
-  background-image: -ms-linear-gradient(top, #FFFFFF, #D6D6D6);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#FFFFFF), to(#D6D6D6));
-  background-image: -webkit-linear-gradient(top, #FFFFFF, #D6D6D6);
-  background-image: -o-linear-gradient(top, #FFFFFF, #D6D6D6);
-  background-image: linear-gradient(top, #FFFFFF, #D6D6D6);
-  background-image: -moz-linear-gradient(top, #FFFFFF, #D6D6D6);
-  border-color: #D6D6D6 #D6D6D6 #bfbfbf;
-  border-bottom-color: #b3b3b3;
-  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#FFFFFF', endColorstr='#D6D6D6', GradientType=0);
-  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
-  *border: 1px solid #666666;
-  text-shadow: none;
-  color: #777777;
-  font-weight: bold;
-}
-
-#uploadBox .btn-inverse:hover, #uploadBox .disabled {
-  background-color: #D6D6D6;
-  *background-color: #D6D6D6;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  color: #FFFFFF;
-}
-
 #uploadBox .fileinput-button {
   position: relative;
   overflow: hidden;
diff --git a/resources/www/prod/skins/ui-components/_workzone-baskets.scss b/resources/www/prod/skins/ui-components/_workzone-baskets.scss
index 145c5e8ed0..2d1089dc57 100644
--- a/resources/www/prod/skins/ui-components/_workzone-baskets.scss
+++ b/resources/www/prod/skins/ui-components/_workzone-baskets.scss
@@ -1,242 +1,271 @@
-#BasketBrowser h1 {
-  font-size: 14px;
-  line-height: 20px;
-  margin: 0;
-  padding: 0;
-}
-#BasketBrowser .Browser{
-  background-color: #111111;
-}
-#BasketBrowser .Basket{
-  background-color: #111111;
-  display:none;
-}
-#BasketBrowser .Basket .thumb_wrapper {
-  margin:5px;
-}
+/* workzone brower - DEPRECATED - #BasketBrowser {
+  h1 {
+    font-size: 14px;
+    line-height: 20px;
+    margin: 0;
+    padding: 0;
+  }
+  .Browser{
+    background-color: #111111;
+  }
+  .Basket{
+    background-color: #111111;
+    display:none;
+    .thumb_wrapper {
+      margin:5px;
+    }
+  }
+  .result{
+    position:relative;
+    height:100px;
+    &.odd{
+      background-color:#404040;
+    }
+    .PNB10 {
+      overflow: hidden;
+    }
+    .datas{
+      top:50px;
+      bottom:50px;
+      overflow-y:auto;
+      overflow-x:hidden;
+    }
+    .footer,
+    .header{
+      height:50px;
+    }
+    .header{
+      bottom:auto;
+    }
+    .footer{
+      top:auto;
+    }
+    table{
+      height:80px;
+    }
+    td {
+      &.content{
+        width:390px;
+        vertical-align:top;
+      }
+      &.thumbnail{
+        display: table-cell;
+        width: 105px;
+        height: 80px;
+        padding: 0;
+        border: none;
+        border-radius: 0;
+        box-shadow: none;
+        line-height: 18px;
+        text-align: center;
+        vertical-align:top;
+        .counter{
+          bottom: 18px;
+          font-size: 14px;
+          position: relative;
+          right: 5px;
+          text-align: right;
+        }
+      }
+    }
+  }
+  h1.title{
+    font-size:14px;
+    .loader{
+      display:none;
+      margin:4px;
+    }
+  }
+  img{
+    vertical-align: middle;
+  }
+  table{
+    width:100%;
+    border:none;
+    vertical-align:top;
+    td.paginator{
+      text-align:right;
+    }
+  }
+  label {
+    cursor:pointer;
+    color:#9a9a9a;
+  }
+  input {
+    display:none;
+    &.Query {
+      padding: 3px;
+      display: block;
+      border-radius: 4px;
+      width: 155px;
+      padding-left: 25px;
+    }
+  }
+  input:checked + label,
+  label.selected {
+    color: #d18827;
+  }
+  form {
+    h1{
+      margin:10px 0;
+    }
+    ul {
 
-#BasketBrowser .result{
-  position:relative;
-  height:100px;
-}
-#BasketBrowser .result .PNB10 {
-  overflow: hidden;
-}
+      li{
+        padding:5px 0;
+        border-top:1px solid #9A9A9A;
+        &.first{
+          border-top:none;
+        }
+        label{
+          margin: 0 0 0 40px;
+        }
+      }
+    }
+  }
+}*/
 
-#BasketBrowser .results .datas{
-  top:50px;
-  bottom:50px;
-  overflow-y:auto;
-  overflow-x:hidden;
-}
-#BasketBrowser .results .footer,
-#BasketBrowser .results .header{
-  height:50px;
-}
-#BasketBrowser .results .header{
-  bottom:auto;
-}
-#BasketBrowser .results .footer{
-  top:auto;
-}
-
-#BasketBrowser .result table{
-  height:80px;
-}
-
-#BasketBrowser .result.odd{
-  background-color:#404040;
-}
-
-#BasketBrowser .result td.thumbnail{
-  display: table-cell;
-  width: 105px;
-  height: 80px;
-  padding: 0;
-  border: none;
-  border-radius: 0;
-  box-shadow: none;
-  line-height: 18px;
-  text-align: center;
-  vertical-align:top;
-}
-
-#BasketBrowser .result td.thumbnail .counter{
-  bottom: 18px;
-  font-size: 14px;
-  position: relative;
-  right: 5px;
-  text-align: right;
-}
-
-#BasketBrowser .result td.content{
-  width:390px;
-  vertical-align:top;
-}
-
-#BasketBrowser .results .result h1.title{
-  font-size:14px;
-}
-
-#BasketBrowser h1.title .loader{
-  display:none;
-  margin:4px;
-}
-
-#BasketBrowser img{
-  vertical-align: middle;
-}
-
-#BasketBrowser table{
-  width:100%;
-  border:none;
-  vertical-align:top;
-}
-
-#BasketBrowser table td.paginator{
-  text-align:right;
-}
-
-#BasketBrowser label {
-  cursor:pointer;
-  color:#9a9a9a;
-}
-
-#BasketBrowser input {
-  display:none;
-}
-#BasketBrowser input:checked + label,
-#BasketBrowser label.selected {
-  color: #d18827;
-}
-
-#BasketBrowser input.Query {
-  padding:3px;
-  display:block;
-  border-radius:4px;
-  width:155px;
-  padding-left:25px;
-}
-
-#BasketBrowser form h1{
-  margin:10px 0;
-}
-#BasketBrowser form ul li{
-  padding:5px 0;
-  border-top:1px solid #9A9A9A;
-}
-#BasketBrowser form ul li.first{
-  border-top:none;
-}
-#BasketBrowser form ul li label{
-  margin: 0 0 0 40px;
-}
-
-
-#baskets .SSTT.active {
-  border: 1px solid #b1b1b1;
-}
-
-#baskets .SSTT .title {
-  overflow: hidden;
-  left: 30px;
-  right: 40px;
-  height: 16px;
-  margin: 2px 0;
-  font-size: 12px;
-}
-
-#baskets .SSTT .menu {
-  text-align: right;
+#idFrameC #baskets .alert_datas_changed {
   position: absolute;
+  top: 5px;
+  height: 20px;
+  right: 26px;
+  left: 10px;
+  background-color: $workzoneBasketAlertDataBg;
+  color: $workzoneBasketAlertDataColor;
+  text-align: center;
+  font-weight: bold;
+  font-size: 12px;
+  display: none;
+  z-index: 5000;
+}
+
+#idFrameC #baskets .content.grouping .alert_datas_changed,
+#idFrameC #baskets .content.basket .alert_datas_changed {
+  position: relative;
+  margin: 10px 0;
   right: 0;
+  left: 0;
+}
+
+#idFrameC #baskets .bloc {
+  position: absolute;
+  top: 31px;
+  left: 0pt;
+  right: 1px;
+  bottom: 0px;
+  overflow-y: auto;
+  overflow-x: hidden;
+}
+
+#baskets .insidebloc {
   top: 0;
-  padding: 3px;
-  margin: 0 5px 0 0;
 }
 
-#baskets .SSTT .menu table td {
-  width:20px;
+#baskets .top-scroller,
+#baskets .bottom-scroller {
+  height: 80px;
+  position: absolute;
+  border: none;
+  top: 0px;
+  bottom: 0;
+  left: 0;
+  right: 0;
 }
 
-#baskets .SSTT .workzone-menu-title {
-  text-overflow: ellipsis;
-  padding-right:65px;
-  overflow: hidden;
-  white-space: nowrap;
-  display: block;
+#baskets .top-scroller {
+  bottom: auto;
 }
 
-#baskets .menu .contextMenuTrigger {
-  cursor: pointer;
-  display: block;
-  padding: 0;
-  margin: 0;
-  background: url('#{$iconsPath}contextMenuTrigger.png') 0 13px no-repeat;
-  height: 45px;
-  width: 13px;
+#baskets .bottom-scroller {
+  top: auto;
+}
+
+#idFrameC #baskets .bloc.groupDrop {
+  border: 3px solid #a00;
+}
+
+#baskets {
+  > div {
+    border-top: 1px solid $proposalsBorder;
+  }
+  .SSTT {
+    &.active {
+      border: 1px solid #b1b1b1;
+      &.ui-corner-top {
+        border: none;
+        border-top: 1px solid #000;
+        top: 0;
+        background-color: #212121;
+      }
+    }
+    &.grouping {
+      &.active {
+        border: 1px solid #2f4a6f;
+        &.ui-corner-top {
+          border-bottom: none;
+        }
+      }
+    }
+    .title {
+      overflow: hidden;
+      left: 30px;
+      right: 40px;
+      height: 16px;
+      margin: 2px 0;
+      font-size: 12px;
+    }
+    .menu {
+      text-align: right;
+      position: absolute;
+      right: 0;
+      top: 0;
+      padding: 3px;
+      margin: 0 5px 0 0;
+      table td {
+        width: 20px;
+      }
+    }
+    .workzone-menu-title {
+      text-overflow: ellipsis;
+      padding-right: 65px;
+      overflow: hidden;
+      white-space: nowrap;
+      display: block;
+    }
+    img {
+      max-height: 18px;
+      vertical-align: middle;
+      cursor: help;
+      margin-right: 9px;
+    }
+  }
+  .menu {
+    .contextMenuTrigger {
+      cursor: pointer;
+      display: block;
+      padding: 0;
+      margin: 0;
+      background: url('#{$iconsPath}contextMenuTrigger.png') 0 13px no-repeat;
+      height: 45px;
+      width: 13px;
+    }
+  }
+  .ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited {
+    color: $textPrimaryActiveColor;
+    font-size: 1em;
+  }
 }
 
 /** hack IE7 only */
-*:first-child+html .workzone-menu-title {
-  margin-right:65px;
-}
-
-#baskets .SSTT img {
-  max-height: 18px;
-  vertical-align: middle;
-  cursor: help;
-  margin-right: 9px;
-}
-
-#baskets .SSTT.grouping.active {
-  border: 1px solid #2f4a6f;
-}
-
-#baskets .SSTT.grouping.active.ui-corner-top {
-  border-bottom: none;
-}
-
-#baskets .SSTT.active.ui-corner-top {
-  border: none;
-  border-top: 1px solid #000;
-  top: 0;
-  background-color: #212121;
+*:first-child + html .workzone-menu-title {
+  margin-right: 65px;
 }
 
 .ui-accordion .ui-accordion-header.baskDrop {
   color: red;
 }
 
-form.phrasea_query input.query {
-  padding-left: 30px;
-  font-size: 16px;
-  margin: 0;
-  width: 59%;
-}
-
-#basket-rename-box .btn, #reorder_box .btn {
-  font-family: verdana,"Helvetica Neue",Helvetica,Arial,sans-serif;
-  font-size: 12px;
-  font-weight: bold;
-  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-  -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-}
-
-#basket-rename-box .btn-inverse, #reorder_box .btn-inverse {
-  *border: 1px solid #515151;
-  color: #AAAAAA;
-}
-
-#basket-rename-box .btn-inverse:hover, #reorder_box .btn-inverse:hover {
-  color: #FFFFFF;
-}
-
-#baskets .ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited {
-  color: #FFFFFF;
-  font-size: 1em;
-}
 #basket_menu_trigger {
   padding: 32px 7px 0 0;
   float: right;
@@ -244,7 +273,6 @@ form.phrasea_query input.query {
   cursor: pointer;
 }
 
-
 .CHIM.diapo {
   width: 100px;
   overflow: hidden;
@@ -271,7 +299,7 @@ form.phrasea_query input.query {
   vertical-align: middle;
 }
 
-.CHIM.diapo .bottom span,.CHIM.diapo .bottom img {
+.CHIM.diapo .bottom span, .CHIM.diapo .bottom img {
   cursor: pointer;
   vertical-align: middle;
   color: $textPrimaryColor;
diff --git a/resources/www/prod/skins/ui-components/_workzone-proposals.scss b/resources/www/prod/skins/ui-components/_workzone-proposals.scss
index 50d253e3bb..a1b1708857 100644
--- a/resources/www/prod/skins/ui-components/_workzone-proposals.scss
+++ b/resources/www/prod/skins/ui-components/_workzone-proposals.scss
@@ -17,7 +17,7 @@
       font-size: 13px;
     }
     &.fancytree-container {
-      background-color: $col1;
+      background-color: $backgroudSecondaryColor;
       border: 0px none transparent;
       overflow-x: hidden;
       padding-left: 0;
@@ -33,9 +33,9 @@
           line-height: 25px;
           white-space: pre-line !important;
           &:hover {
-            background-color: #4c5d84;
+            background-color: $proposalColor;
             .fancytree-title {
-              color: #FFFFFF;
+              color: $textPrimaryHoverColor;
             }
           }
         }
@@ -47,17 +47,17 @@
     height: 49px;
     line-height: 49px;
     margin-left: 0;
-    border-left: 4px solid $col1;
+    border-left: 4px solid $backgroudSecondaryColor;
     border-bottom: 1px solid $proposalsTitleBorder;
     .fancytree-title {
       font-size: 12px;
       margin-left: 10px;
     }
     &:hover {
-      border-left: 4px solid #4c5d84;
-      color: #FFFFFF;
+      border-left: 4px solid $proposalColor;
+      color: $textPrimaryHoverColor;
       .fancytree-title {
-        color: #FFFFFF;
+        color: $textPrimaryHoverColor;
       }
     }
     .fancytree-expander {
@@ -67,7 +67,7 @@
       }
       &:hover {
         &:before {
-          color: #076882;
+          color: $basketsColor;
         }
       }
 
@@ -76,7 +76,7 @@
   .fancytree-expanded {
     .fancytree-expander:before {
       content: '\25BC'; /* U+25BC BLACK BLACK DOWN-POINTING TRIANGLE */
-      color: #ffffff;
+      color: $textPrimaryHoverColor;
     }
   }
 
@@ -108,7 +108,7 @@
     vertical-align: middle;
     border-radius: 4px;
     right: 28px;
-    background-color: #4c5d84;
+    background-color: $proposalColor;
     padding-left: 13px;
     padding-right: 13px;
     margin-top: 11px;
diff --git a/resources/www/prod/skins/ui-components/_workzone-thesaurus.scss b/resources/www/prod/skins/ui-components/_workzone-thesaurus.scss
index 779d689cca..e62c013e95 100644
--- a/resources/www/prod/skins/ui-components/_workzone-thesaurus.scss
+++ b/resources/www/prod/skins/ui-components/_workzone-thesaurus.scss
@@ -1,12 +1,10 @@
-.treeview li {
-  color: #a1a1a1;
-  vertical-align: middle;
-  background-image: none;
-  .hitarea {
-    background: none;
-    width: 100%;
-    height: 100%;
-    position: absolute;
+
+.treeview {
+
+  li {
+    color: #a1a1a1;
+    vertical-align: middle;
+    background-image: none;
   }
   > li.expandable {
     min-height: 50px;
@@ -20,20 +18,21 @@
     > .hitarea {
       height: 51px;
       background: url('#{$iconsPath}sprite_tree_first.png') 99% 22px no-repeat;
-      border-left: 5px $col1 solid;
+      border-left: 5px $backgroudSecondaryColor solid;
       &:hover,
-      &.active{
-        border-left: 5px #884c93 solid;
+      &.active {
+        border-left: 5px $thesaurusColor solid;
       }
     }
   }
-}
-.treeview {
+  .hitarea {
+    background: none;
+    width: 100%;
+    height: 100%;
+    position: absolute;
+  }
   ul {
     li {
-      &:hover {
-        color: $textPrimaryColor;
-      }
       .hitarea {
         background: url('#{$iconsPath}icon_tree.png') 0 0 no-repeat;
         position: relative;
@@ -41,11 +40,14 @@
         width: 9px;
         margin-top: 5px;
       }
-      span.h {
-        color: #884c92 !important;
+      &:hover {
+        color: $textPrimaryColor;
       }
       span {
         color: #a6a6a6;
+        &.h {
+          color: $thesaurusColor !important;
+        }
       }
     }
   }
@@ -81,12 +83,12 @@ dans l'onglet thesaurus : arbres, menus contextuels
 
 #THPD_tabs {
   right: 0;
-  .ui-tabs-nav{
+  .ui-tabs-nav {
     .ui-state-default A {
       color: $thesaurusContextMenuColor;
     }
     .ui-tabs-active A {
-      color: #FFFFFF;
+      color: $textPrimaryActiveColor;
       text-decoration: underline;
     }
   }
@@ -119,8 +121,8 @@ dans l'onglet thesaurus : arbres, menus contextuels
   }
 
   .treeview LI.selected SPAN {
-    background-color: #884c92 !important;
-    color: #FFFFFF !important;
+    background-color: $thesaurusColor !important;
+    color: $textPrimaryActiveColor !important;
   }
 
   .treeview LI.selected SPAN {
@@ -136,11 +138,11 @@ dans l'onglet thesaurus : arbres, menus contextuels
   }
 }
 
-
 #THPD_T, #THPD_C {
   margin-top: 10px;
   margin-left: 0px;
 }
+
 #THPD_WIZARDS {
   .gform {
     .input-append {
@@ -165,7 +167,7 @@ dans l'onglet thesaurus : arbres, menus contextuels
         vertical-align: middle;
         padding: 0;
         border-radius: 0;
-        background: $col1 url('#{$iconsPath}icon_magnify.png') 50% no-repeat;
+        background: $backgroudSecondaryColor url('#{$iconsPath}icon_magnify.png') 50% no-repeat;
         border: none;
         margin: 0;
         outline: none;
@@ -194,84 +196,3 @@ dans l'onglet thesaurus : arbres, menus contextuels
   }
 }
 
-/******* THESAURUS ************************************************************/
-
-div.thesaurus {
-  margin-left: 2px;
-  white-space: nowrap;
-  p {
-    margin: 0;
-  }
-  div.c {
-    display: none
-  }
-}
-
-#idFrameE #TH_Ofull, #idFrameTH #TH_Oprop, #idFrameTH #TH_Oclip {
-  margin: 0;
-  padding: 0;
-  width: 100%;
-}
-
-#idFrameE {
-  div.searchZone {
-    position: absolute;
-    top: 0px;
-    left: 0px;
-    width: 100%;
-    height: 100%;
-    PADDING: 0px;
-    MARGIN: 0px;
-    BACKGROUND: $thesaurusBg2;
-    BORDER: #a9a9a9 1px solid;
-  }
-
-  div.thesaurus div.c {
-    DISPLAY: none
-  }
-
-  div.thesaurus div.o {
-    MARGIN-BOTTOM: 1px;
-    PADDING-BOTTOM: 2px;
-    PADDING-LEFT: 5px;
-    MARGIN-LEFT: 3px;
-    BORDER-LEFT: #a9a9a9 1px solid;
-    BORDER-BOTTOM: #a9a9a9 1px solid;
-  }
-
-  div.thesaurus div.h {
-    MARGIN-BOTTOM: 1px;
-    PADDING-BOTTOM: 2px;
-    PADDING-LEFT: 5px;
-    MARGIN-LEFT: 3px;
-    BORDER-LEFT: #a9a9a9 1px solid;
-    BORDER-BOTTOM: #a9a9a9 1px solid;
-  }
-
-  div.thesaurus u {
-    width: 9px;
-    height: 10px;
-    MARGIN-RIGHT: 2px;
-    text-align: center;
-    display: inline-block;
-    font-size: 8px;
-    TEXT-DECORATION: none;
-    BACKGROUND-COLOR: #F0F0F0;
-    cursor: pointer;
-    color: black;
-    line-height: 10px;
-  }
-
-  div.thesaurus b {
-    cursor: pointer;
-  }
-
-  div.thesaurus i {
-    FONT-STYLE: normal;
-    cursor: pointer;
-  }
-
-  div.thesaurus u.w {
-    cursor: auto;
-  }
-}
diff --git a/resources/www/prod/skins/ui-components/_workzone.scss b/resources/www/prod/skins/ui-components/_workzone.scss
index 2febd8c008..ce559a5d5a 100644
--- a/resources/www/prod/skins/ui-components/_workzone.scss
+++ b/resources/www/prod/skins/ui-components/_workzone.scss
@@ -1,206 +1,151 @@
-#idFrameC .wrapper {
-  background-color: $workzoneBg;
-  right: 10px;
-  border-top: 1px solid $workzoneBorderTop;
+#idFrameC {
+  .wrapper {
+    background-color: $workzoneBg;
+    right: 10px;
+    border-top: 1px solid $workzoneBorderTop;
+  }
+
+  .ui-tabs {
+    position: absolute;
+    top: 0px;
+    left: 0px;
+    bottom: 0px;
+    right: 0;
+    .ui-tabs-nav {
+      li {
+        width: auto;
+        height: 85px;
+        display: inline-block;
+        background-color: $backgroudSecondaryColor;
+        z-index: 10;
+        border-radius: 0;
+        &.proposals_WZ {
+          &.ui-state-active {
+            a {
+              border-bottom: 3px solid $proposalColor;
+            }
+          }
+          &.active {
+            img.proposals_off {
+              display: none;
+            }
+          }
+          img.proposals_on {
+            display: none;
+          }
+        }
+
+        /*&.proposals_WZ.ui-state-active a {
+          border-bottom: 3px solid #4c5d84;
+        }*/
+        &.thesaurus.ui-state-active a {
+          border-bottom: 3px solid $thesaurusColor;
+        }
+        &.baskets.ui-state-active a {
+          border-bottom: 3px solid $basketsColor;
+        }
+        a {
+          padding: 0;
+          margin: 0;
+          border-radius: 0;
+          &.escamote {
+            margin: 25px 25px 0 0;
+          }
+        }
+        &:hover {
+          a {
+            background-color: $workzoneTabBgHover;
+            border-bottom: 3px solid $workzoneTabBgHover;
+          }
+        }
+        &.ui-state-active {
+          a {
+            background-color: $workzoneTabBgActive;
+            border-bottom: 1px solid $thesaurusColor;
+            height: 82px;
+          }
+        }
+      }
+    }
+    #thesaurus_tab {
+      li {
+        a {
+          color: $textPrimaryColor;
+        }
+        &.th_tab {
+          height: 43px;
+          margin: 0;
+          .ui-state-active {
+            border-bottom: 1px solid $thesaurusColor;
+          }
+          a {
+            height: 43px;
+            line-height: 43px;
+            vertical-align: middle;
+            margin: 0;
+            padding: 0 20px;
+            display: block;
+            text-decoration: none;
+          }
+        }
+      }
+    }
+  }
+  ul.icon-menu {
+    width: 100%;
+  }
+  .icon-menu {
+    .WZtabs {
+      display: block;
+      width: 70px;
+      height: 82px;
+      line-height: 82px;
+      vertical-align: middle;
+      text-align: center;
+    }
+    .WZbasketTab {
+      display: block;
+      background-image: url('#{$iconsPath}workzone32.png');
+      background-repeat: no-repeat;
+      background-position: 9px 21px;
+      width: 70px;
+      height: 82px;
+    }
+  }
+  .closed {
+    .icon-menu li {
+      clear: left;
+    }
+  }
+  .ui-tabs-panel,
+  .ui-resizable-handle {
+    display: none;
+  }
+  .tools {
+    //text-align: center;
+    text-align: left !important;
+    button {
+      background-color: transparent;
+      border: none;
+      width: 16px;
+      height: 22px;
+      cursor: pointer;
+      padding: 0px;
+    }
+    label {
+      display: inline;
+      margin: 0 15px 0 0;
+      float: left;
+      font-size: 11px;
+      color: $workzoneToolsLabelColor;
+      line-height: 22px;
+      vertical-align: middle;
+    }
+  }
 }
 
-
-#idFrameC .ui-tabs .ui-tabs-nav li {
-  width: auto;
-  height: 85px;
-  display: inline-block;
-  background-color: $col1;
-  z-index: 10;
-}
-
-#idFrameC .ui-tabs .ui-tabs-nav li.proposals_WZ.ui-state-active a {
-  border-bottom: 3px solid #4c5d84;
-}
-
-#idFrameC .ui-tabs .ui-tabs-nav li.thesaurus.ui-state-active a {
-  border-bottom: 3px solid #884c92;
-}
-
-#idFrameC .ui-tabs .ui-tabs-nav li.baskets.ui-state-active a {
-  border-bottom: 3px solid #076882;
-}
-
-
-#idFrameC .ui-tabs #thesaurus_tab li a {
-  color: #FFFFFF;
-}
-
-#idFrameC .ui-tabs #thesaurus_tab li.th_tab a {
-  height: 43px;
-  line-height: 43px;
-  vertical-align: middle;
-  margin: 0;
-  padding: 0 20px;
-  display: block;
-  text-decoration: none;
-}
-
-#idFrameC .ui-tabs #thesaurus_tab li.th_tab .ui-state-active {
-  border-bottom: 1px solid #884c92;
-}
-
-#idFrameC .ui-tabs #thesaurus_tab li.th_tab {
-  height: 43px;
-  margin: 0;
-}
-
-#idFrameC .ui-tabs .ui-tabs-nav li {
-  border-radius: 0;
-}
-
-#idFrameC .ui-tabs .ui-tabs-nav li a {
-  padding: 0;
-  margin: 0;
-  border-radius: 0;
-}
-
-#idFrameC .ui-tabs .ui-tabs-nav li a.escamote {
-  margin:25px 25px 0 0;
-}
-
-#idFrameC .ui-tabs .ui-tabs-nav li:hover a {
-  background-color: $workzoneTabBgHover;
-}
-
-#idFrameC .ui-tabs .ui-tabs-nav li.ui-state-active a {
-  background-color: $workzoneTabBgActive;
-  border-bottom: 1px solid #884c92;
-  height: 82px;
-}
-
-#idFrameC ul.icon-menu {
-  width: 100%;
-}
-
-#idFrameC .icon-menu .WZbasketTab {
-  display: block;
-  background-image: url('#{$iconsPath}workzone32.png');
-  background-repeat: no-repeat;
-  background-position: 9px 21px;
-  width: 70px;
-  height: 82px;
-}
-
-#idFrameC .icon-menu .WZtabs {
-  display: block;
-  width: 70px;
-  height: 82px;
-  line-height: 82px;
-  vertical-align: middle;
-  text-align: center;
-}
-
-#idFrameC.closed .icon-menu li {
-  clear: left;
-}
-
-#idFrameC.closed .ui-tabs-panel,
-#idFrameC.closed .ui-resizable-handle {
-  display: none;
-}
-
-#idFrameC li.proposals_WZ.active img.proposals_off,
-#idFrameC li.proposals_WZ img.proposals_on {
-  display: none;
-}
-
-/******* BASKETS **************************************************************/
-
-#idFrameC .tools {
-  text-align: center;
-}
-
-#idFrameC .tools button {
-  background-color:  transparent;
-  border: none;
-  width: 16px;
-  height: 22px;
-  cursor: pointer;
-  padding: 0px;
-}
-
-#idFrameC #baskets .alert_datas_changed {
-  position: absolute;
-  top: 5px;
-  height: 20px;
-  right: 26px;
-  left: 10px;
-  background-color: $workzoneBasketAlertDataBg;
-  color: $workzoneBasketAlertDataColor;
-  text-align: center;
-  font-weight: bold;
-  font-size: 12px;
-  display: none;
-  z-index: 5000;
-}
-
-#idFrameC #baskets .content.grouping .alert_datas_changed,
-#idFrameC #baskets .content.basket .alert_datas_changed {
-  position: relative;
-  margin: 10px 0;
-  right: 0;
-  left: 0;
-}
-
-#idFrameC #baskets .bloc {
-  position: absolute;
-  top: 31px;
-  left: 0pt;
-  right: 1px;
-  bottom: 0px;
-  overflow-y: auto;
-  overflow-x: hidden;
-}
-
-#baskets .insidebloc {
-  top: 0;
-}
-
-#baskets .top-scroller,
-#baskets .bottom-scroller {
-  height: 80px;
-  position: absolute;
-  border: none;
-  top: 0px;
-  bottom: 0;
-  left: 0;
-  right: 0;
-}
-
-#baskets .top-scroller {
-  bottom: auto;
-}
-
-#baskets .bottom-scroller {
-  top: auto;
-}
-
-#idFrameC #baskets .bloc.groupDrop {
-  border: 3px solid #a00;
-}
-
-#idFrameC .ui-tabs {
-  position: absolute;
-  top: 0px;
-  left: 0px;
-  bottom: 0px;
-  right: 0;
-}
-
-#idFrameE .ui-tabs {
-  position: absolute;
-  top: 0px;
-  left: 10px;
-  bottom: 0px;
-  right: 0;
-}
-
-#idFrameC .ui-tabs .ui-tabs-nav,#idFrameE .ui-tabs .ui-tabs-nav {
+#idFrameC .ui-tabs .ui-tabs-nav,
+#idFrameE .ui-tabs .ui-tabs-nav {
   background-color: transparent;
   top: 0px;
   left: 10px;
@@ -212,7 +157,8 @@
   border-bottom: 1px solid $workzoneTabBorderBottom;
 }
 
-#idFrameC .ui-tabs .ui-tabs-panel,#idFrameE .ui-tabs .ui-tabs-panel {
+#idFrameC .ui-tabs .ui-tabs-panel,
+#idFrameE .ui-tabs .ui-tabs-panel {
   position: absolute;
   top: 56px;
   left: 0px;
@@ -221,21 +167,6 @@
 }
 
 .alert_datas_changed a {
-  color: #414141;
+  color: #404040;
   text-decoration: underline;
 }
-
-#idFrameC .tools {
-  text-align: left !important;
-}
-
-#idFrameC .tools label {
-  display: inline;
-  margin: 0 15px 0 0;
-  float: left;
-  font-size: 11px;
-  color: $workzoneToolsLabelColor;
-  line-height: 22px;
-  vertical-align: middle;
-}
-
diff --git a/templates/web/common/dialog_export.html.twig b/templates/web/common/dialog_export.html.twig
index 0d59a132f7..8ced25e555 100644
--- a/templates/web/common/dialog_export.html.twig
+++ b/templates/web/common/dialog_export.html.twig
@@ -618,14 +618,14 @@
                 dialog.Close();
             });
 
-            define([
+            /*define([
                 "common/geonames"
             ], function (geonames) {
                 geonames.init($('#command_geoname_field'), {
                     "server": "{{ app['geonames.server-uri'] }}",
                     "limit": 40
                 });
-            });
+            });*/
 
 
 
diff --git a/templates/web/common/menubar.html.twig b/templates/web/common/menubar.html.twig
index df8d14f53d..59cfb19f67 100644
--- a/templates/web/common/menubar.html.twig
+++ b/templates/web/common/menubar.html.twig
@@ -9,7 +9,7 @@
         {% if module is defined and module != "lightbox" and app.getAuthenticator().isAuthenticated() %}
           <li>
               <a target="_blank" href="{{ path('prod') }}">
-                <span class="">
+                <span class="{% if module is defined and module == "prod" %}selected{% endif %}">
                   {{ 'admin::monitor: production' | trans }}
                 </span>
               </a>
diff --git a/templates/web/prod/upload/upload.html.twig b/templates/web/prod/upload/upload.html.twig
index 9d97562e53..cdb4da13ec 100644
--- a/templates/web/prod/upload/upload.html.twig
+++ b/templates/web/prod/upload/upload.html.twig
@@ -27,7 +27,7 @@
                         <table id="addFileList">
                             <tr>
                                 <td class='uploader-button'>
-                                    <span class="btn btn-inverse fileinput-button input-medium">
+                                    <span class="btn fileinput-button input-medium">
                                         <span>{{ 'Select files...' | trans }}</span>
                                         <input type="file" name="files[]" multiple>
                                     </span>
@@ -100,8 +100,8 @@
                         <div class='upload-box' style="display: none;">
                             {% set quantity = '<span class="number-files">0</span>' %}
                             <h5>{% trans with {'%quantity%' : quantity} %}%quantity% selected files{% endtrans %}</h5>
-                            <button type="button" class="clear-queue btn btn-inverse input-medium" style="margin-bottom: 10px;">{{ 'Clear list' | trans }}</button>
-                            <button type="button" class="upload-submitter btn btn-inverse input-medium" style="margin-bottom: 10px;">{{ 'Send' | trans }}</button>
+                            <button type="button" class="clear-queue btn input-medium" style="margin-bottom: 10px;">{{ 'Clear list' | trans }}</button>
+                            <button type="button" class="upload-submitter btn input-medium" style="margin-bottom: 10px;">{{ 'Send' | trans }}</button>
                             <div class="clear"></div>
                             <div class='upload-box-addedfiles'></div>
                             <div class="clear"></div>