36 files changed, 2892 insertions, 1401 deletions
diff --git a/main/survey/skins/1kaBlack.css b/main/survey/skins/1kaBlack.css
index 48698bd..39958bc 100644
--- a/main/survey/skins/1kaBlack.css
+++ b/main/survey/skins/1kaBlack.css
@@ -6,13 +6,14 @@
 /*
 	Osnovna tema ankete - 1ka - brez definiranih barv
 */
+/* Barve */
 /* Fonti */
 body {
   margin: 0;
   padding: 0;
-  color: #505050;
+  color: #333333;
   font-size: 100%;
-  font-family: Montserrat, Arial, Sans-Serif !important;
+  font-family: Source Sans Pro, sans-serif !important;
   background: #ffffff;
 }
 
@@ -28,13 +29,15 @@ body.preview, body.testdata {
   position: absolute;
   width: 100%;
   height: 80px;
-  border-bottom: 6px #333333 solid;
+  border-bottom: 2px #333333 solid;
 }
 #outercontainer #container {
   position: relative;
   width: 100%;
   max-width: 1200px;
-  margin: 0px auto 10px;
+  margin: 0px auto;
+  padding: 0 16px;
+  box-sizing: border-box;
 }
 
 /* Warning bar (preview, cookie) */
@@ -69,12 +72,14 @@ body.preview, body.testdata {
 
 /* Header - logo, naslov, progressbar */
 h1 {
-  margin: 0px auto 30px;
-  padding: 120px 0 50px 0;
-  font-size: 28px;
+  margin: 0px auto;
+  padding: 114px 0 32px 0;
+  font-size: 32px;
+  font-weight: 600;
+  line-height: 40px;
   color: #333333;
   text-align: center;
-  border-bottom: 1px solid #eaeaea;
+  border-bottom: 1px solid #E5E5E5;
 }
 
 h1.evalvacija {
@@ -83,10 +88,10 @@ h1.evalvacija {
 
 #logo {
   right: auto;
-  left: 25px;
+  left: 16px;
   top: 13px;
   max-height: 56px !important;
-  background: url("../../../public/img/logo/1ka_slo.svg");
+  background: url("../../../public/img/logo/1ka_logo_slo.svg");
   background-repeat: no-repeat !important;
   background-size: auto 100% !important;
 }
@@ -96,7 +101,19 @@ h1.evalvacija {
 }
 
 #logo.english {
-  background: url("../../../public/img/logo/1ka_eng.svg");
+  background: url("../../../public/img/logo/1ka_logo_eng.svg");
+}
+
+#logo.namestitev {
+  background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
+#logo.namestitev.english {
+  background: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
+#logo.arnes {
+  background: url("../../../public/img/logo/1ka_logo_arnes.svg");
 }
 
 .header_settings_holder {
@@ -105,11 +122,11 @@ h1.evalvacija {
   left: auto;
 }
 .header_settings_holder .progress_bar span {
-  float: left !important;
-  /* ie6,7 doesnt support inline-block */
+  float: left !important; /* ie6,7 doesnt support inline-block */
   display: block;
   width: 20px;
-  font-size: 11px;
+  font-size: 14px;
+  line-height: 16px;
   color: #6D87AF;
 }
 .header_settings_holder .progress_bar div {
@@ -144,21 +161,38 @@ h1.evalvacija {
   color: #595959;
 }
 
+/* Uvod in zakljucek */
+.intro .spremenljivka .naslov,
+.concl .spremenljivka .naslov {
+  margin: 0;
+}
+
+#continue_later input[type=email],
+#return_edit input[type=email] {
+  margin-left: 4px;
+}
+#continue_later button,
+#return_edit button {
+  padding: 7px 20px;
+  margin-left: 4px;
+}
+
 /* Spremenljivke */
 .spremenljivka {
-  margin: 20px 10px 20px 10px;
-  padding: 20px 2px 50px 12px !important;
-  border-bottom: 1px #eaeaea solid;
+  margin: 0;
+  padding: 48px 16px !important;
+  border-bottom: 1px #E5E5E5 solid;
 }
 .spremenljivka .naslov {
-  padding: 5px 0 15px 5px;
-  font-size: 18px;
+  padding: 0 !important;
+  margin: 0 0 24px 0;
+  font-size: 20px;
   font-weight: 600;
 }
 .spremenljivka .naslov .spremenljivka_info {
   font-size: 14px;
   font-weight: 400;
-  padding-top: 7px;
+  padding-top: 8px;
 }
 .spremenljivka .sequence_number {
   background-color: #eaeaea;
@@ -183,6 +217,10 @@ h1.evalvacija {
 .spremenljivka .arrow:hover {
   color: #595959;
 }
+.spremenljivka span.reminder {
+  left: 3px;
+  text-indent: 0;
+}
 
 .spremenljivka.limited {
   outline: 1px #F15A24 solid;
@@ -192,55 +230,97 @@ h1.evalvacija {
   outline: 1px #F15A24 solid;
 }
 
+.spremenljivka.tip_1 .variabla,
+.spremenljivka.tip_2 .variabla {
+  display: flex;
+  align-items: center;
+}
+.spremenljivka.tip_1 .variabla.floatLeft,
+.spremenljivka.tip_2 .variabla.floatLeft {
+  margin-right: 16px;
+}
+.spremenljivka.tip_1 .variabla label,
+.spremenljivka.tip_2 .variabla label {
+  display: flex;
+  line-height: 23px;
+}
+.spremenljivka.tip_1 .variabla input[type=text].input_other,
+.spremenljivka.tip_1 .variabla textarea.input_other,
+.spremenljivka.tip_2 .variabla input[type=text].input_other,
+.spremenljivka.tip_2 .variabla textarea.input_other {
+  margin: 0 0 0 8px;
+}
+.spremenljivka.tip_1 .custom_radio_picture,
+.spremenljivka.tip_1 .visual-radio-scale,
+.spremenljivka.tip_2 .custom_radio_picture,
+.spremenljivka.tip_2 .visual-radio-scale {
+  display: inline-block;
+  margin-right: 24px;
+}
+.spremenljivka.tip_1 .custom_radio_picture label,
+.spremenljivka.tip_1 .visual-radio-scale label,
+.spremenljivka.tip_2 .custom_radio_picture label,
+.spremenljivka.tip_2 .visual-radio-scale label {
+  display: inline-block !important;
+}
+
+.spremenljivka.tip_7 input.width_100:not(:first-of-type) {
+  margin-top: 16px;
+}
+
+.variabla.missing:first-of-type {
+  margin-top: 16px;
+}
+
+.spremenljivka .variabla.missing label {
+  padding: 0;
+}
+
 div.variabla,
 td.variabla,
 td.question,
 td.differential,
 .variabla_sum label {
-  font-size: 14px;
+  font-size: 16px;
 }
 
 div.variable_holder {
-  padding: 10px 0 0 0;
+  padding: 0 !important;
+}
+div.variable_holder .variabla {
+  padding: 0;
+  margin-bottom: 16px;
+}
+div.variable_holder .variabla:last-child {
+  margin-bottom: 0;
 }
 div.variable_holder thead,
 div.variable_holder tr.table-header {
   font-weight: normal;
-  font-size: 14px;
+  font-size: 16px;
 }
 div.variable_holder thead td,
 div.variable_holder tr.table-header td {
   padding: 10px 5px;
 }
 
-table.grid_table thead tr td {
-  border-bottom: 2px #444444 solid;
-}
-table.grid_table thead tr.middle_row td {
-  border-top: 2px #444444 solid;
-}
 table.grid_table tbody tr.table-header td {
-  border-bottom: 2px #444444 solid;
   border-top: 2px #444444 solid;
   background-color: #ffffff;
 }
 table.grid_table tbody tr:nth-child(2n+1) {
-  background-color: #ffffff;
+  background-color: #eaeaea;
 }
 table.grid_table tbody tr:nth-child(2n) {
-  background-color: #eaeaea;
+  background-color: #ffffff;
 }
 table.grid_table td {
-  padding: 10px 10px;
-}
-
-span.reminder {
-  left: 3px;
+  padding: 12px 16px;
 }
 
 /* Textboxi, textarea, select */
 input, textarea, select {
-  font-family: Montserrat, Arial, Sans-Serif !important;
+  font-family: Source Sans Pro, sans-serif !important;
 }
 
 input[type=text], textarea, select {
@@ -253,7 +333,6 @@ input[type=text], textarea, select {
 
 /* ranking */
 .dropzone {
-  border-top: 1px #eaeaea solid;
   margin-top: 12px;
   padding-top: 17px;
 }
@@ -273,8 +352,8 @@ table.ranking_table ul {
 .frame_dropping,
 .frame_dropping_hover,
 .frame_moving {
-  font-size: 13px;
-  padding: 7px 10px 9px;
+  font-size: 16px;
+  padding: 8px 12px 14px;
   border: 2px solid #333333;
   background-color: #ffffff;
 }
@@ -298,7 +377,7 @@ div.variable_holder .frame_dropping_hover {
 }
 
 table.ranking_table b {
-  font-size: 13px;
+  font-size: 16px;
   font-weight: 600;
 }
 
@@ -330,7 +409,7 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus {
 
 /* Slider */
 .grupa .spremenljivka .ui-slider-pips .ui-slider-pip {
-  color: #505050;
+  color: #333333;
 }
 .grupa .spremenljivka .slider.ui-widget-content {
   /*background-color: $color_light !important;*/
@@ -355,7 +434,7 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus {
 }
 .grupa .spremenljivka .sliderText {
   padding-top: 2px;
-  color: #505050;
+  color: #333333;
   background-color: #444444;
   border: 0;
 }
@@ -384,21 +463,20 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus {
 
 /* Gumbi na dnu */
 div.buttons {
-  padding: 20px 20px 35px;
-  margin: 0 10px;
+  padding: 64px 0;
+  margin: 0;
 }
 div.buttons input {
   cursor: pointer;
   margin: 8px 10px;
-  /*padding: 7px 11px;*/
-  padding: 10px 20px;
+  padding: 0 32px;
+  height: 40px;
   text-align: center;
-  font-size: 12px;
-  letter-spacing: 1px;
+  font-size: 16px;
   font-weight: 600;
   color: #FFFFFF;
-  border-radius: 20px;
   border: 0;
+  transition: 0.3s;
 }
 div.buttons input.next {
   background-color: #333333;
@@ -420,12 +498,12 @@ div.buttons input.prev:hover, div.buttons input.prev:focus {
 
 /* Footer */
 #footer_survey {
-  padding: 40px;
+  padding: 48px 0 64px 0;
   background-color: #ffffff;
-  border-top: 1px #eaeaea solid;
+  border-top: 1px #E5E5E5 solid;
 }
 #footer_survey p, #footer_survey a, #footer_survey a:visited {
-  color: #505050;
+  color: #333333;
   font-size: 14px;
   line-height: 25px;
   font-weight: 400;
@@ -472,16 +550,16 @@ textarea:focus {
 }
 
 .frame_dropping_titles {
-  width: 240px;
+  width: 244px;
   padding: 5px;
   margin: 0px auto 0px auto;
-  height: 15px;
+  height: 20px;
   text-align: center;
   background-color: #FFFFFF;
   border-top: 2px solid #b9c5d9;
   border-left: 2px solid #b9c5d9;
   border-right: 2px solid #b9c5d9;
-  font-size: 13px;
+  font-size: 16px;
 }
 
 .drag_and_drop_box {
@@ -509,16 +587,17 @@ textarea:focus {
 }
 
 .frame_dropping_titles_box {
-  width: 240px;
+  width: 244px;
   padding: 5px;
   margin: 0px auto 0px auto;
-  height: 15px;
+  height: 20px;
   text-align: center;
   background-color: #FFFFFF;
-  font-size: 13px;
+  font-size: 16px;
 }
 
 .frame_dropping {
+  width: 234px;
   padding: 7px 10px 9px;
 }
 
diff --git a/main/survey/skins/1kaBlue.css b/main/survey/skins/1kaBlue.css
index 06bba47..f2d783c 100644
--- a/main/survey/skins/1kaBlue.css
+++ b/main/survey/skins/1kaBlue.css
@@ -6,13 +6,14 @@
 /*
 	Osnovna tema ankete - 1ka - brez definiranih barv
 */
+/* Barve */
 /* Fonti */
 body {
   margin: 0;
   padding: 0;
-  color: #505050;
+  color: #333333;
   font-size: 100%;
-  font-family: Montserrat, Arial, Sans-Serif !important;
+  font-family: Source Sans Pro, sans-serif !important;
   background: #ffffff;
 }
 
@@ -28,13 +29,15 @@ body.preview, body.testdata {
   position: absolute;
   width: 100%;
   height: 80px;
-  border-bottom: 6px #1e88e5 solid;
+  border-bottom: 2px #1e88e5 solid;
 }
 #outercontainer #container {
   position: relative;
   width: 100%;
   max-width: 1200px;
-  margin: 0px auto 10px;
+  margin: 0px auto;
+  padding: 0 16px;
+  box-sizing: border-box;
 }
 
 /* Warning bar (preview, cookie) */
@@ -69,12 +72,14 @@ body.preview, body.testdata {
 
 /* Header - logo, naslov, progressbar */
 h1 {
-  margin: 0px auto 30px;
-  padding: 120px 0 50px 0;
-  font-size: 28px;
+  margin: 0px auto;
+  padding: 114px 0 32px 0;
+  font-size: 32px;
+  font-weight: 600;
+  line-height: 40px;
   color: #1e88e5;
   text-align: center;
-  border-bottom: 1px solid #ddeffd;
+  border-bottom: 1px solid #E5E5E5;
 }
 
 h1.evalvacija {
@@ -83,10 +88,10 @@ h1.evalvacija {
 
 #logo {
   right: auto;
-  left: 25px;
+  left: 16px;
   top: 13px;
   max-height: 56px !important;
-  background: url("../../../public/img/logo/1ka_slo.svg");
+  background: url("../../../public/img/logo/1ka_logo_slo.svg");
   background-repeat: no-repeat !important;
   background-size: auto 100% !important;
 }
@@ -96,7 +101,19 @@ h1.evalvacija {
 }
 
 #logo.english {
-  background: url("../../../public/img/logo/1ka_eng.svg");
+  background: url("../../../public/img/logo/1ka_logo_eng.svg");
+}
+
+#logo.namestitev {
+  background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
+#logo.namestitev.english {
+  background: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
+#logo.arnes {
+  background: url("../../../public/img/logo/1ka_logo_arnes.svg");
 }
 
 .header_settings_holder {
@@ -105,11 +122,11 @@ h1.evalvacija {
   left: auto;
 }
 .header_settings_holder .progress_bar span {
-  float: left !important;
-  /* ie6,7 doesnt support inline-block */
+  float: left !important; /* ie6,7 doesnt support inline-block */
   display: block;
   width: 20px;
-  font-size: 11px;
+  font-size: 14px;
+  line-height: 16px;
   color: #6D87AF;
 }
 .header_settings_holder .progress_bar div {
@@ -129,43 +146,60 @@ h1.evalvacija {
   text-decoration: none;
 }
 .header_settings_holder .progress_bar p a:hover {
-  color: #ffa608;
+  color: #1360a4;
 }
 .header_settings_holder .continue_later_setting a {
   color: #1e88e5;
 }
 .header_settings_holder .continue_later_setting a:hover {
-  color: #ffa608;
+  color: #1360a4;
 }
 .header_settings_holder .tawk_chat a {
   color: #1e88e5;
 }
 .header_settings_holder .tawk_chat a:hover {
-  color: #ffa608;
+  color: #1360a4;
+}
+
+/* Uvod in zakljucek */
+.intro .spremenljivka .naslov,
+.concl .spremenljivka .naslov {
+  margin: 0;
+}
+
+#continue_later input[type=email],
+#return_edit input[type=email] {
+  margin-left: 4px;
+}
+#continue_later button,
+#return_edit button {
+  padding: 7px 20px;
+  margin-left: 4px;
 }
 
 /* Spremenljivke */
 .spremenljivka {
-  margin: 20px 10px 20px 10px;
-  padding: 20px 2px 50px 12px !important;
-  border-bottom: 1px #ddeffd solid;
+  margin: 0;
+  padding: 48px 16px !important;
+  border-bottom: 1px #E5E5E5 solid;
 }
 .spremenljivka .naslov {
-  padding: 5px 0 15px 5px;
-  font-size: 18px;
+  padding: 0 !important;
+  margin: 0 0 24px 0;
+  font-size: 20px;
   font-weight: 600;
 }
 .spremenljivka .naslov .spremenljivka_info {
   font-size: 14px;
   font-weight: 400;
-  padding-top: 7px;
+  padding-top: 8px;
 }
 .spremenljivka .sequence_number {
-  background-color: #ddeffd;
+  background-color: #F1F8FD;
   color: #42A5F5;
 }
 .spremenljivka .sequence_number:hover {
-  background-color: #add8fb;
+  background-color: #c4e2f7;
 }
 .spremenljivka .sequence_number.active {
   background-color: #42A5F5;
@@ -181,7 +215,11 @@ h1.evalvacija {
   color: #1e88e5;
 }
 .spremenljivka .arrow:hover {
-  color: #ffa608;
+  color: #1360a4;
+}
+.spremenljivka span.reminder {
+  left: 3px;
+  text-indent: 0;
 }
 
 .spremenljivka.limited {
@@ -192,55 +230,97 @@ h1.evalvacija {
   outline: 1px #F15A24 solid;
 }
 
+.spremenljivka.tip_1 .variabla,
+.spremenljivka.tip_2 .variabla {
+  display: flex;
+  align-items: center;
+}
+.spremenljivka.tip_1 .variabla.floatLeft,
+.spremenljivka.tip_2 .variabla.floatLeft {
+  margin-right: 16px;
+}
+.spremenljivka.tip_1 .variabla label,
+.spremenljivka.tip_2 .variabla label {
+  display: flex;
+  line-height: 23px;
+}
+.spremenljivka.tip_1 .variabla input[type=text].input_other,
+.spremenljivka.tip_1 .variabla textarea.input_other,
+.spremenljivka.tip_2 .variabla input[type=text].input_other,
+.spremenljivka.tip_2 .variabla textarea.input_other {
+  margin: 0 0 0 8px;
+}
+.spremenljivka.tip_1 .custom_radio_picture,
+.spremenljivka.tip_1 .visual-radio-scale,
+.spremenljivka.tip_2 .custom_radio_picture,
+.spremenljivka.tip_2 .visual-radio-scale {
+  display: inline-block;
+  margin-right: 24px;
+}
+.spremenljivka.tip_1 .custom_radio_picture label,
+.spremenljivka.tip_1 .visual-radio-scale label,
+.spremenljivka.tip_2 .custom_radio_picture label,
+.spremenljivka.tip_2 .visual-radio-scale label {
+  display: inline-block !important;
+}
+
+.spremenljivka.tip_7 input.width_100:not(:first-of-type) {
+  margin-top: 16px;
+}
+
+.variabla.missing:first-of-type {
+  margin-top: 16px;
+}
+
+.spremenljivka .variabla.missing label {
+  padding: 0;
+}
+
 div.variabla,
 td.variabla,
 td.question,
 td.differential,
 .variabla_sum label {
-  font-size: 14px;
+  font-size: 16px;
 }
 
 div.variable_holder {
-  padding: 10px 0 0 0;
+  padding: 0 !important;
+}
+div.variable_holder .variabla {
+  padding: 0;
+  margin-bottom: 16px;
+}
+div.variable_holder .variabla:last-child {
+  margin-bottom: 0;
 }
 div.variable_holder thead,
 div.variable_holder tr.table-header {
   font-weight: normal;
-  font-size: 14px;
+  font-size: 16px;
 }
 div.variable_holder thead td,
 div.variable_holder tr.table-header td {
   padding: 10px 5px;
 }
 
-table.grid_table thead tr td {
-  border-bottom: 2px #42A5F5 solid;
-}
-table.grid_table thead tr.middle_row td {
-  border-top: 2px #42A5F5 solid;
-}
 table.grid_table tbody tr.table-header td {
-  border-bottom: 2px #42A5F5 solid;
   border-top: 2px #42A5F5 solid;
   background-color: #ffffff;
 }
 table.grid_table tbody tr:nth-child(2n+1) {
-  background-color: #ffffff;
+  background-color: #F1F8FD;
 }
 table.grid_table tbody tr:nth-child(2n) {
-  background-color: #ddeffd;
+  background-color: #ffffff;
 }
 table.grid_table td {
-  padding: 10px 10px;
-}
-
-span.reminder {
-  left: 3px;
+  padding: 12px 16px;
 }
 
 /* Textboxi, textarea, select */
 input, textarea, select {
-  font-family: Montserrat, Arial, Sans-Serif !important;
+  font-family: Source Sans Pro, sans-serif !important;
 }
 
 input[type=text], textarea, select {
@@ -253,7 +333,6 @@ input[type=text], textarea, select {
 
 /* ranking */
 .dropzone {
-  border-top: 1px #ddeffd solid;
   margin-top: 12px;
   padding-top: 17px;
 }
@@ -273,8 +352,8 @@ table.ranking_table ul {
 .frame_dropping,
 .frame_dropping_hover,
 .frame_moving {
-  font-size: 13px;
-  padding: 7px 10px 9px;
+  font-size: 16px;
+  padding: 8px 12px 14px;
   border: 2px solid #1e88e5;
   background-color: #ffffff;
 }
@@ -285,7 +364,7 @@ table.ranking_table ul {
 
 div.variable_holder .frame_ranking_hover {
   border: 2px #1e88e5 solid;
-  background-color: #ddeffd;
+  background-color: #F1F8FD;
 }
 
 div.variable_holder .frame_ranking,
@@ -294,11 +373,11 @@ div.variable_holder .frame_dropping,
 div.variable_holder .frame_dropping_hover {
   text-indent: -35px;
   border: 2px #42A5F5 solid;
-  background-color: #ddeffd;
+  background-color: #F1F8FD;
 }
 
 table.ranking_table b {
-  font-size: 13px;
+  font-size: 16px;
   font-weight: 600;
 }
 
@@ -310,10 +389,10 @@ button.record_foto::before {
   color: #1e88e5;
 }
 button.record_foto:hover, button.record_foto:focus {
-  border-color: #ffa608;
+  border-color: #1360a4;
 }
 button.record_foto:hover::before, button.record_foto:focus::before {
-  color: #ffa608;
+  color: #1360a4;
 }
 
 /* Koledar */
@@ -325,12 +404,12 @@ button.ui-datepicker-trigger {
   color: #1e88e5;
 }
 button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus {
-  color: #ffa608;
+  color: #1360a4;
 }
 
 /* Slider */
 .grupa .spremenljivka .ui-slider-pips .ui-slider-pip {
-  color: #505050;
+  color: #333333;
 }
 .grupa .spremenljivka .slider.ui-widget-content {
   /*background-color: $color_light !important;*/
@@ -355,7 +434,7 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus {
 }
 .grupa .spremenljivka .sliderText {
   padding-top: 2px;
-  color: #505050;
+  color: #333333;
   background-color: #42A5F5;
   border: 0;
 }
@@ -375,7 +454,7 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus {
   text-align: center;
   font-size: 11px;
   line-height: 14px;
-  background-color: #ddeffd;
+  background-color: #F1F8FD;
   border: 2px solid red;
   padding: 4px 7px;
   border-radius: 4px;
@@ -384,29 +463,28 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus {
 
 /* Gumbi na dnu */
 div.buttons {
-  padding: 20px 20px 35px;
-  margin: 0 10px;
+  padding: 64px 0;
+  margin: 0;
 }
 div.buttons input {
   cursor: pointer;
   margin: 8px 10px;
-  /*padding: 7px 11px;*/
-  padding: 10px 20px;
+  padding: 0 32px;
+  height: 40px;
   text-align: center;
-  font-size: 12px;
-  letter-spacing: 1px;
+  font-size: 16px;
   font-weight: 600;
   color: #FFFFFF;
-  border-radius: 20px;
   border: 0;
+  transition: 0.3s;
 }
 div.buttons input.next {
   background-color: #1e88e5;
   border: 1px solid #1e88e5;
 }
 div.buttons input.next:hover, div.buttons input.next:focus {
-  background-color: #ffa608;
-  border: 1px solid #ffa608;
+  background-color: #1360a4;
+  border: 1px solid #1360a4;
 }
 div.buttons input.prev {
   color: #1e88e5;
@@ -420,12 +498,12 @@ div.buttons input.prev:hover, div.buttons input.prev:focus {
 
 /* Footer */
 #footer_survey {
-  padding: 40px;
+  padding: 48px 0 64px 0;
   background-color: #ffffff;
-  border-top: 1px #ddeffd solid;
+  border-top: 1px #E5E5E5 solid;
 }
 #footer_survey p, #footer_survey a, #footer_survey a:visited {
-  color: #505050;
+  color: #333333;
   font-size: 14px;
   line-height: 25px;
   font-weight: 400;
@@ -472,16 +550,16 @@ textarea:focus {
 }
 
 .frame_dropping_titles {
-  width: 240px;
+  width: 244px;
   padding: 5px;
   margin: 0px auto 0px auto;
-  height: 15px;
+  height: 20px;
   text-align: center;
   background-color: #FFFFFF;
   border-top: 2px solid #b9c5d9;
   border-left: 2px solid #b9c5d9;
   border-right: 2px solid #b9c5d9;
-  font-size: 13px;
+  font-size: 16px;
 }
 
 .drag_and_drop_box {
@@ -509,16 +587,17 @@ textarea:focus {
 }
 
 .frame_dropping_titles_box {
-  width: 240px;
+  width: 244px;
   padding: 5px;
   margin: 0px auto 0px auto;
-  height: 15px;
+  height: 20px;
   text-align: center;
   background-color: #FFFFFF;
-  font-size: 13px;
+  font-size: 16px;
 }
 
 .frame_dropping {
+  width: 234px;
   padding: 7px 10px 9px;
 }
 
diff --git a/main/survey/skins/1kaGreen.css b/main/survey/skins/1kaGreen.css
index 10b97fb..4c24857 100644
--- a/main/survey/skins/1kaGreen.css
+++ b/main/survey/skins/1kaGreen.css
@@ -6,13 +6,14 @@
 /*
 	Osnovna tema ankete - 1ka - brez definiranih barv
 */
+/* Barve */
 /* Fonti */
 body {
   margin: 0;
   padding: 0;
-  color: #505050;
+  color: #333333;
   font-size: 100%;
-  font-family: Montserrat, Arial, Sans-Serif !important;
+  font-family: Source Sans Pro, sans-serif !important;
   background: #ffffff;
 }
 
@@ -28,13 +29,15 @@ body.preview, body.testdata {
   position: absolute;
   width: 100%;
   height: 80px;
-  border-bottom: 6px #2e7d3a solid;
+  border-bottom: 2px #2e7d3a solid;
 }
 #outercontainer #container {
   position: relative;
   width: 100%;
   max-width: 1200px;
-  margin: 0px auto 10px;
+  margin: 0px auto;
+  padding: 0 16px;
+  box-sizing: border-box;
 }
 
 /* Warning bar (preview, cookie) */
@@ -69,12 +72,14 @@ body.preview, body.testdata {
 
 /* Header - logo, naslov, progressbar */
 h1 {
-  margin: 0px auto 30px;
-  padding: 120px 0 50px 0;
-  font-size: 28px;
+  margin: 0px auto;
+  padding: 114px 0 32px 0;
+  font-size: 32px;
+  font-weight: 600;
+  line-height: 40px;
   color: #2e7d3a;
   text-align: center;
-  border-bottom: 1px solid #e2f2e2;
+  border-bottom: 1px solid #E5E5E5;
 }
 
 h1.evalvacija {
@@ -83,10 +88,10 @@ h1.evalvacija {
 
 #logo {
   right: auto;
-  left: 25px;
+  left: 16px;
   top: 13px;
   max-height: 56px !important;
-  background: url("../../../public/img/logo/1ka_slo.svg");
+  background: url("../../../public/img/logo/1ka_logo_slo.svg");
   background-repeat: no-repeat !important;
   background-size: auto 100% !important;
 }
@@ -96,7 +101,19 @@ h1.evalvacija {
 }
 
 #logo.english {
-  background: url("../../../public/img/logo/1ka_eng.svg");
+  background: url("../../../public/img/logo/1ka_logo_eng.svg");
+}
+
+#logo.namestitev {
+  background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
+#logo.namestitev.english {
+  background: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
+#logo.arnes {
+  background: url("../../../public/img/logo/1ka_logo_arnes.svg");
 }
 
 .header_settings_holder {
@@ -105,11 +122,11 @@ h1.evalvacija {
   left: auto;
 }
 .header_settings_holder .progress_bar span {
-  float: left !important;
-  /* ie6,7 doesnt support inline-block */
+  float: left !important; /* ie6,7 doesnt support inline-block */
   display: block;
   width: 20px;
-  font-size: 11px;
+  font-size: 14px;
+  line-height: 16px;
   color: #6D87AF;
 }
 .header_settings_holder .progress_bar div {
@@ -144,21 +161,38 @@ h1.evalvacija {
   color: #43b554;
 }
 
+/* Uvod in zakljucek */
+.intro .spremenljivka .naslov,
+.concl .spremenljivka .naslov {
+  margin: 0;
+}
+
+#continue_later input[type=email],
+#return_edit input[type=email] {
+  margin-left: 4px;
+}
+#continue_later button,
+#return_edit button {
+  padding: 7px 20px;
+  margin-left: 4px;
+}
+
 /* Spremenljivke */
 .spremenljivka {
-  margin: 20px 10px 20px 10px;
-  padding: 20px 2px 50px 12px !important;
-  border-bottom: 1px #e2f2e2 solid;
+  margin: 0;
+  padding: 48px 16px !important;
+  border-bottom: 1px #E5E5E5 solid;
 }
 .spremenljivka .naslov {
-  padding: 5px 0 15px 5px;
-  font-size: 18px;
+  padding: 0 !important;
+  margin: 0 0 24px 0;
+  font-size: 20px;
   font-weight: 600;
 }
 .spremenljivka .naslov .spremenljivka_info {
   font-size: 14px;
   font-weight: 400;
-  padding-top: 7px;
+  padding-top: 8px;
 }
 .spremenljivka .sequence_number {
   background-color: #e2f2e2;
@@ -183,6 +217,10 @@ h1.evalvacija {
 .spremenljivka .arrow:hover {
   color: #43b554;
 }
+.spremenljivka span.reminder {
+  left: 3px;
+  text-indent: 0;
+}
 
 .spremenljivka.limited {
   outline: 1px #F15A24 solid;
@@ -192,55 +230,97 @@ h1.evalvacija {
   outline: 1px #F15A24 solid;
 }
 
+.spremenljivka.tip_1 .variabla,
+.spremenljivka.tip_2 .variabla {
+  display: flex;
+  align-items: center;
+}
+.spremenljivka.tip_1 .variabla.floatLeft,
+.spremenljivka.tip_2 .variabla.floatLeft {
+  margin-right: 16px;
+}
+.spremenljivka.tip_1 .variabla label,
+.spremenljivka.tip_2 .variabla label {
+  display: flex;
+  line-height: 23px;
+}
+.spremenljivka.tip_1 .variabla input[type=text].input_other,
+.spremenljivka.tip_1 .variabla textarea.input_other,
+.spremenljivka.tip_2 .variabla input[type=text].input_other,
+.spremenljivka.tip_2 .variabla textarea.input_other {
+  margin: 0 0 0 8px;
+}
+.spremenljivka.tip_1 .custom_radio_picture,
+.spremenljivka.tip_1 .visual-radio-scale,
+.spremenljivka.tip_2 .custom_radio_picture,
+.spremenljivka.tip_2 .visual-radio-scale {
+  display: inline-block;
+  margin-right: 24px;
+}
+.spremenljivka.tip_1 .custom_radio_picture label,
+.spremenljivka.tip_1 .visual-radio-scale label,
+.spremenljivka.tip_2 .custom_radio_picture label,
+.spremenljivka.tip_2 .visual-radio-scale label {
+  display: inline-block !important;
+}
+
+.spremenljivka.tip_7 input.width_100:not(:first-of-type) {
+  margin-top: 16px;
+}
+
+.variabla.missing:first-of-type {
+  margin-top: 16px;
+}
+
+.spremenljivka .variabla.missing label {
+  padding: 0;
+}
+
 div.variabla,
 td.variabla,
 td.question,
 td.differential,
 .variabla_sum label {
-  font-size: 14px;
+  font-size: 16px;
 }
 
 div.variable_holder {
-  padding: 10px 0 0 0;
+  padding: 0 !important;
+}
+div.variable_holder .variabla {
+  padding: 0;
+  margin-bottom: 16px;
+}
+div.variable_holder .variabla:last-child {
+  margin-bottom: 0;
 }
 div.variable_holder thead,
 div.variable_holder tr.table-header {
   font-weight: normal;
-  font-size: 14px;
+  font-size: 16px;
 }
 div.variable_holder thead td,
 div.variable_holder tr.table-header td {
   padding: 10px 5px;
 }
 
-table.grid_table thead tr td {
-  border-bottom: 2px #66bb6a solid;
-}
-table.grid_table thead tr.middle_row td {
-  border-top: 2px #66bb6a solid;
-}
 table.grid_table tbody tr.table-header td {
-  border-bottom: 2px #66bb6a solid;
   border-top: 2px #66bb6a solid;
   background-color: #ffffff;
 }
 table.grid_table tbody tr:nth-child(2n+1) {
-  background-color: #ffffff;
+  background-color: #e2f2e2;
 }
 table.grid_table tbody tr:nth-child(2n) {
-  background-color: #e2f2e2;
+  background-color: #ffffff;
 }
 table.grid_table td {
-  padding: 10px 10px;
-}
-
-span.reminder {
-  left: 3px;
+  padding: 12px 16px;
 }
 
 /* Textboxi, textarea, select */
 input, textarea, select {
-  font-family: Montserrat, Arial, Sans-Serif !important;
+  font-family: Source Sans Pro, sans-serif !important;
 }
 
 input[type=text], textarea, select {
@@ -253,7 +333,6 @@ input[type=text], textarea, select {
 
 /* ranking */
 .dropzone {
-  border-top: 1px #e2f2e2 solid;
   margin-top: 12px;
   padding-top: 17px;
 }
@@ -273,8 +352,8 @@ table.ranking_table ul {
 .frame_dropping,
 .frame_dropping_hover,
 .frame_moving {
-  font-size: 13px;
-  padding: 7px 10px 9px;
+  font-size: 16px;
+  padding: 8px 12px 14px;
   border: 2px solid #2e7d3a;
   background-color: #ffffff;
 }
@@ -298,7 +377,7 @@ div.variable_holder .frame_dropping_hover {
 }
 
 table.ranking_table b {
-  font-size: 13px;
+  font-size: 16px;
   font-weight: 600;
 }
 
@@ -330,7 +409,7 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus {
 
 /* Slider */
 .grupa .spremenljivka .ui-slider-pips .ui-slider-pip {
-  color: #505050;
+  color: #333333;
 }
 .grupa .spremenljivka .slider.ui-widget-content {
   /*background-color: $color_light !important;*/
@@ -355,7 +434,7 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus {
 }
 .grupa .spremenljivka .sliderText {
   padding-top: 2px;
-  color: #505050;
+  color: #333333;
   background-color: #66bb6a;
   border: 0;
 }
@@ -384,21 +463,20 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus {
 
 /* Gumbi na dnu */
 div.buttons {
-  padding: 20px 20px 35px;
-  margin: 0 10px;
+  padding: 64px 0;
+  margin: 0;
 }
 div.buttons input {
   cursor: pointer;
   margin: 8px 10px;
-  /*padding: 7px 11px;*/
-  padding: 10px 20px;
+  padding: 0 32px;
+  height: 40px;
   text-align: center;
-  font-size: 12px;
-  letter-spacing: 1px;
+  font-size: 16px;
   font-weight: 600;
   color: #FFFFFF;
-  border-radius: 20px;
   border: 0;
+  transition: 0.3s;
 }
 div.buttons input.next {
   background-color: #2e7d3a;
@@ -420,12 +498,12 @@ div.buttons input.prev:hover, div.buttons input.prev:focus {
 
 /* Footer */
 #footer_survey {
-  padding: 40px;
+  padding: 48px 0 64px 0;
   background-color: #ffffff;
-  border-top: 1px #e2f2e2 solid;
+  border-top: 1px #E5E5E5 solid;
 }
 #footer_survey p, #footer_survey a, #footer_survey a:visited {
-  color: #505050;
+  color: #333333;
   font-size: 14px;
   line-height: 25px;
   font-weight: 400;
@@ -472,16 +550,16 @@ textarea:focus {
 }
 
 .frame_dropping_titles {
-  width: 240px;
+  width: 244px;
   padding: 5px;
   margin: 0px auto 0px auto;
-  height: 15px;
+  height: 20px;
   text-align: center;
   background-color: #FFFFFF;
   border-top: 2px solid #b9c5d9;
   border-left: 2px solid #b9c5d9;
   border-right: 2px solid #b9c5d9;
-  font-size: 13px;
+  font-size: 16px;
 }
 
 .drag_and_drop_box {
@@ -509,16 +587,17 @@ textarea:focus {
 }
 
 .frame_dropping_titles_box {
-  width: 240px;
+  width: 244px;
   padding: 5px;
   margin: 0px auto 0px auto;
-  height: 15px;
+  height: 20px;
   text-align: center;
   background-color: #FFFFFF;
-  font-size: 13px;
+  font-size: 16px;
 }
 
 .frame_dropping {
+  width: 234px;
   padding: 7px 10px 9px;
 }
 
diff --git a/main/survey/skins/1kaGrey.css b/main/survey/skins/1kaGrey.css
index 7a981e1..5612a57 100644
--- a/main/survey/skins/1kaGrey.css
+++ b/main/survey/skins/1kaGrey.css
@@ -182,7 +182,7 @@ table.grid_table td {
 
 /* ranking */
 .dropzone{
-	border-top: 1px #dfe2e7 solid;
+	/* border-top: 1px #dfe2e7 solid; */
 	margin-top: 12px;
 	padding-top: 17px;
 }
diff --git a/main/survey/skins/1kaNature.css b/main/survey/skins/1kaNature.css
index 7103d81..61552da 100644
--- a/main/survey/skins/1kaNature.css
+++ b/main/survey/skins/1kaNature.css
@@ -6,13 +6,14 @@
 /*
 	Osnovna tema ankete - 1ka - brez definiranih barv
 */
+/* Barve */
 /* Fonti */
 body {
   margin: 0;
   padding: 0;
-  color: #505050;
+  color: #333333;
   font-size: 100%;
-  font-family: Montserrat, Arial, Sans-Serif !important;
+  font-family: Source Sans Pro, sans-serif !important;
   background: #ffffff;
 }
 
@@ -28,13 +29,15 @@ body.preview, body.testdata {
   position: absolute;
   width: 100%;
   height: 80px;
-  border-bottom: 6px #1e88e5 solid;
+  border-bottom: 2px #1e88e5 solid;
 }
 #outercontainer #container {
   position: relative;
   width: 100%;
   max-width: 1200px;
-  margin: 0px auto 10px;
+  margin: 0px auto;
+  padding: 0 16px;
+  box-sizing: border-box;
 }
 
 /* Warning bar (preview, cookie) */
@@ -69,12 +72,14 @@ body.preview, body.testdata {
 
 /* Header - logo, naslov, progressbar */
 h1 {
-  margin: 0px auto 30px;
-  padding: 120px 0 50px 0;
-  font-size: 28px;
+  margin: 0px auto;
+  padding: 114px 0 32px 0;
+  font-size: 32px;
+  font-weight: 600;
+  line-height: 40px;
   color: #505050;
   text-align: center;
-  border-bottom: 1px solid #ddeffd;
+  border-bottom: 1px solid #E5E5E5;
 }
 
 h1.evalvacija {
@@ -83,10 +88,10 @@ h1.evalvacija {
 
 #logo {
   right: auto;
-  left: 25px;
+  left: 16px;
   top: 13px;
   max-height: 56px !important;
-  background: url("../../../public/img/logo/1ka_slo.svg");
+  background: url("../../../public/img/logo/1ka_logo_slo.svg");
   background-repeat: no-repeat !important;
   background-size: auto 100% !important;
 }
@@ -96,7 +101,19 @@ h1.evalvacija {
 }
 
 #logo.english {
-  background: url("../../../public/img/logo/1ka_eng.svg");
+  background: url("../../../public/img/logo/1ka_logo_eng.svg");
+}
+
+#logo.namestitev {
+  background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
+#logo.namestitev.english {
+  background: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
+#logo.arnes {
+  background: url("../../../public/img/logo/1ka_logo_arnes.svg");
 }
 
 .header_settings_holder {
@@ -105,11 +122,11 @@ h1.evalvacija {
   left: auto;
 }
 .header_settings_holder .progress_bar span {
-  float: left !important;
-  /* ie6,7 doesnt support inline-block */
+  float: left !important; /* ie6,7 doesnt support inline-block */
   display: block;
   width: 20px;
-  font-size: 11px;
+  font-size: 14px;
+  line-height: 16px;
   color: #6D87AF;
 }
 .header_settings_holder .progress_bar div {
@@ -144,21 +161,38 @@ h1.evalvacija {
   color: #ffa608;
 }
 
+/* Uvod in zakljucek */
+.intro .spremenljivka .naslov,
+.concl .spremenljivka .naslov {
+  margin: 0;
+}
+
+#continue_later input[type=email],
+#return_edit input[type=email] {
+  margin-left: 4px;
+}
+#continue_later button,
+#return_edit button {
+  padding: 7px 20px;
+  margin-left: 4px;
+}
+
 /* Spremenljivke */
 .spremenljivka {
-  margin: 20px 10px 20px 10px;
-  padding: 20px 2px 50px 12px !important;
-  border-bottom: 1px #ddeffd solid;
+  margin: 0;
+  padding: 48px 16px !important;
+  border-bottom: 1px #E5E5E5 solid;
 }
 .spremenljivka .naslov {
-  padding: 5px 0 15px 5px;
-  font-size: 18px;
+  padding: 0 !important;
+  margin: 0 0 24px 0;
+  font-size: 20px;
   font-weight: 600;
 }
 .spremenljivka .naslov .spremenljivka_info {
   font-size: 14px;
   font-weight: 400;
-  padding-top: 7px;
+  padding-top: 8px;
 }
 .spremenljivka .sequence_number {
   background-color: #ddeffd;
@@ -183,6 +217,10 @@ h1.evalvacija {
 .spremenljivka .arrow:hover {
   color: #ffa608;
 }
+.spremenljivka span.reminder {
+  left: 3px;
+  text-indent: 0;
+}
 
 .spremenljivka.limited {
   outline: 1px #F15A24 solid;
@@ -192,55 +230,97 @@ h1.evalvacija {
   outline: 1px #F15A24 solid;
 }
 
+.spremenljivka.tip_1 .variabla,
+.spremenljivka.tip_2 .variabla {
+  display: flex;
+  align-items: center;
+}
+.spremenljivka.tip_1 .variabla.floatLeft,
+.spremenljivka.tip_2 .variabla.floatLeft {
+  margin-right: 16px;
+}
+.spremenljivka.tip_1 .variabla label,
+.spremenljivka.tip_2 .variabla label {
+  display: flex;
+  line-height: 23px;
+}
+.spremenljivka.tip_1 .variabla input[type=text].input_other,
+.spremenljivka.tip_1 .variabla textarea.input_other,
+.spremenljivka.tip_2 .variabla input[type=text].input_other,
+.spremenljivka.tip_2 .variabla textarea.input_other {
+  margin: 0 0 0 8px;
+}
+.spremenljivka.tip_1 .custom_radio_picture,
+.spremenljivka.tip_1 .visual-radio-scale,
+.spremenljivka.tip_2 .custom_radio_picture,
+.spremenljivka.tip_2 .visual-radio-scale {
+  display: inline-block;
+  margin-right: 24px;
+}
+.spremenljivka.tip_1 .custom_radio_picture label,
+.spremenljivka.tip_1 .visual-radio-scale label,
+.spremenljivka.tip_2 .custom_radio_picture label,
+.spremenljivka.tip_2 .visual-radio-scale label {
+  display: inline-block !important;
+}
+
+.spremenljivka.tip_7 input.width_100:not(:first-of-type) {
+  margin-top: 16px;
+}
+
+.variabla.missing:first-of-type {
+  margin-top: 16px;
+}
+
+.spremenljivka .variabla.missing label {
+  padding: 0;
+}
+
 div.variabla,
 td.variabla,
 td.question,
 td.differential,
 .variabla_sum label {
-  font-size: 14px;
+  font-size: 16px;
 }
 
 div.variable_holder {
-  padding: 10px 0 0 0;
+  padding: 0 !important;
+}
+div.variable_holder .variabla {
+  padding: 0;
+  margin-bottom: 16px;
+}
+div.variable_holder .variabla:last-child {
+  margin-bottom: 0;
 }
 div.variable_holder thead,
 div.variable_holder tr.table-header {
   font-weight: normal;
-  font-size: 14px;
+  font-size: 16px;
 }
 div.variable_holder thead td,
 div.variable_holder tr.table-header td {
   padding: 10px 5px;
 }
 
-table.grid_table thead tr td {
-  border-bottom: 2px #42A5F5 solid;
-}
-table.grid_table thead tr.middle_row td {
-  border-top: 2px #42A5F5 solid;
-}
 table.grid_table tbody tr.table-header td {
-  border-bottom: 2px #42A5F5 solid;
   border-top: 2px #42A5F5 solid;
   background-color: #ffffff;
 }
 table.grid_table tbody tr:nth-child(2n+1) {
-  background-color: #ffffff;
+  background-color: #ddeffd;
 }
 table.grid_table tbody tr:nth-child(2n) {
-  background-color: #ddeffd;
+  background-color: #ffffff;
 }
 table.grid_table td {
-  padding: 10px 10px;
-}
-
-span.reminder {
-  left: 3px;
+  padding: 12px 16px;
 }
 
 /* Textboxi, textarea, select */
 input, textarea, select {
-  font-family: Montserrat, Arial, Sans-Serif !important;
+  font-family: Source Sans Pro, sans-serif !important;
 }
 
 input[type=text], textarea, select {
@@ -253,7 +333,6 @@ input[type=text], textarea, select {
 
 /* ranking */
 .dropzone {
-  border-top: 1px #ddeffd solid;
   margin-top: 12px;
   padding-top: 17px;
 }
@@ -273,8 +352,8 @@ table.ranking_table ul {
 .frame_dropping,
 .frame_dropping_hover,
 .frame_moving {
-  font-size: 13px;
-  padding: 7px 10px 9px;
+  font-size: 16px;
+  padding: 8px 12px 14px;
   border: 2px solid #1e88e5;
   background-color: #ffffff;
 }
@@ -298,7 +377,7 @@ div.variable_holder .frame_dropping_hover {
 }
 
 table.ranking_table b {
-  font-size: 13px;
+  font-size: 16px;
   font-weight: 600;
 }
 
@@ -330,7 +409,7 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus {
 
 /* Slider */
 .grupa .spremenljivka .ui-slider-pips .ui-slider-pip {
-  color: #505050;
+  color: #333333;
 }
 .grupa .spremenljivka .slider.ui-widget-content {
   /*background-color: $color_light !important;*/
@@ -355,7 +434,7 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus {
 }
 .grupa .spremenljivka .sliderText {
   padding-top: 2px;
-  color: #505050;
+  color: #333333;
   background-color: #42A5F5;
   border: 0;
 }
@@ -384,21 +463,20 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus {
 
 /* Gumbi na dnu */
 div.buttons {
-  padding: 20px 20px 35px;
-  margin: 0 10px;
+  padding: 64px 0;
+  margin: 0;
 }
 div.buttons input {
   cursor: pointer;
   margin: 8px 10px;
-  /*padding: 7px 11px;*/
-  padding: 10px 20px;
+  padding: 0 32px;
+  height: 40px;
   text-align: center;
-  font-size: 12px;
-  letter-spacing: 1px;
+  font-size: 16px;
   font-weight: 600;
   color: #FFFFFF;
-  border-radius: 20px;
   border: 0;
+  transition: 0.3s;
 }
 div.buttons input.next {
   background-color: #1e88e5;
@@ -420,12 +498,12 @@ div.buttons input.prev:hover, div.buttons input.prev:focus {
 
 /* Footer */
 #footer_survey {
-  padding: 40px;
+  padding: 48px 0 64px 0;
   background-color: #ffffff;
-  border-top: 1px #ddeffd solid;
+  border-top: 1px #E5E5E5 solid;
 }
 #footer_survey p, #footer_survey a, #footer_survey a:visited {
-  color: #505050;
+  color: #333333;
   font-size: 14px;
   line-height: 25px;
   font-weight: 400;
@@ -472,16 +550,16 @@ textarea:focus {
 }
 
 .frame_dropping_titles {
-  width: 240px;
+  width: 244px;
   padding: 5px;
   margin: 0px auto 0px auto;
-  height: 15px;
+  height: 20px;
   text-align: center;
   background-color: #FFFFFF;
   border-top: 2px solid #b9c5d9;
   border-left: 2px solid #b9c5d9;
   border-right: 2px solid #b9c5d9;
-  font-size: 13px;
+  font-size: 16px;
 }
 
 .drag_and_drop_box {
@@ -509,16 +587,17 @@ textarea:focus {
 }
 
 .frame_dropping_titles_box {
-  width: 240px;
+  width: 244px;
   padding: 5px;
   margin: 0px auto 0px auto;
-  height: 15px;
+  height: 20px;
   text-align: center;
   background-color: #FFFFFF;
-  font-size: 13px;
+  font-size: 16px;
 }
 
 .frame_dropping {
+  width: 234px;
   padding: 7px 10px 9px;
 }
 
diff --git a/main/survey/skins/1kaOffice.css b/main/survey/skins/1kaOffice.css
index d15f058..e4fac17 100644
--- a/main/survey/skins/1kaOffice.css
+++ b/main/survey/skins/1kaOffice.css
@@ -6,13 +6,14 @@
 /*
 	Osnovna tema ankete - 1ka - brez definiranih barv
 */
+/* Barve */
 /* Fonti */
 body {
   margin: 0;
   padding: 0;
-  color: #505050;
+  color: #333333;
   font-size: 100%;
-  font-family: Montserrat, Arial, Sans-Serif !important;
+  font-family: Source Sans Pro, sans-serif !important;
   background: #ffffff;
 }
 
@@ -28,13 +29,15 @@ body.preview, body.testdata {
   position: absolute;
   width: 100%;
   height: 80px;
-  border-bottom: 6px #1e88e5 solid;
+  border-bottom: 2px #1e88e5 solid;
 }
 #outercontainer #container {
   position: relative;
   width: 100%;
   max-width: 1200px;
-  margin: 0px auto 10px;
+  margin: 0px auto;
+  padding: 0 16px;
+  box-sizing: border-box;
 }
 
 /* Warning bar (preview, cookie) */
@@ -69,12 +72,14 @@ body.preview, body.testdata {
 
 /* Header - logo, naslov, progressbar */
 h1 {
-  margin: 0px auto 30px;
-  padding: 120px 0 50px 0;
-  font-size: 28px;
+  margin: 0px auto;
+  padding: 114px 0 32px 0;
+  font-size: 32px;
+  font-weight: 600;
+  line-height: 40px;
   color: #505050;
   text-align: center;
-  border-bottom: 1px solid #ddeffd;
+  border-bottom: 1px solid #E5E5E5;
 }
 
 h1.evalvacija {
@@ -83,10 +88,10 @@ h1.evalvacija {
 
 #logo {
   right: auto;
-  left: 25px;
+  left: 16px;
   top: 13px;
   max-height: 56px !important;
-  background: url("../../../public/img/logo/1ka_slo.svg");
+  background: url("../../../public/img/logo/1ka_logo_slo.svg");
   background-repeat: no-repeat !important;
   background-size: auto 100% !important;
 }
@@ -96,7 +101,19 @@ h1.evalvacija {
 }
 
 #logo.english {
-  background: url("../../../public/img/logo/1ka_eng.svg");
+  background: url("../../../public/img/logo/1ka_logo_eng.svg");
+}
+
+#logo.namestitev {
+  background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
+#logo.namestitev.english {
+  background: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
+#logo.arnes {
+  background: url("../../../public/img/logo/1ka_logo_arnes.svg");
 }
 
 .header_settings_holder {
@@ -105,11 +122,11 @@ h1.evalvacija {
   left: auto;
 }
 .header_settings_holder .progress_bar span {
-  float: left !important;
-  /* ie6,7 doesnt support inline-block */
+  float: left !important; /* ie6,7 doesnt support inline-block */
   display: block;
   width: 20px;
-  font-size: 11px;
+  font-size: 14px;
+  line-height: 16px;
   color: #6D87AF;
 }
 .header_settings_holder .progress_bar div {
@@ -144,21 +161,38 @@ h1.evalvacija {
   color: #ffa608;
 }
 
+/* Uvod in zakljucek */
+.intro .spremenljivka .naslov,
+.concl .spremenljivka .naslov {
+  margin: 0;
+}
+
+#continue_later input[type=email],
+#return_edit input[type=email] {
+  margin-left: 4px;
+}
+#continue_later button,
+#return_edit button {
+  padding: 7px 20px;
+  margin-left: 4px;
+}
+
 /* Spremenljivke */
 .spremenljivka {
-  margin: 20px 10px 20px 10px;
-  padding: 20px 2px 50px 12px !important;
-  border-bottom: 1px #ddeffd solid;
+  margin: 0;
+  padding: 48px 16px !important;
+  border-bottom: 1px #E5E5E5 solid;
 }
 .spremenljivka .naslov {
-  padding: 5px 0 15px 5px;
-  font-size: 18px;
+  padding: 0 !important;
+  margin: 0 0 24px 0;
+  font-size: 20px;
   font-weight: 600;
 }
 .spremenljivka .naslov .spremenljivka_info {
   font-size: 14px;
   font-weight: 400;
-  padding-top: 7px;
+  padding-top: 8px;
 }
 .spremenljivka .sequence_number {
   background-color: #ddeffd;
@@ -183,6 +217,10 @@ h1.evalvacija {
 .spremenljivka .arrow:hover {
   color: #ffa608;
 }
+.spremenljivka span.reminder {
+  left: 3px;
+  text-indent: 0;
+}
 
 .spremenljivka.limited {
   outline: 1px #F15A24 solid;
@@ -192,55 +230,97 @@ h1.evalvacija {
   outline: 1px #F15A24 solid;
 }
 
+.spremenljivka.tip_1 .variabla,
+.spremenljivka.tip_2 .variabla {
+  display: flex;
+  align-items: center;
+}
+.spremenljivka.tip_1 .variabla.floatLeft,
+.spremenljivka.tip_2 .variabla.floatLeft {
+  margin-right: 16px;
+}
+.spremenljivka.tip_1 .variabla label,
+.spremenljivka.tip_2 .variabla label {
+  display: flex;
+  line-height: 23px;
+}
+.spremenljivka.tip_1 .variabla input[type=text].input_other,
+.spremenljivka.tip_1 .variabla textarea.input_other,
+.spremenljivka.tip_2 .variabla input[type=text].input_other,
+.spremenljivka.tip_2 .variabla textarea.input_other {
+  margin: 0 0 0 8px;
+}
+.spremenljivka.tip_1 .custom_radio_picture,
+.spremenljivka.tip_1 .visual-radio-scale,
+.spremenljivka.tip_2 .custom_radio_picture,
+.spremenljivka.tip_2 .visual-radio-scale {
+  display: inline-block;
+  margin-right: 24px;
+}
+.spremenljivka.tip_1 .custom_radio_picture label,
+.spremenljivka.tip_1 .visual-radio-scale label,
+.spremenljivka.tip_2 .custom_radio_picture label,
+.spremenljivka.tip_2 .visual-radio-scale label {
+  display: inline-block !important;
+}
+
+.spremenljivka.tip_7 input.width_100:not(:first-of-type) {
+  margin-top: 16px;
+}
+
+.variabla.missing:first-of-type {
+  margin-top: 16px;
+}
+
+.spremenljivka .variabla.missing label {
+  padding: 0;
+}
+
 div.variabla,
 td.variabla,
 td.question,
 td.differential,
 .variabla_sum label {
-  font-size: 14px;
+  font-size: 16px;
 }
 
 div.variable_holder {
-  padding: 10px 0 0 0;
+  padding: 0 !important;
+}
+div.variable_holder .variabla {
+  padding: 0;
+  margin-bottom: 16px;
+}
+div.variable_holder .variabla:last-child {
+  margin-bottom: 0;
 }
 div.variable_holder thead,
 div.variable_holder tr.table-header {
   font-weight: normal;
-  font-size: 14px;
+  font-size: 16px;
 }
 div.variable_holder thead td,
 div.variable_holder tr.table-header td {
   padding: 10px 5px;
 }
 
-table.grid_table thead tr td {
-  border-bottom: 2px #42A5F5 solid;
-}
-table.grid_table thead tr.middle_row td {
-  border-top: 2px #42A5F5 solid;
-}
 table.grid_table tbody tr.table-header td {
-  border-bottom: 2px #42A5F5 solid;
   border-top: 2px #42A5F5 solid;
   background-color: #ffffff;
 }
 table.grid_table tbody tr:nth-child(2n+1) {
-  background-color: #ffffff;
+  background-color: #ddeffd;
 }
 table.grid_table tbody tr:nth-child(2n) {
-  background-color: #ddeffd;
+  background-color: #ffffff;
 }
 table.grid_table td {
-  padding: 10px 10px;
-}
-
-span.reminder {
-  left: 3px;
+  padding: 12px 16px;
 }
 
 /* Textboxi, textarea, select */
 input, textarea, select {
-  font-family: Montserrat, Arial, Sans-Serif !important;
+  font-family: Source Sans Pro, sans-serif !important;
 }
 
 input[type=text], textarea, select {
@@ -253,7 +333,6 @@ input[type=text], textarea, select {
 
 /* ranking */
 .dropzone {
-  border-top: 1px #ddeffd solid;
   margin-top: 12px;
   padding-top: 17px;
 }
@@ -273,8 +352,8 @@ table.ranking_table ul {
 .frame_dropping,
 .frame_dropping_hover,
 .frame_moving {
-  font-size: 13px;
-  padding: 7px 10px 9px;
+  font-size: 16px;
+  padding: 8px 12px 14px;
   border: 2px solid #1e88e5;
   background-color: #ffffff;
 }
@@ -298,7 +377,7 @@ div.variable_holder .frame_dropping_hover {
 }
 
 table.ranking_table b {
-  font-size: 13px;
+  font-size: 16px;
   font-weight: 600;
 }
 
@@ -330,7 +409,7 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus {
 
 /* Slider */
 .grupa .spremenljivka .ui-slider-pips .ui-slider-pip {
-  color: #505050;
+  color: #333333;
 }
 .grupa .spremenljivka .slider.ui-widget-content {
   /*background-color: $color_light !important;*/
@@ -355,7 +434,7 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus {
 }
 .grupa .spremenljivka .sliderText {
   padding-top: 2px;
-  color: #505050;
+  color: #333333;
   background-color: #42A5F5;
   border: 0;
 }
@@ -384,21 +463,20 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus {
 
 /* Gumbi na dnu */
 div.buttons {
-  padding: 20px 20px 35px;
-  margin: 0 10px;
+  padding: 64px 0;
+  margin: 0;
 }
 div.buttons input {
   cursor: pointer;
   margin: 8px 10px;
-  /*padding: 7px 11px;*/
-  padding: 10px 20px;
+  padding: 0 32px;
+  height: 40px;
   text-align: center;
-  font-size: 12px;
-  letter-spacing: 1px;
+  font-size: 16px;
   font-weight: 600;
   color: #FFFFFF;
-  border-radius: 20px;
   border: 0;
+  transition: 0.3s;
 }
 div.buttons input.next {
   background-color: #1e88e5;
@@ -420,12 +498,12 @@ div.buttons input.prev:hover, div.buttons input.prev:focus {
 
 /* Footer */
 #footer_survey {
-  padding: 40px;
+  padding: 48px 0 64px 0;
   background-color: #ffffff;
-  border-top: 1px #ddeffd solid;
+  border-top: 1px #E5E5E5 solid;
 }
 #footer_survey p, #footer_survey a, #footer_survey a:visited {
-  color: #505050;
+  color: #333333;
   font-size: 14px;
   line-height: 25px;
   font-weight: 400;
@@ -472,16 +550,16 @@ textarea:focus {
 }
 
 .frame_dropping_titles {
-  width: 240px;
+  width: 244px;
   padding: 5px;
   margin: 0px auto 0px auto;
-  height: 15px;
+  height: 20px;
   text-align: center;
   background-color: #FFFFFF;
   border-top: 2px solid #b9c5d9;
   border-left: 2px solid #b9c5d9;
   border-right: 2px solid #b9c5d9;
-  font-size: 13px;
+  font-size: 16px;
 }
 
 .drag_and_drop_box {
@@ -509,16 +587,17 @@ textarea:focus {
 }
 
 .frame_dropping_titles_box {
-  width: 240px;
+  width: 244px;
   padding: 5px;
   margin: 0px auto 0px auto;
-  height: 15px;
+  height: 20px;
   text-align: center;
   background-color: #FFFFFF;
-  font-size: 13px;
+  font-size: 16px;
 }
 
 .frame_dropping {
+  width: 234px;
   padding: 7px 10px 9px;
 }
 
diff --git a/main/survey/skins/1kaOrange.css b/main/survey/skins/1kaOrange.css
index 5d1792c..b33596d 100644
--- a/main/survey/skins/1kaOrange.css
+++ b/main/survey/skins/1kaOrange.css
@@ -6,13 +6,14 @@
 /*
 	Osnovna tema ankete - 1ka - brez definiranih barv
 */
+/* Barve */
 /* Fonti */
 body {
   margin: 0;
   padding: 0;
-  color: #505050;
+  color: #333333;
   font-size: 100%;
-  font-family: Montserrat, Arial, Sans-Serif !important;
+  font-family: Source Sans Pro, sans-serif !important;
   background: #ffffff;
 }
 
@@ -28,13 +29,15 @@ body.preview, body.testdata {
   position: absolute;
   width: 100%;
   height: 80px;
-  border-bottom: 6px #ef6c00 solid;
+  border-bottom: 2px #ef6c00 solid;
 }
 #outercontainer #container {
   position: relative;
   width: 100%;
   max-width: 1200px;
-  margin: 0px auto 10px;
+  margin: 0px auto;
+  padding: 0 16px;
+  box-sizing: border-box;
 }
 
 /* Warning bar (preview, cookie) */
@@ -69,12 +72,14 @@ body.preview, body.testdata {
 
 /* Header - logo, naslov, progressbar */
 h1 {
-  margin: 0px auto 30px;
-  padding: 120px 0 50px 0;
-  font-size: 28px;
+  margin: 0px auto;
+  padding: 114px 0 32px 0;
+  font-size: 32px;
+  font-weight: 600;
+  line-height: 40px;
   color: #ef6c00;
   text-align: center;
-  border-bottom: 1px solid #ffe9c9;
+  border-bottom: 1px solid #E5E5E5;
 }
 
 h1.evalvacija {
@@ -83,10 +88,10 @@ h1.evalvacija {
 
 #logo {
   right: auto;
-  left: 25px;
+  left: 16px;
   top: 13px;
   max-height: 56px !important;
-  background: url("../../../public/img/logo/1ka_slo.svg");
+  background: url("../../../public/img/logo/1ka_logo_slo.svg");
   background-repeat: no-repeat !important;
   background-size: auto 100% !important;
 }
@@ -96,7 +101,19 @@ h1.evalvacija {
 }
 
 #logo.english {
-  background: url("../../../public/img/logo/1ka_eng.svg");
+  background: url("../../../public/img/logo/1ka_logo_eng.svg");
+}
+
+#logo.namestitev {
+  background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
+#logo.namestitev.english {
+  background: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
+#logo.arnes {
+  background: url("../../../public/img/logo/1ka_logo_arnes.svg");
 }
 
 .header_settings_holder {
@@ -105,11 +122,11 @@ h1.evalvacija {
   left: auto;
 }
 .header_settings_holder .progress_bar span {
-  float: left !important;
-  /* ie6,7 doesnt support inline-block */
+  float: left !important; /* ie6,7 doesnt support inline-block */
   display: block;
   width: 20px;
-  font-size: 11px;
+  font-size: 14px;
+  line-height: 16px;
   color: #6D87AF;
 }
 .header_settings_holder .progress_bar div {
@@ -144,21 +161,38 @@ h1.evalvacija {
   color: #ff943d;
 }
 
+/* Uvod in zakljucek */
+.intro .spremenljivka .naslov,
+.concl .spremenljivka .naslov {
+  margin: 0;
+}
+
+#continue_later input[type=email],
+#return_edit input[type=email] {
+  margin-left: 4px;
+}
+#continue_later button,
+#return_edit button {
+  padding: 7px 20px;
+  margin-left: 4px;
+}
+
 /* Spremenljivke */
 .spremenljivka {
-  margin: 20px 10px 20px 10px;
-  padding: 20px 2px 50px 12px !important;
-  border-bottom: 1px #ffe9c9 solid;
+  margin: 0;
+  padding: 48px 16px !important;
+  border-bottom: 1px #E5E5E5 solid;
 }
 .spremenljivka .naslov {
-  padding: 5px 0 15px 5px;
-  font-size: 18px;
+  padding: 0 !important;
+  margin: 0 0 24px 0;
+  font-size: 20px;
   font-weight: 600;
 }
 .spremenljivka .naslov .spremenljivka_info {
   font-size: 14px;
   font-weight: 400;
-  padding-top: 7px;
+  padding-top: 8px;
 }
 .spremenljivka .sequence_number {
   background-color: #ffe9c9;
@@ -183,6 +217,10 @@ h1.evalvacija {
 .spremenljivka .arrow:hover {
   color: #ff943d;
 }
+.spremenljivka span.reminder {
+  left: 3px;
+  text-indent: 0;
+}
 
 .spremenljivka.limited {
   outline: 1px #F15A24 solid;
@@ -192,55 +230,97 @@ h1.evalvacija {
   outline: 1px #F15A24 solid;
 }
 
+.spremenljivka.tip_1 .variabla,
+.spremenljivka.tip_2 .variabla {
+  display: flex;
+  align-items: center;
+}
+.spremenljivka.tip_1 .variabla.floatLeft,
+.spremenljivka.tip_2 .variabla.floatLeft {
+  margin-right: 16px;
+}
+.spremenljivka.tip_1 .variabla label,
+.spremenljivka.tip_2 .variabla label {
+  display: flex;
+  line-height: 23px;
+}
+.spremenljivka.tip_1 .variabla input[type=text].input_other,
+.spremenljivka.tip_1 .variabla textarea.input_other,
+.spremenljivka.tip_2 .variabla input[type=text].input_other,
+.spremenljivka.tip_2 .variabla textarea.input_other {
+  margin: 0 0 0 8px;
+}
+.spremenljivka.tip_1 .custom_radio_picture,
+.spremenljivka.tip_1 .visual-radio-scale,
+.spremenljivka.tip_2 .custom_radio_picture,
+.spremenljivka.tip_2 .visual-radio-scale {
+  display: inline-block;
+  margin-right: 24px;
+}
+.spremenljivka.tip_1 .custom_radio_picture label,
+.spremenljivka.tip_1 .visual-radio-scale label,
+.spremenljivka.tip_2 .custom_radio_picture label,
+.spremenljivka.tip_2 .visual-radio-scale label {
+  display: inline-block !important;
+}
+
+.spremenljivka.tip_7 input.width_100:not(:first-of-type) {
+  margin-top: 16px;
+}
+
+.variabla.missing:first-of-type {
+  margin-top: 16px;
+}
+
+.spremenljivka .variabla.missing label {
+  padding: 0;
+}
+
 div.variabla,
 td.variabla,
 td.question,
 td.differential,
 .variabla_sum label {
-  font-size: 14px;
+  font-size: 16px;
 }
 
 div.variable_holder {
-  padding: 10px 0 0 0;
+  padding: 0 !important;
+}
+div.variable_holder .variabla {
+  padding: 0;
+  margin-bottom: 16px;
+}
+div.variable_holder .variabla:last-child {
+  margin-bottom: 0;
 }
 div.variable_holder thead,
 div.variable_holder tr.table-header {
   font-weight: normal;
-  font-size: 14px;
+  font-size: 16px;
 }
 div.variable_holder thead td,
 div.variable_holder tr.table-header td {
   padding: 10px 5px;
 }
 
-table.grid_table thead tr td {
-  border-bottom: 2px #ffa726 solid;
-}
-table.grid_table thead tr.middle_row td {
-  border-top: 2px #ffa726 solid;
-}
 table.grid_table tbody tr.table-header td {
-  border-bottom: 2px #ffa726 solid;
   border-top: 2px #ffa726 solid;
   background-color: #ffffff;
 }
 table.grid_table tbody tr:nth-child(2n+1) {
-  background-color: #ffffff;
+  background-color: #ffe9c9;
 }
 table.grid_table tbody tr:nth-child(2n) {
-  background-color: #ffe9c9;
+  background-color: #ffffff;
 }
 table.grid_table td {
-  padding: 10px 10px;
-}
-
-span.reminder {
-  left: 3px;
+  padding: 12px 16px;
 }
 
 /* Textboxi, textarea, select */
 input, textarea, select {
-  font-family: Montserrat, Arial, Sans-Serif !important;
+  font-family: Source Sans Pro, sans-serif !important;
 }
 
 input[type=text], textarea, select {
@@ -253,7 +333,6 @@ input[type=text], textarea, select {
 
 /* ranking */
 .dropzone {
-  border-top: 1px #ffe9c9 solid;
   margin-top: 12px;
   padding-top: 17px;
 }
@@ -273,8 +352,8 @@ table.ranking_table ul {
 .frame_dropping,
 .frame_dropping_hover,
 .frame_moving {
-  font-size: 13px;
-  padding: 7px 10px 9px;
+  font-size: 16px;
+  padding: 8px 12px 14px;
   border: 2px solid #ef6c00;
   background-color: #ffffff;
 }
@@ -298,7 +377,7 @@ div.variable_holder .frame_dropping_hover {
 }
 
 table.ranking_table b {
-  font-size: 13px;
+  font-size: 16px;
   font-weight: 600;
 }
 
@@ -330,7 +409,7 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus {
 
 /* Slider */
 .grupa .spremenljivka .ui-slider-pips .ui-slider-pip {
-  color: #505050;
+  color: #333333;
 }
 .grupa .spremenljivka .slider.ui-widget-content {
   /*background-color: $color_light !important;*/
@@ -355,7 +434,7 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus {
 }
 .grupa .spremenljivka .sliderText {
   padding-top: 2px;
-  color: #505050;
+  color: #333333;
   background-color: #ffa726;
   border: 0;
 }
@@ -384,21 +463,20 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus {
 
 /* Gumbi na dnu */
 div.buttons {
-  padding: 20px 20px 35px;
-  margin: 0 10px;
+  padding: 64px 0;
+  margin: 0;
 }
 div.buttons input {
   cursor: pointer;
   margin: 8px 10px;
-  /*padding: 7px 11px;*/
-  padding: 10px 20px;
+  padding: 0 32px;
+  height: 40px;
   text-align: center;
-  font-size: 12px;
-  letter-spacing: 1px;
+  font-size: 16px;
   font-weight: 600;
   color: #FFFFFF;
-  border-radius: 20px;
   border: 0;
+  transition: 0.3s;
 }
 div.buttons input.next {
   background-color: #ef6c00;
@@ -420,12 +498,12 @@ div.buttons input.prev:hover, div.buttons input.prev:focus {
 
 /* Footer */
 #footer_survey {
-  padding: 40px;
+  padding: 48px 0 64px 0;
   background-color: #ffffff;
-  border-top: 1px #ffe9c9 solid;
+  border-top: 1px #E5E5E5 solid;
 }
 #footer_survey p, #footer_survey a, #footer_survey a:visited {
-  color: #505050;
+  color: #333333;
   font-size: 14px;
   line-height: 25px;
   font-weight: 400;
@@ -472,16 +550,16 @@ textarea:focus {
 }
 
 .frame_dropping_titles {
-  width: 240px;
+  width: 244px;
   padding: 5px;
   margin: 0px auto 0px auto;
-  height: 15px;
+  height: 20px;
   text-align: center;
   background-color: #FFFFFF;
   border-top: 2px solid #b9c5d9;
   border-left: 2px solid #b9c5d9;
   border-right: 2px solid #b9c5d9;
-  font-size: 13px;
+  font-size: 16px;
 }
 
 .drag_and_drop_box {
@@ -509,16 +587,17 @@ textarea:focus {
 }
 
 .frame_dropping_titles_box {
-  width: 240px;
+  width: 244px;
   padding: 5px;
   margin: 0px auto 0px auto;
-  height: 15px;
+  height: 20px;
   text-align: center;
   background-color: #FFFFFF;
-  font-size: 13px;
+  font-size: 16px;
 }
 
 .frame_dropping {
+  width: 234px;
   padding: 7px 10px 9px;
 }
 
diff --git a/main/survey/skins/1kaPurple.css b/main/survey/skins/1kaPurple.css
index d2c62e3..4860028 100644
--- a/main/survey/skins/1kaPurple.css
+++ b/main/survey/skins/1kaPurple.css
@@ -6,13 +6,14 @@
 /*
 	Osnovna tema ankete - 1ka - brez definiranih barv
 */
+/* Barve */
 /* Fonti */
 body {
   margin: 0;
   padding: 0;
-  color: #505050;
+  color: #333333;
   font-size: 100%;
-  font-family: Montserrat, Arial, Sans-Serif !important;
+  font-family: Source Sans Pro, sans-serif !important;
   background: #ffffff;
 }
 
@@ -28,13 +29,15 @@ body.preview, body.testdata {
   position: absolute;
   width: 100%;
   height: 80px;
-  border-bottom: 6px #4527a0 solid;
+  border-bottom: 2px #4527a0 solid;
 }
 #outercontainer #container {
   position: relative;
   width: 100%;
   max-width: 1200px;
-  margin: 0px auto 10px;
+  margin: 0px auto;
+  padding: 0 16px;
+  box-sizing: border-box;
 }
 
 /* Warning bar (preview, cookie) */
@@ -69,12 +72,14 @@ body.preview, body.testdata {
 
 /* Header - logo, naslov, progressbar */
 h1 {
-  margin: 0px auto 30px;
-  padding: 120px 0 50px 0;
-  font-size: 28px;
+  margin: 0px auto;
+  padding: 114px 0 32px 0;
+  font-size: 32px;
+  font-weight: 600;
+  line-height: 40px;
   color: #4527a0;
   text-align: center;
-  border-bottom: 1px solid #e3daf2;
+  border-bottom: 1px solid #E5E5E5;
 }
 
 h1.evalvacija {
@@ -83,10 +88,10 @@ h1.evalvacija {
 
 #logo {
   right: auto;
-  left: 25px;
+  left: 16px;
   top: 13px;
   max-height: 56px !important;
-  background: url("../../../public/img/logo/1ka_slo.svg");
+  background: url("../../../public/img/logo/1ka_logo_slo.svg");
   background-repeat: no-repeat !important;
   background-size: auto 100% !important;
 }
@@ -96,7 +101,19 @@ h1.evalvacija {
 }
 
 #logo.english {
-  background: url("../../../public/img/logo/1ka_eng.svg");
+  background: url("../../../public/img/logo/1ka_logo_eng.svg");
+}
+
+#logo.namestitev {
+  background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
+#logo.namestitev.english {
+  background: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
+#logo.arnes {
+  background: url("../../../public/img/logo/1ka_logo_arnes.svg");
 }
 
 .header_settings_holder {
@@ -105,11 +122,11 @@ h1.evalvacija {
   left: auto;
 }
 .header_settings_holder .progress_bar span {
-  float: left !important;
-  /* ie6,7 doesnt support inline-block */
+  float: left !important; /* ie6,7 doesnt support inline-block */
   display: block;
   width: 20px;
-  font-size: 11px;
+  font-size: 14px;
+  line-height: 16px;
   color: #6D87AF;
 }
 .header_settings_holder .progress_bar div {
@@ -144,21 +161,38 @@ h1.evalvacija {
   color: #6642d1;
 }
 
+/* Uvod in zakljucek */
+.intro .spremenljivka .naslov,
+.concl .spremenljivka .naslov {
+  margin: 0;
+}
+
+#continue_later input[type=email],
+#return_edit input[type=email] {
+  margin-left: 4px;
+}
+#continue_later button,
+#return_edit button {
+  padding: 7px 20px;
+  margin-left: 4px;
+}
+
 /* Spremenljivke */
 .spremenljivka {
-  margin: 20px 10px 20px 10px;
-  padding: 20px 2px 50px 12px !important;
-  border-bottom: 1px #e3daf2 solid;
+  margin: 0;
+  padding: 48px 16px !important;
+  border-bottom: 1px #E5E5E5 solid;
 }
 .spremenljivka .naslov {
-  padding: 5px 0 15px 5px;
-  font-size: 18px;
+  padding: 0 !important;
+  margin: 0 0 24px 0;
+  font-size: 20px;
   font-weight: 600;
 }
 .spremenljivka .naslov .spremenljivka_info {
   font-size: 14px;
   font-weight: 400;
-  padding-top: 7px;
+  padding-top: 8px;
 }
 .spremenljivka .sequence_number {
   background-color: #e3daf2;
@@ -183,6 +217,10 @@ h1.evalvacija {
 .spremenljivka .arrow:hover {
   color: #6642d1;
 }
+.spremenljivka span.reminder {
+  left: 3px;
+  text-indent: 0;
+}
 
 .spremenljivka.limited {
   outline: 1px #F15A24 solid;
@@ -192,55 +230,97 @@ h1.evalvacija {
   outline: 1px #F15A24 solid;
 }
 
+.spremenljivka.tip_1 .variabla,
+.spremenljivka.tip_2 .variabla {
+  display: flex;
+  align-items: center;
+}
+.spremenljivka.tip_1 .variabla.floatLeft,
+.spremenljivka.tip_2 .variabla.floatLeft {
+  margin-right: 16px;
+}
+.spremenljivka.tip_1 .variabla label,
+.spremenljivka.tip_2 .variabla label {
+  display: flex;
+  line-height: 23px;
+}
+.spremenljivka.tip_1 .variabla input[type=text].input_other,
+.spremenljivka.tip_1 .variabla textarea.input_other,
+.spremenljivka.tip_2 .variabla input[type=text].input_other,
+.spremenljivka.tip_2 .variabla textarea.input_other {
+  margin: 0 0 0 8px;
+}
+.spremenljivka.tip_1 .custom_radio_picture,
+.spremenljivka.tip_1 .visual-radio-scale,
+.spremenljivka.tip_2 .custom_radio_picture,
+.spremenljivka.tip_2 .visual-radio-scale {
+  display: inline-block;
+  margin-right: 24px;
+}
+.spremenljivka.tip_1 .custom_radio_picture label,
+.spremenljivka.tip_1 .visual-radio-scale label,
+.spremenljivka.tip_2 .custom_radio_picture label,
+.spremenljivka.tip_2 .visual-radio-scale label {
+  display: inline-block !important;
+}
+
+.spremenljivka.tip_7 input.width_100:not(:first-of-type) {
+  margin-top: 16px;
+}
+
+.variabla.missing:first-of-type {
+  margin-top: 16px;
+}
+
+.spremenljivka .variabla.missing label {
+  padding: 0;
+}
+
 div.variabla,
 td.variabla,
 td.question,
 td.differential,
 .variabla_sum label {
-  font-size: 14px;
+  font-size: 16px;
 }
 
 div.variable_holder {
-  padding: 10px 0 0 0;
+  padding: 0 !important;
+}
+div.variable_holder .variabla {
+  padding: 0;
+  margin-bottom: 16px;
+}
+div.variable_holder .variabla:last-child {
+  margin-bottom: 0;
 }
 div.variable_holder thead,
 div.variable_holder tr.table-header {
   font-weight: normal;
-  font-size: 14px;
+  font-size: 16px;
 }
 div.variable_holder thead td,
 div.variable_holder tr.table-header td {
   padding: 10px 5px;
 }
 
-table.grid_table thead tr td {
-  border-bottom: 2px #7e57c2 solid;
-}
-table.grid_table thead tr.middle_row td {
-  border-top: 2px #7e57c2 solid;
-}
 table.grid_table tbody tr.table-header td {
-  border-bottom: 2px #7e57c2 solid;
   border-top: 2px #7e57c2 solid;
   background-color: #ffffff;
 }
 table.grid_table tbody tr:nth-child(2n+1) {
-  background-color: #ffffff;
+  background-color: #e3daf2;
 }
 table.grid_table tbody tr:nth-child(2n) {
-  background-color: #e3daf2;
+  background-color: #ffffff;
 }
 table.grid_table td {
-  padding: 10px 10px;
-}
-
-span.reminder {
-  left: 3px;
+  padding: 12px 16px;
 }
 
 /* Textboxi, textarea, select */
 input, textarea, select {
-  font-family: Montserrat, Arial, Sans-Serif !important;
+  font-family: Source Sans Pro, sans-serif !important;
 }
 
 input[type=text], textarea, select {
@@ -253,7 +333,6 @@ input[type=text], textarea, select {
 
 /* ranking */
 .dropzone {
-  border-top: 1px #e3daf2 solid;
   margin-top: 12px;
   padding-top: 17px;
 }
@@ -273,8 +352,8 @@ table.ranking_table ul {
 .frame_dropping,
 .frame_dropping_hover,
 .frame_moving {
-  font-size: 13px;
-  padding: 7px 10px 9px;
+  font-size: 16px;
+  padding: 8px 12px 14px;
   border: 2px solid #4527a0;
   background-color: #ffffff;
 }
@@ -298,7 +377,7 @@ div.variable_holder .frame_dropping_hover {
 }
 
 table.ranking_table b {
-  font-size: 13px;
+  font-size: 16px;
   font-weight: 600;
 }
 
@@ -330,7 +409,7 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus {
 
 /* Slider */
 .grupa .spremenljivka .ui-slider-pips .ui-slider-pip {
-  color: #505050;
+  color: #333333;
 }
 .grupa .spremenljivka .slider.ui-widget-content {
   /*background-color: $color_light !important;*/
@@ -355,7 +434,7 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus {
 }
 .grupa .spremenljivka .sliderText {
   padding-top: 2px;
-  color: #505050;
+  color: #333333;
   background-color: #7e57c2;
   border: 0;
 }
@@ -384,21 +463,20 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus {
 
 /* Gumbi na dnu */
 div.buttons {
-  padding: 20px 20px 35px;
-  margin: 0 10px;
+  padding: 64px 0;
+  margin: 0;
 }
 div.buttons input {
   cursor: pointer;
   margin: 8px 10px;
-  /*padding: 7px 11px;*/
-  padding: 10px 20px;
+  padding: 0 32px;
+  height: 40px;
   text-align: center;
-  font-size: 12px;
-  letter-spacing: 1px;
+  font-size: 16px;
   font-weight: 600;
   color: #FFFFFF;
-  border-radius: 20px;
   border: 0;
+  transition: 0.3s;
 }
 div.buttons input.next {
   background-color: #4527a0;
@@ -420,12 +498,12 @@ div.buttons input.prev:hover, div.buttons input.prev:focus {
 
 /* Footer */
 #footer_survey {
-  padding: 40px;
+  padding: 48px 0 64px 0;
   background-color: #ffffff;
-  border-top: 1px #e3daf2 solid;
+  border-top: 1px #E5E5E5 solid;
 }
 #footer_survey p, #footer_survey a, #footer_survey a:visited {
-  color: #505050;
+  color: #333333;
   font-size: 14px;
   line-height: 25px;
   font-weight: 400;
@@ -472,16 +550,16 @@ textarea:focus {
 }
 
 .frame_dropping_titles {
-  width: 240px;
+  width: 244px;
   padding: 5px;
   margin: 0px auto 0px auto;
-  height: 15px;
+  height: 20px;
   text-align: center;
   background-color: #FFFFFF;
   border-top: 2px solid #b9c5d9;
   border-left: 2px solid #b9c5d9;
   border-right: 2px solid #b9c5d9;
-  font-size: 13px;
+  font-size: 16px;
 }
 
 .drag_and_drop_box {
@@ -509,16 +587,17 @@ textarea:focus {
 }
 
 .frame_dropping_titles_box {
-  width: 240px;
+  width: 244px;
   padding: 5px;
   margin: 0px auto 0px auto;
-  height: 15px;
+  height: 20px;
   text-align: center;
   background-color: #FFFFFF;
-  font-size: 13px;
+  font-size: 16px;
 }
 
 .frame_dropping {
+  width: 234px;
   padding: 7px 10px 9px;
 }
 
diff --git a/main/survey/skins/1kaRed.css b/main/survey/skins/1kaRed.css
index 7a68f3a..987f306 100644
--- a/main/survey/skins/1kaRed.css
+++ b/main/survey/skins/1kaRed.css
@@ -6,13 +6,14 @@
 /*
 	Osnovna tema ankete - 1ka - brez definiranih barv
 */
+/* Barve */
 /* Fonti */
 body {
   margin: 0;
   padding: 0;
-  color: #505050;
+  color: #333333;
   font-size: 100%;
-  font-family: Montserrat, Arial, Sans-Serif !important;
+  font-family: Source Sans Pro, sans-serif !important;
   background: #ffffff;
 }
 
@@ -28,13 +29,15 @@ body.preview, body.testdata {
   position: absolute;
   width: 100%;
   height: 80px;
-  border-bottom: 6px #c62828 solid;
+  border-bottom: 2px #c62828 solid;
 }
 #outercontainer #container {
   position: relative;
   width: 100%;
   max-width: 1200px;
-  margin: 0px auto 10px;
+  margin: 0px auto;
+  padding: 0 16px;
+  box-sizing: border-box;
 }
 
 /* Warning bar (preview, cookie) */
@@ -69,12 +72,14 @@ body.preview, body.testdata {
 
 /* Header - logo, naslov, progressbar */
 h1 {
-  margin: 0px auto 30px;
-  padding: 120px 0 50px 0;
-  font-size: 28px;
+  margin: 0px auto;
+  padding: 114px 0 32px 0;
+  font-size: 32px;
+  font-weight: 600;
+  line-height: 40px;
   color: #c62828;
   text-align: center;
-  border-bottom: 1px solid #fde6e6;
+  border-bottom: 1px solid #E5E5E5;
 }
 
 h1.evalvacija {
@@ -83,10 +88,10 @@ h1.evalvacija {
 
 #logo {
   right: auto;
-  left: 25px;
+  left: 16px;
   top: 13px;
   max-height: 56px !important;
-  background: url("../../../public/img/logo/1ka_slo.svg");
+  background: url("../../../public/img/logo/1ka_logo_slo.svg");
   background-repeat: no-repeat !important;
   background-size: auto 100% !important;
 }
@@ -96,7 +101,19 @@ h1.evalvacija {
 }
 
 #logo.english {
-  background: url("../../../public/img/logo/1ka_eng.svg");
+  background: url("../../../public/img/logo/1ka_logo_eng.svg");
+}
+
+#logo.namestitev {
+  background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
+#logo.namestitev.english {
+  background: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
+#logo.arnes {
+  background: url("../../../public/img/logo/1ka_logo_arnes.svg");
 }
 
 .header_settings_holder {
@@ -105,11 +122,11 @@ h1.evalvacija {
   left: auto;
 }
 .header_settings_holder .progress_bar span {
-  float: left !important;
-  /* ie6,7 doesnt support inline-block */
+  float: left !important; /* ie6,7 doesnt support inline-block */
   display: block;
   width: 20px;
-  font-size: 11px;
+  font-size: 14px;
+  line-height: 16px;
   color: #6D87AF;
 }
 .header_settings_holder .progress_bar div {
@@ -144,21 +161,38 @@ h1.evalvacija {
   color: #de5c5c;
 }
 
+/* Uvod in zakljucek */
+.intro .spremenljivka .naslov,
+.concl .spremenljivka .naslov {
+  margin: 0;
+}
+
+#continue_later input[type=email],
+#return_edit input[type=email] {
+  margin-left: 4px;
+}
+#continue_later button,
+#return_edit button {
+  padding: 7px 20px;
+  margin-left: 4px;
+}
+
 /* Spremenljivke */
 .spremenljivka {
-  margin: 20px 10px 20px 10px;
-  padding: 20px 2px 50px 12px !important;
-  border-bottom: 1px #fde6e6 solid;
+  margin: 0;
+  padding: 48px 16px !important;
+  border-bottom: 1px #E5E5E5 solid;
 }
 .spremenljivka .naslov {
-  padding: 5px 0 15px 5px;
-  font-size: 18px;
+  padding: 0 !important;
+  margin: 0 0 24px 0;
+  font-size: 20px;
   font-weight: 600;
 }
 .spremenljivka .naslov .spremenljivka_info {
   font-size: 14px;
   font-weight: 400;
-  padding-top: 7px;
+  padding-top: 8px;
 }
 .spremenljivka .sequence_number {
   background-color: #fde6e6;
@@ -183,6 +217,10 @@ h1.evalvacija {
 .spremenljivka .arrow:hover {
   color: #de5c5c;
 }
+.spremenljivka span.reminder {
+  left: 3px;
+  text-indent: 0;
+}
 
 .spremenljivka.limited {
   outline: 1px #F15A24 solid;
@@ -192,55 +230,97 @@ h1.evalvacija {
   outline: 1px #F15A24 solid;
 }
 
+.spremenljivka.tip_1 .variabla,
+.spremenljivka.tip_2 .variabla {
+  display: flex;
+  align-items: center;
+}
+.spremenljivka.tip_1 .variabla.floatLeft,
+.spremenljivka.tip_2 .variabla.floatLeft {
+  margin-right: 16px;
+}
+.spremenljivka.tip_1 .variabla label,
+.spremenljivka.tip_2 .variabla label {
+  display: flex;
+  line-height: 23px;
+}
+.spremenljivka.tip_1 .variabla input[type=text].input_other,
+.spremenljivka.tip_1 .variabla textarea.input_other,
+.spremenljivka.tip_2 .variabla input[type=text].input_other,
+.spremenljivka.tip_2 .variabla textarea.input_other {
+  margin: 0 0 0 8px;
+}
+.spremenljivka.tip_1 .custom_radio_picture,
+.spremenljivka.tip_1 .visual-radio-scale,
+.spremenljivka.tip_2 .custom_radio_picture,
+.spremenljivka.tip_2 .visual-radio-scale {
+  display: inline-block;
+  margin-right: 24px;
+}
+.spremenljivka.tip_1 .custom_radio_picture label,
+.spremenljivka.tip_1 .visual-radio-scale label,
+.spremenljivka.tip_2 .custom_radio_picture label,
+.spremenljivka.tip_2 .visual-radio-scale label {
+  display: inline-block !important;
+}
+
+.spremenljivka.tip_7 input.width_100:not(:first-of-type) {
+  margin-top: 16px;
+}
+
+.variabla.missing:first-of-type {
+  margin-top: 16px;
+}
+
+.spremenljivka .variabla.missing label {
+  padding: 0;
+}
+
 div.variabla,
 td.variabla,
 td.question,
 td.differential,
 .variabla_sum label {
-  font-size: 14px;
+  font-size: 16px;
 }
 
 div.variable_holder {
-  padding: 10px 0 0 0;
+  padding: 0 !important;
+}
+div.variable_holder .variabla {
+  padding: 0;
+  margin-bottom: 16px;
+}
+div.variable_holder .variabla:last-child {
+  margin-bottom: 0;
 }
 div.variable_holder thead,
 div.variable_holder tr.table-header {
   font-weight: normal;
-  font-size: 14px;
+  font-size: 16px;
 }
 div.variable_holder thead td,
 div.variable_holder tr.table-header td {
   padding: 10px 5px;
 }
 
-table.grid_table thead tr td {
-  border-bottom: 2px #ef5350 solid;
-}
-table.grid_table thead tr.middle_row td {
-  border-top: 2px #ef5350 solid;
-}
 table.grid_table tbody tr.table-header td {
-  border-bottom: 2px #ef5350 solid;
   border-top: 2px #ef5350 solid;
   background-color: #ffffff;
 }
 table.grid_table tbody tr:nth-child(2n+1) {
-  background-color: #ffffff;
+  background-color: #fde6e6;
 }
 table.grid_table tbody tr:nth-child(2n) {
-  background-color: #fde6e6;
+  background-color: #ffffff;
 }
 table.grid_table td {
-  padding: 10px 10px;
-}
-
-span.reminder {
-  left: 3px;
+  padding: 12px 16px;
 }
 
 /* Textboxi, textarea, select */
 input, textarea, select {
-  font-family: Montserrat, Arial, Sans-Serif !important;
+  font-family: Source Sans Pro, sans-serif !important;
 }
 
 input[type=text], textarea, select {
@@ -253,7 +333,6 @@ input[type=text], textarea, select {
 
 /* ranking */
 .dropzone {
-  border-top: 1px #fde6e6 solid;
   margin-top: 12px;
   padding-top: 17px;
 }
@@ -273,8 +352,8 @@ table.ranking_table ul {
 .frame_dropping,
 .frame_dropping_hover,
 .frame_moving {
-  font-size: 13px;
-  padding: 7px 10px 9px;
+  font-size: 16px;
+  padding: 8px 12px 14px;
   border: 2px solid #c62828;
   background-color: #ffffff;
 }
@@ -298,7 +377,7 @@ div.variable_holder .frame_dropping_hover {
 }
 
 table.ranking_table b {
-  font-size: 13px;
+  font-size: 16px;
   font-weight: 600;
 }
 
@@ -330,7 +409,7 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus {
 
 /* Slider */
 .grupa .spremenljivka .ui-slider-pips .ui-slider-pip {
-  color: #505050;
+  color: #333333;
 }
 .grupa .spremenljivka .slider.ui-widget-content {
   /*background-color: $color_light !important;*/
@@ -355,7 +434,7 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus {
 }
 .grupa .spremenljivka .sliderText {
   padding-top: 2px;
-  color: #505050;
+  color: #333333;
   background-color: #ef5350;
   border: 0;
 }
@@ -384,21 +463,20 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus {
 
 /* Gumbi na dnu */
 div.buttons {
-  padding: 20px 20px 35px;
-  margin: 0 10px;
+  padding: 64px 0;
+  margin: 0;
 }
 div.buttons input {
   cursor: pointer;
   margin: 8px 10px;
-  /*padding: 7px 11px;*/
-  padding: 10px 20px;
+  padding: 0 32px;
+  height: 40px;
   text-align: center;
-  font-size: 12px;
-  letter-spacing: 1px;
+  font-size: 16px;
   font-weight: 600;
   color: #FFFFFF;
-  border-radius: 20px;
   border: 0;
+  transition: 0.3s;
 }
 div.buttons input.next {
   background-color: #c62828;
@@ -420,12 +498,12 @@ div.buttons input.prev:hover, div.buttons input.prev:focus {
 
 /* Footer */
 #footer_survey {
-  padding: 40px;
+  padding: 48px 0 64px 0;
   background-color: #ffffff;
-  border-top: 1px #fde6e6 solid;
+  border-top: 1px #E5E5E5 solid;
 }
 #footer_survey p, #footer_survey a, #footer_survey a:visited {
-  color: #505050;
+  color: #333333;
   font-size: 14px;
   line-height: 25px;
   font-weight: 400;
@@ -472,16 +550,16 @@ textarea:focus {
 }
 
 .frame_dropping_titles {
-  width: 240px;
+  width: 244px;
   padding: 5px;
   margin: 0px auto 0px auto;
-  height: 15px;
+  height: 20px;
   text-align: center;
   background-color: #FFFFFF;
   border-top: 2px solid #b9c5d9;
   border-left: 2px solid #b9c5d9;
   border-right: 2px solid #b9c5d9;
-  font-size: 13px;
+  font-size: 16px;
 }
 
 .drag_and_drop_box {
@@ -509,16 +587,17 @@ textarea:focus {
 }
 
 .frame_dropping_titles_box {
-  width: 240px;
+  width: 244px;
   padding: 5px;
   margin: 0px auto 0px auto;
-  height: 15px;
+  height: 20px;
   text-align: center;
   background-color: #FFFFFF;
-  font-size: 13px;
+  font-size: 16px;
 }
 
 .frame_dropping {
+  width: 234px;
   padding: 7px 10px 9px;
 }
 
diff --git a/main/survey/skins/Cdi.css b/main/survey/skins/Cdi.css
new file mode 100644
index 0000000..73f1b6f
--- /dev/null
+++ b/main/survey/skins/Cdi.css
@@ -0,0 +1,617 @@
+/*
+	CDI tema - Siva barva z logotipom
+*/
+/* Barve */
+/* Import osnovne postavitve */
+/*
+	Osnovna tema ankete - 1ka - brez definiranih barv
+*/
+/* Barve */
+/* Fonti */
+body {
+  margin: 0;
+  padding: 0;
+  color: #333333;
+  font-size: 100%;
+  font-family: Source Sans Pro, sans-serif !important;
+  background: #ffffff;
+}
+
+body.preview, body.testdata {
+  margin-top: 26px;
+}
+
+#outercontainer {
+  width: 100%;
+  margin: 0 auto;
+}
+#outercontainer .outercontainer_header {
+  position: absolute;
+  width: 100%;
+  height: 80px;
+  border-bottom: 2px #666666 solid;
+}
+#outercontainer #container {
+  position: relative;
+  width: 100%;
+  max-width: 1200px;
+  margin: 0px auto;
+  padding: 0 16px;
+  box-sizing: border-box;
+}
+
+/* Warning bar (preview, cookie) */
+#cookie_alert,
+#test_alert {
+  height: 26px;
+  font-size: 15px;
+  line-height: 25px;
+  color: #ffffff;
+  background-color: #ffa608;
+  border-bottom: 1px solid #ffa608;
+}
+#cookie_alert a,
+#test_alert a {
+  text-decoration: none;
+  font-weight: bold;
+  color: #ffffff;
+}
+#cookie_alert a:hover,
+#test_alert a:hover {
+  text-decoration: underline;
+}
+#cookie_alert span,
+#test_alert span {
+  color: #ffffff;
+}
+#cookie_alert span a,
+#test_alert span a {
+  color: #ffffff;
+  font-weight: normal;
+}
+
+/* Header - logo, naslov, progressbar */
+h1 {
+  margin: 0px auto;
+  padding: 114px 0 32px 0;
+  font-size: 32px;
+  font-weight: 600;
+  line-height: 40px;
+  color: #666666;
+  text-align: center;
+  border-bottom: 1px solid #E5E5E5;
+}
+
+h1.evalvacija {
+  margin-bottom: 0;
+}
+
+#logo {
+  right: auto;
+  left: 16px;
+  top: 13px;
+  max-height: 56px !important;
+  background: url("../../../public/img/logo/1ka_logo_slo.svg");
+  background-repeat: no-repeat !important;
+  background-size: auto 100% !important;
+}
+#logo a {
+  width: 250px;
+  height: 56px;
+}
+
+#logo.english {
+  background: url("../../../public/img/logo/1ka_logo_eng.svg");
+}
+
+#logo.namestitev {
+  background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
+#logo.namestitev.english {
+  background: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
+#logo.arnes {
+  background: url("../../../public/img/logo/1ka_logo_arnes.svg");
+}
+
+.header_settings_holder {
+  top: 0px;
+  right: 20px;
+  left: auto;
+}
+.header_settings_holder .progress_bar span {
+  float: left !important; /* ie6,7 doesnt support inline-block */
+  display: block;
+  width: 20px;
+  font-size: 14px;
+  line-height: 16px;
+  color: #6D87AF;
+}
+.header_settings_holder .progress_bar div {
+  height: 10px;
+  width: 130px;
+  padding: 2px;
+  margin: 0 5px;
+  border: 1px #cccccc solid;
+  background-color: #ffffff;
+}
+.header_settings_holder .progress_bar div span {
+  height: 10px;
+  background-color: #666666;
+}
+.header_settings_holder .progress_bar p a {
+  color: #666666;
+  text-decoration: none;
+}
+.header_settings_holder .progress_bar p a:hover {
+  color: #8c8c8c;
+}
+.header_settings_holder .continue_later_setting a {
+  color: #666666;
+}
+.header_settings_holder .continue_later_setting a:hover {
+  color: #8c8c8c;
+}
+.header_settings_holder .tawk_chat a {
+  color: #666666;
+}
+.header_settings_holder .tawk_chat a:hover {
+  color: #8c8c8c;
+}
+
+/* Uvod in zakljucek */
+.intro .spremenljivka .naslov,
+.concl .spremenljivka .naslov {
+  margin: 0;
+}
+
+#continue_later input[type=email],
+#return_edit input[type=email] {
+  margin-left: 4px;
+}
+#continue_later button,
+#return_edit button {
+  padding: 7px 20px;
+  margin-left: 4px;
+}
+
+/* Spremenljivke */
+.spremenljivka {
+  margin: 0;
+  padding: 48px 16px !important;
+  border-bottom: 1px #E5E5E5 solid;
+}
+.spremenljivka .naslov {
+  padding: 0 !important;
+  margin: 0 0 24px 0;
+  font-size: 20px;
+  font-weight: 600;
+}
+.spremenljivka .naslov .spremenljivka_info {
+  font-size: 14px;
+  font-weight: 400;
+  padding-top: 8px;
+}
+.spremenljivka .sequence_number {
+  background-color: #eeeeee;
+  color: #888888;
+}
+.spremenljivka .sequence_number:hover {
+  background-color: #d5d5d5;
+}
+.spremenljivka .sequence_number.active {
+  background-color: #888888;
+  color: #ffffff;
+}
+.spremenljivka .counter {
+  font-size: 18px;
+}
+.spremenljivka #dynamic_count {
+  color: #666666;
+}
+.spremenljivka .arrow {
+  color: #666666;
+}
+.spremenljivka .arrow:hover {
+  color: #8c8c8c;
+}
+.spremenljivka span.reminder {
+  left: 3px;
+  text-indent: 0;
+}
+
+.spremenljivka.limited {
+  outline: 1px #F15A24 solid;
+}
+
+.required, .required_require, .required_limit {
+  outline: 1px #F15A24 solid;
+}
+
+.spremenljivka.tip_1 .variabla,
+.spremenljivka.tip_2 .variabla {
+  display: flex;
+  align-items: center;
+}
+.spremenljivka.tip_1 .variabla.floatLeft,
+.spremenljivka.tip_2 .variabla.floatLeft {
+  margin-right: 16px;
+}
+.spremenljivka.tip_1 .variabla label,
+.spremenljivka.tip_2 .variabla label {
+  display: flex;
+  line-height: 23px;
+}
+.spremenljivka.tip_1 .variabla input[type=text].input_other,
+.spremenljivka.tip_1 .variabla textarea.input_other,
+.spremenljivka.tip_2 .variabla input[type=text].input_other,
+.spremenljivka.tip_2 .variabla textarea.input_other {
+  margin: 0 0 0 8px;
+}
+.spremenljivka.tip_1 .custom_radio_picture,
+.spremenljivka.tip_1 .visual-radio-scale,
+.spremenljivka.tip_2 .custom_radio_picture,
+.spremenljivka.tip_2 .visual-radio-scale {
+  display: inline-block;
+  margin-right: 24px;
+}
+.spremenljivka.tip_1 .custom_radio_picture label,
+.spremenljivka.tip_1 .visual-radio-scale label,
+.spremenljivka.tip_2 .custom_radio_picture label,
+.spremenljivka.tip_2 .visual-radio-scale label {
+  display: inline-block !important;
+}
+
+.spremenljivka.tip_7 input.width_100:not(:first-of-type) {
+  margin-top: 16px;
+}
+
+.variabla.missing:first-of-type {
+  margin-top: 16px;
+}
+
+.spremenljivka .variabla.missing label {
+  padding: 0;
+}
+
+div.variabla,
+td.variabla,
+td.question,
+td.differential,
+.variabla_sum label {
+  font-size: 16px;
+}
+
+div.variable_holder {
+  padding: 0 !important;
+}
+div.variable_holder .variabla {
+  padding: 0;
+  margin-bottom: 16px;
+}
+div.variable_holder .variabla:last-child {
+  margin-bottom: 0;
+}
+div.variable_holder thead,
+div.variable_holder tr.table-header {
+  font-weight: normal;
+  font-size: 16px;
+}
+div.variable_holder thead td,
+div.variable_holder tr.table-header td {
+  padding: 10px 5px;
+}
+
+table.grid_table tbody tr.table-header td {
+  border-top: 2px #888888 solid;
+  background-color: #ffffff;
+}
+table.grid_table tbody tr:nth-child(2n+1) {
+  background-color: #eeeeee;
+}
+table.grid_table tbody tr:nth-child(2n) {
+  background-color: #ffffff;
+}
+table.grid_table td {
+  padding: 12px 16px;
+}
+
+/* Textboxi, textarea, select */
+input, textarea, select {
+  font-family: Source Sans Pro, sans-serif !important;
+}
+
+input[type=text], textarea, select {
+  padding: 10px 15px;
+  border-radius: 3px;
+  border: 1px solid #d1d1d1;
+  border-radius: 3px;
+  background-color: #fff;
+}
+
+/* ranking */
+.dropzone {
+  margin-top: 12px;
+  padding-top: 17px;
+}
+
+table.ranking_table ul {
+  margin-top: 19px;
+}
+
+.ranking,
+.ranking_long,
+.handle,
+.handle_long,
+.ime,
+.izbran,
+.frame_ranking,
+.frame_ranking_hover,
+.frame_dropping,
+.frame_dropping_hover,
+.frame_moving {
+  font-size: 16px;
+  padding: 8px 12px 14px;
+  border: 2px solid #666666;
+  background-color: #ffffff;
+}
+
+.ranking:hover {
+  background-color: #f5fafe;
+}
+
+div.variable_holder .frame_ranking_hover {
+  border: 2px #666666 solid;
+  background-color: #eeeeee;
+}
+
+div.variable_holder .frame_ranking,
+div.variable_holder .frame_moving,
+div.variable_holder .frame_dropping,
+div.variable_holder .frame_dropping_hover {
+  text-indent: -35px;
+  border: 2px #888888 solid;
+  background-color: #eeeeee;
+}
+
+table.ranking_table b {
+  font-size: 16px;
+  font-weight: 600;
+}
+
+/* Photo upload button */
+button.record_foto {
+  border: 2px solid #666666;
+}
+button.record_foto::before {
+  color: #666666;
+}
+button.record_foto:hover, button.record_foto:focus {
+  border-color: #8c8c8c;
+}
+button.record_foto:hover::before, button.record_foto:focus::before {
+  color: #8c8c8c;
+}
+
+/* Koledar */
+.ui-datepicker {
+  font-size: 14px;
+}
+
+button.ui-datepicker-trigger {
+  color: #666666;
+}
+button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus {
+  color: #8c8c8c;
+}
+
+/* Slider */
+.grupa .spremenljivka .ui-slider-pips .ui-slider-pip {
+  color: #333333;
+}
+.grupa .spremenljivka .slider.ui-widget-content {
+  /*background-color: $color_light !important;*/
+  background-image: none !important;
+  border: 0;
+}
+.grupa .spremenljivka .ui-slider-horizontal {
+  height: 8px;
+}
+.grupa .spremenljivka .ui-slider-handle {
+  cursor: pointer;
+  height: 10px !important;
+  width: 18px !important;
+  margin-top: 1px;
+  border: 0;
+  border-radius: 15px 15px !important;
+  background-color: #666666 !important;
+  background-image: none !important;
+}
+.grupa .spremenljivka .ui-slider-handle:active {
+  background-color: #666666 !important;
+}
+.grupa .spremenljivka .sliderText {
+  padding-top: 2px;
+  color: #333333;
+  background-color: #888888;
+  border: 0;
+}
+.grupa .spremenljivka .sliderText::after {
+  border-color: #888888 transparent;
+}
+
+/* Warning levo od vprasanja */
+.validation_alert {
+  position: absolute;
+  z-index: 51;
+  top: 20px;
+  left: -150px;
+  width: 130px;
+  min-height: 29px;
+  margin: 0;
+  text-align: center;
+  font-size: 11px;
+  line-height: 14px;
+  background-color: #eeeeee;
+  border: 2px solid red;
+  padding: 4px 7px;
+  border-radius: 4px;
+  box-shadow: none;
+}
+
+/* Gumbi na dnu */
+div.buttons {
+  padding: 64px 0;
+  margin: 0;
+}
+div.buttons input {
+  cursor: pointer;
+  margin: 8px 10px;
+  padding: 0 32px;
+  height: 40px;
+  text-align: center;
+  font-size: 16px;
+  font-weight: 600;
+  color: #FFFFFF;
+  border: 0;
+  transition: 0.3s;
+}
+div.buttons input.next {
+  background-color: #666666;
+  border: 1px solid #666666;
+}
+div.buttons input.next:hover, div.buttons input.next:focus {
+  background-color: #8c8c8c;
+  border: 1px solid #8c8c8c;
+}
+div.buttons input.prev {
+  color: #666666;
+  background-color: #fff;
+  border: 1px solid #666666;
+}
+div.buttons input.prev:hover, div.buttons input.prev:focus {
+  color: #fff;
+  background-color: #666666;
+}
+
+/* Footer */
+#footer_survey {
+  padding: 48px 0 64px 0;
+  background-color: #ffffff;
+  border-top: 1px #E5E5E5 solid;
+}
+#footer_survey p, #footer_survey a, #footer_survey a:visited {
+  color: #333333;
+  font-size: 14px;
+  line-height: 25px;
+  font-weight: 400;
+  text-decoration: none;
+}
+#footer_survey a:hover, #footer_survey a:active {
+  text-decoration: none;
+}
+
+/* awesome radio in checkboxi */
+input[type=checkbox] + span.enka-checkbox-radio,
+input[type=radio] + span.enka-checkbox-radio,
+.custom_radio_picture.obarvan > label > span.enka-custom-radio:before,
+.visual-radio-scale.checked .enka-vizualna-skala {
+  color: #888888;
+  font-size: 20px;
+  vertical-align: -1px;
+}
+
+input[type=checkbox]:focus + span.enka-checkbox-radio:before,
+input[type=radio]:focus + span.enka-checkbox-radio:before,
+input[type=radio]:focus + span.enka-custom-radio:before,
+input[type=radio]:focus + span.enka-vizualna-skala::before {
+  color: #484848;
+}
+
+input[type=text]:focus,
+input[type=number]:focus,
+input[type=email]:focus,
+input[type=password]:focus,
+textarea:focus {
+  border-color: #888888;
+}
+
+/* Ranking drag drop */
+.drag_and_drop {
+  top: -9px;
+  left: -12px;
+}
+
+.drag_and_drop_right {
+  top: -9px !important;
+  left: -12px !important;
+}
+
+.frame_dropping_titles {
+  width: 244px;
+  padding: 5px;
+  margin: 0px auto 0px auto;
+  height: 20px;
+  text-align: center;
+  background-color: #FFFFFF;
+  border-top: 2px solid #b9c5d9;
+  border-left: 2px solid #b9c5d9;
+  border-right: 2px solid #b9c5d9;
+  font-size: 16px;
+}
+
+.drag_and_drop_box {
+  top: -9px;
+  left: -12px;
+}
+.drag_and_drop_box img {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.drag_and_drop_box_right {
+  top: 19px !important;
+  left: -12px !important;
+}
+
+.drag_and_drop_box_right_after_refresh {
+  /*top: 44px!important;*/
+  left: -12px !important;
+}
+
+.drag_and_drop_box_right_over {
+  left: -12px !important;
+}
+
+.frame_dropping_titles_box {
+  width: 244px;
+  padding: 5px;
+  margin: 0px auto 0px auto;
+  height: 20px;
+  text-align: center;
+  background-color: #FFFFFF;
+  font-size: 16px;
+}
+
+.frame_dropping {
+  width: 234px;
+  padding: 7px 10px 9px;
+}
+
+.frame_dropping_box {
+  padding: 7px 10px 9px;
+}
+
+/* Popravimo se logo */
+#logo {
+  background-image: url("../../../public/img/logo/cdi_slo.png") !important;
+}
+
+#logo.english {
+  background-image: url("../../../public/img/logo/cdi_eng.png") !important;
+}
+
+/*# sourceMappingURL=Cdi.css.map */
diff --git a/main/survey/skins/Default/arrowD.png b/main/survey/skins/Default/arrowD.png
new file mode 100644
index 0000000..d7ebd4e
--- /dev/null
+++ b/main/survey/skins/Default/arrowD.png
diff --git a/main/survey/skins/Default/arrowD2.png b/main/survey/skins/Default/arrowD2.png
new file mode 100644
index 0000000..676b840
--- /dev/null
+++ b/main/survey/skins/Default/arrowD2.png
diff --git a/main/survey/skins/Default/arrowL.png b/main/survey/skins/Default/arrowL.png
new file mode 100644
index 0000000..fcf6bfe
--- /dev/null
+++ b/main/survey/skins/Default/arrowL.png
diff --git a/main/survey/skins/Default/arrowL2.png b/main/survey/skins/Default/arrowL2.png
new file mode 100644
index 0000000..d7dfb56
--- /dev/null
+++ b/main/survey/skins/Default/arrowL2.png
diff --git a/main/survey/skins/Default/arrowR.png b/main/survey/skins/Default/arrowR.png
new file mode 100644
index 0000000..68481f6
--- /dev/null
+++ b/main/survey/skins/Default/arrowR.png
diff --git a/main/survey/skins/Default/arrowR2.png b/main/survey/skins/Default/arrowR2.png
new file mode 100644
index 0000000..eb1b035
--- /dev/null
+++ b/main/survey/skins/Default/arrowR2.png
diff --git a/main/survey/skins/Default/arrowU.png b/main/survey/skins/Default/arrowU.png
new file mode 100644
index 0000000..9cf2cd8
--- /dev/null
+++ b/main/survey/skins/Default/arrowU.png
diff --git a/main/survey/skins/Default/arrowU2.png b/main/survey/skins/Default/arrowU2.png
new file mode 100644
index 0000000..dde25fa
--- /dev/null
+++ b/main/survey/skins/Default/arrowU2.png
diff --git a/main/survey/skins/Default/logo-small.png b/main/survey/skins/Default/logo-small.png
new file mode 100644
index 0000000..d0d20e1
--- /dev/null
+++ b/main/survey/skins/Default/logo-small.png
diff --git a/main/survey/skins/Default/logo_transparent.png b/main/survey/skins/Default/logo_transparent.png
new file mode 100644
index 0000000..883833d
--- /dev/null
+++ b/main/survey/skins/Default/logo_transparent.png
diff --git a/main/survey/skins/Default/webcam_record.png b/main/survey/skins/Default/webcam_record.png
new file mode 100644
index 0000000..c8a061d
--- /dev/null
+++ b/main/survey/skins/Default/webcam_record.png
diff --git a/main/survey/skins/Fdv.css b/main/survey/skins/Fdv.css
index 05b140c..048cc02 100644
--- a/main/survey/skins/Fdv.css
+++ b/main/survey/skins/Fdv.css
@@ -6,13 +6,14 @@
 /*
 	Osnovna tema ankete - 1ka - brez definiranih barv
 */
+/* Barve */
 /* Fonti */
 body {
   margin: 0;
   padding: 0;
-  color: #505050;
+  color: #333333;
   font-size: 100%;
-  font-family: Montserrat, Arial, Sans-Serif !important;
+  font-family: Source Sans Pro, sans-serif !important;
   background: #ffffff;
 }
 
@@ -28,13 +29,15 @@ body.preview, body.testdata {
   position: absolute;
   width: 100%;
   height: 80px;
-  border-bottom: 6px #666666 solid;
+  border-bottom: 2px #666666 solid;
 }
 #outercontainer #container {
   position: relative;
   width: 100%;
   max-width: 1200px;
-  margin: 0px auto 10px;
+  margin: 0px auto;
+  padding: 0 16px;
+  box-sizing: border-box;
 }
 
 /* Warning bar (preview, cookie) */
@@ -69,12 +72,14 @@ body.preview, body.testdata {
 
 /* Header - logo, naslov, progressbar */
 h1 {
-  margin: 0px auto 30px;
-  padding: 120px 0 50px 0;
-  font-size: 28px;
+  margin: 0px auto;
+  padding: 114px 0 32px 0;
+  font-size: 32px;
+  font-weight: 600;
+  line-height: 40px;
   color: #666666;
   text-align: center;
-  border-bottom: 1px solid #eeeeee;
+  border-bottom: 1px solid #E5E5E5;
 }
 
 h1.evalvacija {
@@ -83,10 +88,10 @@ h1.evalvacija {
 
 #logo {
   right: auto;
-  left: 25px;
+  left: 16px;
   top: 13px;
   max-height: 56px !important;
-  background: url("../../../public/img/logo/1ka_slo.svg");
+  background: url("../../../public/img/logo/1ka_logo_slo.svg");
   background-repeat: no-repeat !important;
   background-size: auto 100% !important;
 }
@@ -96,7 +101,19 @@ h1.evalvacija {
 }
 
 #logo.english {
-  background: url("../../../public/img/logo/1ka_eng.svg");
+  background: url("../../../public/img/logo/1ka_logo_eng.svg");
+}
+
+#logo.namestitev {
+  background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
+#logo.namestitev.english {
+  background: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
+#logo.arnes {
+  background: url("../../../public/img/logo/1ka_logo_arnes.svg");
 }
 
 .header_settings_holder {
@@ -105,11 +122,11 @@ h1.evalvacija {
   left: auto;
 }
 .header_settings_holder .progress_bar span {
-  float: left !important;
-  /* ie6,7 doesnt support inline-block */
+  float: left !important; /* ie6,7 doesnt support inline-block */
   display: block;
   width: 20px;
-  font-size: 11px;
+  font-size: 14px;
+  line-height: 16px;
   color: #6D87AF;
 }
 .header_settings_holder .progress_bar div {
@@ -144,21 +161,38 @@ h1.evalvacija {
   color: #8c8c8c;
 }
 
+/* Uvod in zakljucek */
+.intro .spremenljivka .naslov,
+.concl .spremenljivka .naslov {
+  margin: 0;
+}
+
+#continue_later input[type=email],
+#return_edit input[type=email] {
+  margin-left: 4px;
+}
+#continue_later button,
+#return_edit button {
+  padding: 7px 20px;
+  margin-left: 4px;
+}
+
 /* Spremenljivke */
 .spremenljivka {
-  margin: 20px 10px 20px 10px;
-  padding: 20px 2px 50px 12px !important;
-  border-bottom: 1px #eeeeee solid;
+  margin: 0;
+  padding: 48px 16px !important;
+  border-bottom: 1px #E5E5E5 solid;
 }
 .spremenljivka .naslov {
-  padding: 5px 0 15px 5px;
-  font-size: 18px;
+  padding: 0 !important;
+  margin: 0 0 24px 0;
+  font-size: 20px;
   font-weight: 600;
 }
 .spremenljivka .naslov .spremenljivka_info {
   font-size: 14px;
   font-weight: 400;
-  padding-top: 7px;
+  padding-top: 8px;
 }
 .spremenljivka .sequence_number {
   background-color: #eeeeee;
@@ -183,6 +217,10 @@ h1.evalvacija {
 .spremenljivka .arrow:hover {
   color: #8c8c8c;
 }
+.spremenljivka span.reminder {
+  left: 3px;
+  text-indent: 0;
+}
 
 .spremenljivka.limited {
   outline: 1px #F15A24 solid;
@@ -192,55 +230,97 @@ h1.evalvacija {
   outline: 1px #F15A24 solid;
 }
 
+.spremenljivka.tip_1 .variabla,
+.spremenljivka.tip_2 .variabla {
+  display: flex;
+  align-items: center;
+}
+.spremenljivka.tip_1 .variabla.floatLeft,
+.spremenljivka.tip_2 .variabla.floatLeft {
+  margin-right: 16px;
+}
+.spremenljivka.tip_1 .variabla label,
+.spremenljivka.tip_2 .variabla label {
+  display: flex;
+  line-height: 23px;
+}
+.spremenljivka.tip_1 .variabla input[type=text].input_other,
+.spremenljivka.tip_1 .variabla textarea.input_other,
+.spremenljivka.tip_2 .variabla input[type=text].input_other,
+.spremenljivka.tip_2 .variabla textarea.input_other {
+  margin: 0 0 0 8px;
+}
+.spremenljivka.tip_1 .custom_radio_picture,
+.spremenljivka.tip_1 .visual-radio-scale,
+.spremenljivka.tip_2 .custom_radio_picture,
+.spremenljivka.tip_2 .visual-radio-scale {
+  display: inline-block;
+  margin-right: 24px;
+}
+.spremenljivka.tip_1 .custom_radio_picture label,
+.spremenljivka.tip_1 .visual-radio-scale label,
+.spremenljivka.tip_2 .custom_radio_picture label,
+.spremenljivka.tip_2 .visual-radio-scale label {
+  display: inline-block !important;
+}
+
+.spremenljivka.tip_7 input.width_100:not(:first-of-type) {
+  margin-top: 16px;
+}
+
+.variabla.missing:first-of-type {
+  margin-top: 16px;
+}
+
+.spremenljivka .variabla.missing label {
+  padding: 0;
+}
+
 div.variabla,
 td.variabla,
 td.question,
 td.differential,
 .variabla_sum label {
-  font-size: 14px;
+  font-size: 16px;
 }
 
 div.variable_holder {
-  padding: 10px 0 0 0;
+  padding: 0 !important;
+}
+div.variable_holder .variabla {
+  padding: 0;
+  margin-bottom: 16px;
+}
+div.variable_holder .variabla:last-child {
+  margin-bottom: 0;
 }
 div.variable_holder thead,
 div.variable_holder tr.table-header {
   font-weight: normal;
-  font-size: 14px;
+  font-size: 16px;
 }
 div.variable_holder thead td,
 div.variable_holder tr.table-header td {
   padding: 10px 5px;
 }
 
-table.grid_table thead tr td {
-  border-bottom: 2px #888888 solid;
-}
-table.grid_table thead tr.middle_row td {
-  border-top: 2px #888888 solid;
-}
 table.grid_table tbody tr.table-header td {
-  border-bottom: 2px #888888 solid;
   border-top: 2px #888888 solid;
   background-color: #ffffff;
 }
 table.grid_table tbody tr:nth-child(2n+1) {
-  background-color: #ffffff;
+  background-color: #eeeeee;
 }
 table.grid_table tbody tr:nth-child(2n) {
-  background-color: #eeeeee;
+  background-color: #ffffff;
 }
 table.grid_table td {
-  padding: 10px 10px;
-}
-
-span.reminder {
-  left: 3px;
+  padding: 12px 16px;
 }
 
 /* Textboxi, textarea, select */
 input, textarea, select {
-  font-family: Montserrat, Arial, Sans-Serif !important;
+  font-family: Source Sans Pro, sans-serif !important;
 }
 
 input[type=text], textarea, select {
@@ -253,7 +333,6 @@ input[type=text], textarea, select {
 
 /* ranking */
 .dropzone {
-  border-top: 1px #eeeeee solid;
   margin-top: 12px;
   padding-top: 17px;
 }
@@ -273,8 +352,8 @@ table.ranking_table ul {
 .frame_dropping,
 .frame_dropping_hover,
 .frame_moving {
-  font-size: 13px;
-  padding: 7px 10px 9px;
+  font-size: 16px;
+  padding: 8px 12px 14px;
   border: 2px solid #666666;
   background-color: #ffffff;
 }
@@ -298,7 +377,7 @@ div.variable_holder .frame_dropping_hover {
 }
 
 table.ranking_table b {
-  font-size: 13px;
+  font-size: 16px;
   font-weight: 600;
 }
 
@@ -330,7 +409,7 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus {
 
 /* Slider */
 .grupa .spremenljivka .ui-slider-pips .ui-slider-pip {
-  color: #505050;
+  color: #333333;
 }
 .grupa .spremenljivka .slider.ui-widget-content {
   /*background-color: $color_light !important;*/
@@ -355,7 +434,7 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus {
 }
 .grupa .spremenljivka .sliderText {
   padding-top: 2px;
-  color: #505050;
+  color: #333333;
   background-color: #888888;
   border: 0;
 }
@@ -384,21 +463,20 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus {
 
 /* Gumbi na dnu */
 div.buttons {
-  padding: 20px 20px 35px;
-  margin: 0 10px;
+  padding: 64px 0;
+  margin: 0;
 }
 div.buttons input {
   cursor: pointer;
   margin: 8px 10px;
-  /*padding: 7px 11px;*/
-  padding: 10px 20px;
+  padding: 0 32px;
+  height: 40px;
   text-align: center;
-  font-size: 12px;
-  letter-spacing: 1px;
+  font-size: 16px;
   font-weight: 600;
   color: #FFFFFF;
-  border-radius: 20px;
   border: 0;
+  transition: 0.3s;
 }
 div.buttons input.next {
   background-color: #666666;
@@ -420,12 +498,12 @@ div.buttons input.prev:hover, div.buttons input.prev:focus {
 
 /* Footer */
 #footer_survey {
-  padding: 40px;
+  padding: 48px 0 64px 0;
   background-color: #ffffff;
-  border-top: 1px #eeeeee solid;
+  border-top: 1px #E5E5E5 solid;
 }
 #footer_survey p, #footer_survey a, #footer_survey a:visited {
-  color: #505050;
+  color: #333333;
   font-size: 14px;
   line-height: 25px;
   font-weight: 400;
@@ -472,16 +550,16 @@ textarea:focus {
 }
 
 .frame_dropping_titles {
-  width: 240px;
+  width: 244px;
   padding: 5px;
   margin: 0px auto 0px auto;
-  height: 15px;
+  height: 20px;
   text-align: center;
   background-color: #FFFFFF;
   border-top: 2px solid #b9c5d9;
   border-left: 2px solid #b9c5d9;
   border-right: 2px solid #b9c5d9;
-  font-size: 13px;
+  font-size: 16px;
 }
 
 .drag_and_drop_box {
@@ -509,16 +587,17 @@ textarea:focus {
 }
 
 .frame_dropping_titles_box {
-  width: 240px;
+  width: 244px;
   padding: 5px;
   margin: 0px auto 0px auto;
-  height: 15px;
+  height: 20px;
   text-align: center;
   background-color: #FFFFFF;
-  font-size: 13px;
+  font-size: 16px;
 }
 
 .frame_dropping {
+  width: 234px;
   padding: 7px 10px 9px;
 }
 
@@ -528,7 +607,7 @@ textarea:focus {
 
 /* Popravimo se logo */
 #logo, #logo.english {
-  background-image: url("../../../public/img/logo/fdv.png");
+  background-image: url("../../../public/img/logo/fdv.png") !important;
 }
 
 /*# sourceMappingURL=Fdv.css.map */
diff --git a/main/survey/skins/MobileBlack.css b/main/survey/skins/MobileBlack.css
index 33c9a26..2459f0e 100644
--- a/main/survey/skins/MobileBlack.css
+++ b/main/survey/skins/MobileBlack.css
@@ -9,26 +9,26 @@
 */
 /* Fonti */
 body {
-  font-family: Montserrat, Arial, Sans-Serif !important;
-  color: #505050;
+  font-family: Source Sans Pro, sans-serif !important;
+  color: #333;
   background-color: white;
 }
 
 span, label {
-  color: #505050;
+  color: #333;
 }
 
 /* GLAVNI ELEMENTI */
 #container h1 {
   color: #333333;
   background-color: #ffffff;
-  border-bottom: 8px #333333 solid;
+  border-bottom: 2px #333333 solid;
 }
 
 /* INPUT ELEMENTI */
 /* Textboxi, textarea, select */
 input, textarea, select {
-  font-family: Montserrat, Arial, Sans-Serif !important;
+  font-family: Source Sans Pro, sans-serif !important;
 }
 
 input[type=text], textarea, select {
@@ -49,17 +49,17 @@ input[type=radio] + span.enka-checkbox-radio,
 .grupa .spremenljivka {
   background-color: white;
   border: 0;
-  border-bottom: 1px #444444 solid;
+  border-bottom: 1px #E5E5E5 solid;
   /* Mejnik pri dvojni tabeli */
 }
 .grupa .spremenljivka:last-of-type {
   border-bottom: 0;
 }
 .grupa .spremenljivka .naslov {
-  color: #505050;
+  color: #333;
 }
 .grupa .spremenljivka .naslov .spremenljivka_info {
-  color: #505050;
+  color: #333;
 }
 .grupa .spremenljivka .sequence_number {
   background-color: #eaeaea;
@@ -116,7 +116,7 @@ input[type=radio] + span.enka-checkbox-radio,
 }
 
 .variable_holder .variabla {
-  color: #505050;
+  color: #333;
 }
 
 /* Koledar */
@@ -146,21 +146,19 @@ button.ui-datepicker-trigger:hover {
   margin-top: 20px;
   margin-bottom: 10px;
   padding-top: 10px;
-  border-top: 1px #444444 solid !important;
+  border-top: 1px #E5E5E5 solid !important;
 }
 .buttons input {
   cursor: pointer;
   margin: 8px 5px;
-  padding: 10px 20px;
+  padding: 10px 24px !important;
   text-align: center;
   font-size: 15px;
   letter-spacing: 0px;
   font-weight: 600;
   color: #FFFFFF;
-  border-radius: 20px;
-  -moz-border-radius: 20px 20px 20px 20px;
-  -webkit-border-radius: 20px;
   border: 0;
+  transition: 0.3s;
 }
 .buttons input.next {
   background-color: #333333;
@@ -182,13 +180,13 @@ button.ui-datepicker-trigger:hover {
 
 /* FOOTER */
 #footer_survey {
-  color: #505050;
-  border-top: 3px #333333 solid;
+  color: #333;
+  border-top: 1px #E5E5E5 solid;
 }
 #footer_survey a {
   font-weight: normal;
   text-decoration: none;
-  color: #505050;
+  color: #333;
 }
 
 /* LOGO */
@@ -204,7 +202,7 @@ button.ui-datepicker-trigger:hover {
   margin: 10px auto 30px auto;
   left: 0;
   right: 0;
-  background-image: url("../../../public/img/logo/1ka_slo.svg");
+  background-image: url("../../../public/img/logo/1ka_logo_slo.svg");
   background-repeat: no-repeat;
   background-size: auto 100% !important;
   background-position: center;
@@ -222,7 +220,19 @@ button.ui-datepicker-trigger:hover {
 }
 
 #footer_survey #logo.english {
-  background-image: url("../../../public/img/logo/1ka_eng.svg");
+  background-image: url("../../../public/img/logo/1ka_logo_eng.svg");
+}
+
+#footer_survey #logo.namestitev {
+  background-image: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
+#footer_survey #logo.namestitev.english {
+  background-image: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
+#footer_survey #logo.arnes {
+  background-image: url("../../../public/img/logo/1ka_logo_arnes.svg");
 }
 
 /*# sourceMappingURL=MobileBlack.css.map */
diff --git a/main/survey/skins/MobileBlue.css b/main/survey/skins/MobileBlue.css
index 980420a..4720d21 100644
--- a/main/survey/skins/MobileBlue.css
+++ b/main/survey/skins/MobileBlue.css
@@ -8,26 +8,26 @@
 */
 /* Fonti */
 body {
-  font-family: Montserrat, Arial, Sans-Serif !important;
-  color: #505050;
+  font-family: Source Sans Pro, sans-serif !important;
+  color: #333;
   background-color: white;
 }
 
 span, label {
-  color: #505050;
+  color: #333;
 }
 
 /* GLAVNI ELEMENTI */
 #container h1 {
   color: #1e88e5;
   background-color: #ffffff;
-  border-bottom: 8px #1e88e5 solid;
+  border-bottom: 2px #1e88e5 solid;
 }
 
 /* INPUT ELEMENTI */
 /* Textboxi, textarea, select */
 input, textarea, select {
-  font-family: Montserrat, Arial, Sans-Serif !important;
+  font-family: Source Sans Pro, sans-serif !important;
 }
 
 input[type=text], textarea, select {
@@ -48,17 +48,17 @@ input[type=radio] + span.enka-checkbox-radio,
 .grupa .spremenljivka {
   background-color: white;
   border: 0;
-  border-bottom: 1px #42A5F5 solid;
+  border-bottom: 1px #E5E5E5 solid;
   /* Mejnik pri dvojni tabeli */
 }
 .grupa .spremenljivka:last-of-type {
   border-bottom: 0;
 }
 .grupa .spremenljivka .naslov {
-  color: #505050;
+  color: #333;
 }
 .grupa .spremenljivka .naslov .spremenljivka_info {
-  color: #505050;
+  color: #333;
 }
 .grupa .spremenljivka .sequence_number {
   background-color: #ddeffd;
@@ -115,7 +115,7 @@ input[type=radio] + span.enka-checkbox-radio,
 }
 
 .variable_holder .variabla {
-  color: #505050;
+  color: #333;
 }
 
 /* Koledar */
@@ -123,7 +123,7 @@ button.ui-datepicker-trigger {
   color: #1e88e5;
 }
 button.ui-datepicker-trigger:hover {
-  color: #ffa608;
+  color: #1360a4;
 }
 
 /* Opcija nadaljuj kasneje */
@@ -131,13 +131,13 @@ button.ui-datepicker-trigger:hover {
   color: #1e88e5;
 }
 .header_settings_holder .continue_later_setting a:hover {
-  color: #ffa608;
+  color: #1360a4;
 }
 .header_settings_holder .tawk_chat a {
   color: #1e88e5;
 }
 .header_settings_holder .tawk_chat a:hover {
-  color: #ffa608;
+  color: #1360a4;
 }
 
 /* GUMBI NAPREJ/NAZAJ */
@@ -145,29 +145,27 @@ button.ui-datepicker-trigger:hover {
   margin-top: 20px;
   margin-bottom: 10px;
   padding-top: 10px;
-  border-top: 1px #42A5F5 solid !important;
+  border-top: 1px #E5E5E5 solid !important;
 }
 .buttons input {
   cursor: pointer;
   margin: 8px 5px;
-  padding: 10px 20px;
+  padding: 10px 24px !important;
   text-align: center;
   font-size: 15px;
   letter-spacing: 0px;
   font-weight: 600;
   color: #FFFFFF;
-  border-radius: 20px;
-  -moz-border-radius: 20px 20px 20px 20px;
-  -webkit-border-radius: 20px;
   border: 0;
+  transition: 0.3s;
 }
 .buttons input.next {
   background-color: #1e88e5;
   border: 1px solid #1e88e5;
 }
 .buttons input.next:hover {
-  background-color: #ffa608;
-  border: 1px solid #ffa608;
+  background-color: #1360a4;
+  border: 1px solid #1360a4;
 }
 .buttons input.prev {
   color: #1e88e5;
@@ -181,13 +179,13 @@ button.ui-datepicker-trigger:hover {
 
 /* FOOTER */
 #footer_survey {
-  color: #505050;
-  border-top: 3px #1e88e5 solid;
+  color: #333;
+  border-top: 1px #E5E5E5 solid;
 }
 #footer_survey a {
   font-weight: normal;
   text-decoration: none;
-  color: #505050;
+  color: #333;
 }
 
 /* LOGO */
@@ -203,7 +201,7 @@ button.ui-datepicker-trigger:hover {
   margin: 10px auto 30px auto;
   left: 0;
   right: 0;
-  background-image: url("../../../public/img/logo/1ka_slo.svg");
+  background-image: url("../../../public/img/logo/1ka_logo_slo.svg");
   background-repeat: no-repeat;
   background-size: auto 100% !important;
   background-position: center;
@@ -221,7 +219,19 @@ button.ui-datepicker-trigger:hover {
 }
 
 #footer_survey #logo.english {
-  background-image: url("../../../public/img/logo/1ka_eng.svg");
+  background-image: url("../../../public/img/logo/1ka_logo_eng.svg");
+}
+
+#footer_survey #logo.namestitev {
+  background-image: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
+#footer_survey #logo.namestitev.english {
+  background-image: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
+#footer_survey #logo.arnes {
+  background-image: url("../../../public/img/logo/1ka_logo_arnes.svg");
 }
 
 /*# sourceMappingURL=MobileBlue.css.map */
diff --git a/main/survey/skins/MobileCdi.css b/main/survey/skins/MobileCdi.css
index 81973d6..27c2cc1 100644
--- a/main/survey/skins/MobileCdi.css
+++ b/main/survey/skins/MobileCdi.css
@@ -9,26 +9,26 @@
 */
 /* Fonti */
 body {
-  font-family: Montserrat, Arial, Sans-Serif !important;
-  color: #505050;
+  font-family: Source Sans Pro, sans-serif !important;
+  color: #333;
   background-color: white;
 }
 
 span, label {
-  color: #505050;
+  color: #333;
 }
 
 /* GLAVNI ELEMENTI */
 #container h1 {
   color: #666666;
   background-color: #ffffff;
-  border-bottom: 8px #666666 solid;
+  border-bottom: 2px #666666 solid;
 }
 
 /* INPUT ELEMENTI */
 /* Textboxi, textarea, select */
 input, textarea, select {
-  font-family: Montserrat, Arial, Sans-Serif !important;
+  font-family: Source Sans Pro, sans-serif !important;
 }
 
 input[type=text], textarea, select {
@@ -49,17 +49,17 @@ input[type=radio] + span.enka-checkbox-radio,
 .grupa .spremenljivka {
   background-color: white;
   border: 0;
-  border-bottom: 1px #888888 solid;
+  border-bottom: 1px #E5E5E5 solid;
   /* Mejnik pri dvojni tabeli */
 }
 .grupa .spremenljivka:last-of-type {
   border-bottom: 0;
 }
 .grupa .spremenljivka .naslov {
-  color: #505050;
+  color: #333;
 }
 .grupa .spremenljivka .naslov .spremenljivka_info {
-  color: #505050;
+  color: #333;
 }
 .grupa .spremenljivka .sequence_number {
   background-color: #eeeeee;
@@ -116,7 +116,7 @@ input[type=radio] + span.enka-checkbox-radio,
 }
 
 .variable_holder .variabla {
-  color: #505050;
+  color: #333;
 }
 
 /* Koledar */
@@ -146,21 +146,19 @@ button.ui-datepicker-trigger:hover {
   margin-top: 20px;
   margin-bottom: 10px;
   padding-top: 10px;
-  border-top: 1px #888888 solid !important;
+  border-top: 1px #E5E5E5 solid !important;
 }
 .buttons input {
   cursor: pointer;
   margin: 8px 5px;
-  padding: 10px 20px;
+  padding: 10px 24px !important;
   text-align: center;
   font-size: 15px;
   letter-spacing: 0px;
   font-weight: 600;
   color: #FFFFFF;
-  border-radius: 20px;
-  -moz-border-radius: 20px 20px 20px 20px;
-  -webkit-border-radius: 20px;
   border: 0;
+  transition: 0.3s;
 }
 .buttons input.next {
   background-color: #666666;
@@ -182,13 +180,13 @@ button.ui-datepicker-trigger:hover {
 
 /* FOOTER */
 #footer_survey {
-  color: #505050;
-  border-top: 3px #666666 solid;
+  color: #333;
+  border-top: 1px #E5E5E5 solid;
 }
 #footer_survey a {
   font-weight: normal;
   text-decoration: none;
-  color: #505050;
+  color: #333;
 }
 
 /* LOGO */
@@ -204,7 +202,7 @@ button.ui-datepicker-trigger:hover {
   margin: 10px auto 30px auto;
   left: 0;
   right: 0;
-  background-image: url("../../../public/img/logo/1ka_slo.svg");
+  background-image: url("../../../public/img/logo/1ka_logo_slo.svg");
   background-repeat: no-repeat;
   background-size: auto 100% !important;
   background-position: center;
@@ -222,16 +220,28 @@ button.ui-datepicker-trigger:hover {
 }
 
 #footer_survey #logo.english {
-  background-image: url("../../../public/img/logo/1ka_eng.svg");
+  background-image: url("../../../public/img/logo/1ka_logo_eng.svg");
+}
+
+#footer_survey #logo.namestitev {
+  background-image: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
+#footer_survey #logo.namestitev.english {
+  background-image: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
+#footer_survey #logo.arnes {
+  background-image: url("../../../public/img/logo/1ka_logo_arnes.svg");
 }
 
 /* Popravimo se logo */
 #footer_survey #logo {
-  background-image: url("../../../public/img/logo/cdi_slo.png");
+  background-image: url("../../../public/img/logo/cdi_slo.png") !important;
 }
 
 #footer_survey #logo.english {
-  background-image: url("../../../public/img/logo/cdi_eng.png");
+  background-image: url("../../../public/img/logo/cdi_eng.png") !important;
 }
 
 /*# sourceMappingURL=MobileCdi.css.map */
diff --git a/main/survey/skins/MobileFdv.css b/main/survey/skins/MobileFdv.css
index d206d11..743592d 100644
--- a/main/survey/skins/MobileFdv.css
+++ b/main/survey/skins/MobileFdv.css
@@ -9,26 +9,26 @@
 */
 /* Fonti */
 body {
-  font-family: Montserrat, Arial, Sans-Serif !important;
-  color: #505050;
+  font-family: Source Sans Pro, sans-serif !important;
+  color: #333;
   background-color: white;
 }
 
 span, label {
-  color: #505050;
+  color: #333;
 }
 
 /* GLAVNI ELEMENTI */
 #container h1 {
   color: #666666;
   background-color: #ffffff;
-  border-bottom: 8px #666666 solid;
+  border-bottom: 2px #666666 solid;
 }
 
 /* INPUT ELEMENTI */
 /* Textboxi, textarea, select */
 input, textarea, select {
-  font-family: Montserrat, Arial, Sans-Serif !important;
+  font-family: Source Sans Pro, sans-serif !important;
 }
 
 input[type=text], textarea, select {
@@ -49,17 +49,17 @@ input[type=radio] + span.enka-checkbox-radio,
 .grupa .spremenljivka {
   background-color: white;
   border: 0;
-  border-bottom: 1px #888888 solid;
+  border-bottom: 1px #E5E5E5 solid;
   /* Mejnik pri dvojni tabeli */
 }
 .grupa .spremenljivka:last-of-type {
   border-bottom: 0;
 }
 .grupa .spremenljivka .naslov {
-  color: #505050;
+  color: #333;
 }
 .grupa .spremenljivka .naslov .spremenljivka_info {
-  color: #505050;
+  color: #333;
 }
 .grupa .spremenljivka .sequence_number {
   background-color: #eeeeee;
@@ -116,7 +116,7 @@ input[type=radio] + span.enka-checkbox-radio,
 }
 
 .variable_holder .variabla {
-  color: #505050;
+  color: #333;
 }
 
 /* Koledar */
@@ -146,21 +146,19 @@ button.ui-datepicker-trigger:hover {
   margin-top: 20px;
   margin-bottom: 10px;
   padding-top: 10px;
-  border-top: 1px #888888 solid !important;
+  border-top: 1px #E5E5E5 solid !important;
 }
 .buttons input {
   cursor: pointer;
   margin: 8px 5px;
-  padding: 10px 20px;
+  padding: 10px 24px !important;
   text-align: center;
   font-size: 15px;
   letter-spacing: 0px;
   font-weight: 600;
   color: #FFFFFF;
-  border-radius: 20px;
-  -moz-border-radius: 20px 20px 20px 20px;
-  -webkit-border-radius: 20px;
   border: 0;
+  transition: 0.3s;
 }
 .buttons input.next {
   background-color: #666666;
@@ -182,13 +180,13 @@ button.ui-datepicker-trigger:hover {
 
 /* FOOTER */
 #footer_survey {
-  color: #505050;
-  border-top: 3px #666666 solid;
+  color: #333;
+  border-top: 1px #E5E5E5 solid;
 }
 #footer_survey a {
   font-weight: normal;
   text-decoration: none;
-  color: #505050;
+  color: #333;
 }
 
 /* LOGO */
@@ -204,7 +202,7 @@ button.ui-datepicker-trigger:hover {
   margin: 10px auto 30px auto;
   left: 0;
   right: 0;
-  background-image: url("../../../public/img/logo/1ka_slo.svg");
+  background-image: url("../../../public/img/logo/1ka_logo_slo.svg");
   background-repeat: no-repeat;
   background-size: auto 100% !important;
   background-position: center;
@@ -222,12 +220,24 @@ button.ui-datepicker-trigger:hover {
 }
 
 #footer_survey #logo.english {
-  background-image: url("../../../public/img/logo/1ka_eng.svg");
+  background-image: url("../../../public/img/logo/1ka_logo_eng.svg");
+}
+
+#footer_survey #logo.namestitev {
+  background-image: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
+#footer_survey #logo.namestitev.english {
+  background-image: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
+#footer_survey #logo.arnes {
+  background-image: url("../../../public/img/logo/1ka_logo_arnes.svg");
 }
 
 /* Popravimo se logo */
 #footer_survey #logo {
-  background-image: url("../../../public/img/logo/fdv.png");
+  background-image: url("../../../public/img/logo/fdv.png") !important;
 }
 
 /*# sourceMappingURL=MobileFdv.css.map */
diff --git a/main/survey/skins/MobileGreen.css b/main/survey/skins/MobileGreen.css
index 6ef6572..94abca1 100644
--- a/main/survey/skins/MobileGreen.css
+++ b/main/survey/skins/MobileGreen.css
@@ -8,26 +8,26 @@
 */
 /* Fonti */
 body {
-  font-family: Montserrat, Arial, Sans-Serif !important;
-  color: #505050;
+  font-family: Source Sans Pro, sans-serif !important;
+  color: #333;
   background-color: white;
 }
 
 span, label {
-  color: #505050;
+  color: #333;
 }
 
 /* GLAVNI ELEMENTI */
 #container h1 {
   color: #2e7d3a;
   background-color: #ffffff;
-  border-bottom: 8px #2e7d3a solid;
+  border-bottom: 2px #2e7d3a solid;
 }
 
 /* INPUT ELEMENTI */
 /* Textboxi, textarea, select */
 input, textarea, select {
-  font-family: Montserrat, Arial, Sans-Serif !important;
+  font-family: Source Sans Pro, sans-serif !important;
 }
 
 input[type=text], textarea, select {
@@ -48,17 +48,17 @@ input[type=radio] + span.enka-checkbox-radio,
 .grupa .spremenljivka {
   background-color: white;
   border: 0;
-  border-bottom: 1px #66bb6a solid;
+  border-bottom: 1px #E5E5E5 solid;
   /* Mejnik pri dvojni tabeli */
 }
 .grupa .spremenljivka:last-of-type {
   border-bottom: 0;
 }
 .grupa .spremenljivka .naslov {
-  color: #505050;
+  color: #333;
 }
 .grupa .spremenljivka .naslov .spremenljivka_info {
-  color: #505050;
+  color: #333;
 }
 .grupa .spremenljivka .sequence_number {
   background-color: #e2f2e2;
@@ -115,7 +115,7 @@ input[type=radio] + span.enka-checkbox-radio,
 }
 
 .variable_holder .variabla {
-  color: #505050;
+  color: #333;
 }
 
 /* Koledar */
@@ -145,21 +145,19 @@ button.ui-datepicker-trigger:hover {
   margin-top: 20px;
   margin-bottom: 10px;
   padding-top: 10px;
-  border-top: 1px #66bb6a solid !important;
+  border-top: 1px #E5E5E5 solid !important;
 }
 .buttons input {
   cursor: pointer;
   margin: 8px 5px;
-  padding: 10px 20px;
+  padding: 10px 24px !important;
   text-align: center;
   font-size: 15px;
   letter-spacing: 0px;
   font-weight: 600;
   color: #FFFFFF;
-  border-radius: 20px;
-  -moz-border-radius: 20px 20px 20px 20px;
-  -webkit-border-radius: 20px;
   border: 0;
+  transition: 0.3s;
 }
 .buttons input.next {
   background-color: #2e7d3a;
@@ -181,13 +179,13 @@ button.ui-datepicker-trigger:hover {
 
 /* FOOTER */
 #footer_survey {
-  color: #505050;
-  border-top: 3px #2e7d3a solid;
+  color: #333;
+  border-top: 1px #E5E5E5 solid;
 }
 #footer_survey a {
   font-weight: normal;
   text-decoration: none;
-  color: #505050;
+  color: #333;
 }
 
 /* LOGO */
@@ -203,7 +201,7 @@ button.ui-datepicker-trigger:hover {
   margin: 10px auto 30px auto;
   left: 0;
   right: 0;
-  background-image: url("../../../public/img/logo/1ka_slo.svg");
+  background-image: url("../../../public/img/logo/1ka_logo_slo.svg");
   background-repeat: no-repeat;
   background-size: auto 100% !important;
   background-position: center;
@@ -221,7 +219,19 @@ button.ui-datepicker-trigger:hover {
 }
 
 #footer_survey #logo.english {
-  background-image: url("../../../public/img/logo/1ka_eng.svg");
+  background-image: url("../../../public/img/logo/1ka_logo_eng.svg");
+}
+
+#footer_survey #logo.namestitev {
+  background-image: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
+#footer_survey #logo.namestitev.english {
+  background-image: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
+#footer_survey #logo.arnes {
+  background-image: url("../../../public/img/logo/1ka_logo_arnes.svg");
 }
 
 /*# sourceMappingURL=MobileGreen.css.map */
diff --git a/main/survey/skins/MobileOrange.css b/main/survey/skins/MobileOrange.css
index 37c26a1..57c6727 100644
--- a/main/survey/skins/MobileOrange.css
+++ b/main/survey/skins/MobileOrange.css
@@ -8,26 +8,26 @@
 */
 /* Fonti */
 body {
-  font-family: Montserrat, Arial, Sans-Serif !important;
-  color: #505050;
+  font-family: Source Sans Pro, sans-serif !important;
+  color: #333;
   background-color: white;
 }
 
 span, label {
-  color: #505050;
+  color: #333;
 }
 
 /* GLAVNI ELEMENTI */
 #container h1 {
   color: #ef6c00;
   background-color: #ffffff;
-  border-bottom: 8px #ef6c00 solid;
+  border-bottom: 2px #ef6c00 solid;
 }
 
 /* INPUT ELEMENTI */
 /* Textboxi, textarea, select */
 input, textarea, select {
-  font-family: Montserrat, Arial, Sans-Serif !important;
+  font-family: Source Sans Pro, sans-serif !important;
 }
 
 input[type=text], textarea, select {
@@ -48,17 +48,17 @@ input[type=radio] + span.enka-checkbox-radio,
 .grupa .spremenljivka {
   background-color: white;
   border: 0;
-  border-bottom: 1px #ffa726 solid;
+  border-bottom: 1px #E5E5E5 solid;
   /* Mejnik pri dvojni tabeli */
 }
 .grupa .spremenljivka:last-of-type {
   border-bottom: 0;
 }
 .grupa .spremenljivka .naslov {
-  color: #505050;
+  color: #333;
 }
 .grupa .spremenljivka .naslov .spremenljivka_info {
-  color: #505050;
+  color: #333;
 }
 .grupa .spremenljivka .sequence_number {
   background-color: #ffe9c9;
@@ -115,7 +115,7 @@ input[type=radio] + span.enka-checkbox-radio,
 }
 
 .variable_holder .variabla {
-  color: #505050;
+  color: #333;
 }
 
 /* Koledar */
@@ -145,21 +145,19 @@ button.ui-datepicker-trigger:hover {
   margin-top: 20px;
   margin-bottom: 10px;
   padding-top: 10px;
-  border-top: 1px #ffa726 solid !important;
+  border-top: 1px #E5E5E5 solid !important;
 }
 .buttons input {
   cursor: pointer;
   margin: 8px 5px;
-  padding: 10px 20px;
+  padding: 10px 24px !important;
   text-align: center;
   font-size: 15px;
   letter-spacing: 0px;
   font-weight: 600;
   color: #FFFFFF;
-  border-radius: 20px;
-  -moz-border-radius: 20px 20px 20px 20px;
-  -webkit-border-radius: 20px;
   border: 0;
+  transition: 0.3s;
 }
 .buttons input.next {
   background-color: #ef6c00;
@@ -181,13 +179,13 @@ button.ui-datepicker-trigger:hover {
 
 /* FOOTER */
 #footer_survey {
-  color: #505050;
-  border-top: 3px #ef6c00 solid;
+  color: #333;
+  border-top: 1px #E5E5E5 solid;
 }
 #footer_survey a {
   font-weight: normal;
   text-decoration: none;
-  color: #505050;
+  color: #333;
 }
 
 /* LOGO */
@@ -203,7 +201,7 @@ button.ui-datepicker-trigger:hover {
   margin: 10px auto 30px auto;
   left: 0;
   right: 0;
-  background-image: url("../../../public/img/logo/1ka_slo.svg");
+  background-image: url("../../../public/img/logo/1ka_logo_slo.svg");
   background-repeat: no-repeat;
   background-size: auto 100% !important;
   background-position: center;
@@ -221,7 +219,19 @@ button.ui-datepicker-trigger:hover {
 }
 
 #footer_survey #logo.english {
-  background-image: url("../../../public/img/logo/1ka_eng.svg");
+  background-image: url("../../../public/img/logo/1ka_logo_eng.svg");
+}
+
+#footer_survey #logo.namestitev {
+  background-image: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
+#footer_survey #logo.namestitev.english {
+  background-image: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
+#footer_survey #logo.arnes {
+  background-image: url("../../../public/img/logo/1ka_logo_arnes.svg");
 }
 
 /*# sourceMappingURL=MobileOrange.css.map */
diff --git a/main/survey/skins/MobilePurple.css b/main/survey/skins/MobilePurple.css
index c25c8db..f5e7a7b 100644
--- a/main/survey/skins/MobilePurple.css
+++ b/main/survey/skins/MobilePurple.css
@@ -9,26 +9,26 @@
 */
 /* Fonti */
 body {
-  font-family: Montserrat, Arial, Sans-Serif !important;
-  color: #505050;
+  font-family: Source Sans Pro, sans-serif !important;
+  color: #333;
   background-color: white;
 }
 
 span, label {
-  color: #505050;
+  color: #333;
 }
 
 /* GLAVNI ELEMENTI */
 #container h1 {
   color: #4527a0;
   background-color: #ffffff;
-  border-bottom: 8px #4527a0 solid;
+  border-bottom: 2px #4527a0 solid;
 }
 
 /* INPUT ELEMENTI */
 /* Textboxi, textarea, select */
 input, textarea, select {
-  font-family: Montserrat, Arial, Sans-Serif !important;
+  font-family: Source Sans Pro, sans-serif !important;
 }
 
 input[type=text], textarea, select {
@@ -49,17 +49,17 @@ input[type=radio] + span.enka-checkbox-radio,
 .grupa .spremenljivka {
   background-color: white;
   border: 0;
-  border-bottom: 1px #7e57c2 solid;
+  border-bottom: 1px #E5E5E5 solid;
   /* Mejnik pri dvojni tabeli */
 }
 .grupa .spremenljivka:last-of-type {
   border-bottom: 0;
 }
 .grupa .spremenljivka .naslov {
-  color: #505050;
+  color: #333;
 }
 .grupa .spremenljivka .naslov .spremenljivka_info {
-  color: #505050;
+  color: #333;
 }
 .grupa .spremenljivka .sequence_number {
   background-color: #e3daf2;
@@ -116,7 +116,7 @@ input[type=radio] + span.enka-checkbox-radio,
 }
 
 .variable_holder .variabla {
-  color: #505050;
+  color: #333;
 }
 
 /* Koledar */
@@ -146,21 +146,19 @@ button.ui-datepicker-trigger:hover {
   margin-top: 20px;
   margin-bottom: 10px;
   padding-top: 10px;
-  border-top: 1px #7e57c2 solid !important;
+  border-top: 1px #E5E5E5 solid !important;
 }
 .buttons input {
   cursor: pointer;
   margin: 8px 5px;
-  padding: 10px 20px;
+  padding: 10px 24px !important;
   text-align: center;
   font-size: 15px;
   letter-spacing: 0px;
   font-weight: 600;
   color: #FFFFFF;
-  border-radius: 20px;
-  -moz-border-radius: 20px 20px 20px 20px;
-  -webkit-border-radius: 20px;
   border: 0;
+  transition: 0.3s;
 }
 .buttons input.next {
   background-color: #4527a0;
@@ -182,13 +180,13 @@ button.ui-datepicker-trigger:hover {
 
 /* FOOTER */
 #footer_survey {
-  color: #505050;
-  border-top: 3px #4527a0 solid;
+  color: #333;
+  border-top: 1px #E5E5E5 solid;
 }
 #footer_survey a {
   font-weight: normal;
   text-decoration: none;
-  color: #505050;
+  color: #333;
 }
 
 /* LOGO */
@@ -204,7 +202,7 @@ button.ui-datepicker-trigger:hover {
   margin: 10px auto 30px auto;
   left: 0;
   right: 0;
-  background-image: url("../../../public/img/logo/1ka_slo.svg");
+  background-image: url("../../../public/img/logo/1ka_logo_slo.svg");
   background-repeat: no-repeat;
   background-size: auto 100% !important;
   background-position: center;
@@ -222,7 +220,19 @@ button.ui-datepicker-trigger:hover {
 }
 
 #footer_survey #logo.english {
-  background-image: url("../../../public/img/logo/1ka_eng.svg");
+  background-image: url("../../../public/img/logo/1ka_logo_eng.svg");
+}
+
+#footer_survey #logo.namestitev {
+  background-image: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
+#footer_survey #logo.namestitev.english {
+  background-image: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
+#footer_survey #logo.arnes {
+  background-image: url("../../../public/img/logo/1ka_logo_arnes.svg");
 }
 
 /*# sourceMappingURL=MobilePurple.css.map */
diff --git a/main/survey/skins/MobileRed.css b/main/survey/skins/MobileRed.css
index c05ed57..c46f5aa 100644
--- a/main/survey/skins/MobileRed.css
+++ b/main/survey/skins/MobileRed.css
@@ -9,26 +9,26 @@
 */
 /* Fonti */
 body {
-  font-family: Montserrat, Arial, Sans-Serif !important;
-  color: #505050;
+  font-family: Source Sans Pro, sans-serif !important;
+  color: #333;
   background-color: white;
 }
 
 span, label {
-  color: #505050;
+  color: #333;
 }
 
 /* GLAVNI ELEMENTI */
 #container h1 {
   color: #c62828;
   background-color: #ffffff;
-  border-bottom: 8px #c62828 solid;
+  border-bottom: 2px #c62828 solid;
 }
 
 /* INPUT ELEMENTI */
 /* Textboxi, textarea, select */
 input, textarea, select {
-  font-family: Montserrat, Arial, Sans-Serif !important;
+  font-family: Source Sans Pro, sans-serif !important;
 }
 
 input[type=text], textarea, select {
@@ -49,17 +49,17 @@ input[type=radio] + span.enka-checkbox-radio,
 .grupa .spremenljivka {
   background-color: white;
   border: 0;
-  border-bottom: 1px #ef5350 solid;
+  border-bottom: 1px #E5E5E5 solid;
   /* Mejnik pri dvojni tabeli */
 }
 .grupa .spremenljivka:last-of-type {
   border-bottom: 0;
 }
 .grupa .spremenljivka .naslov {
-  color: #505050;
+  color: #333;
 }
 .grupa .spremenljivka .naslov .spremenljivka_info {
-  color: #505050;
+  color: #333;
 }
 .grupa .spremenljivka .sequence_number {
   background-color: #fde6e6;
@@ -116,7 +116,7 @@ input[type=radio] + span.enka-checkbox-radio,
 }
 
 .variable_holder .variabla {
-  color: #505050;
+  color: #333;
 }
 
 /* Koledar */
@@ -146,21 +146,19 @@ button.ui-datepicker-trigger:hover {
   margin-top: 20px;
   margin-bottom: 10px;
   padding-top: 10px;
-  border-top: 1px #ef5350 solid !important;
+  border-top: 1px #E5E5E5 solid !important;
 }
 .buttons input {
   cursor: pointer;
   margin: 8px 5px;
-  padding: 10px 20px;
+  padding: 10px 24px !important;
   text-align: center;
   font-size: 15px;
   letter-spacing: 0px;
   font-weight: 600;
   color: #FFFFFF;
-  border-radius: 20px;
-  -moz-border-radius: 20px 20px 20px 20px;
-  -webkit-border-radius: 20px;
   border: 0;
+  transition: 0.3s;
 }
 .buttons input.next {
   background-color: #c62828;
@@ -182,13 +180,13 @@ button.ui-datepicker-trigger:hover {
 
 /* FOOTER */
 #footer_survey {
-  color: #505050;
-  border-top: 3px #c62828 solid;
+  color: #333;
+  border-top: 1px #E5E5E5 solid;
 }
 #footer_survey a {
   font-weight: normal;
   text-decoration: none;
-  color: #505050;
+  color: #333;
 }
 
 /* LOGO */
@@ -204,7 +202,7 @@ button.ui-datepicker-trigger:hover {
   margin: 10px auto 30px auto;
   left: 0;
   right: 0;
-  background-image: url("../../../public/img/logo/1ka_slo.svg");
+  background-image: url("../../../public/img/logo/1ka_logo_slo.svg");
   background-repeat: no-repeat;
   background-size: auto 100% !important;
   background-position: center;
@@ -222,7 +220,19 @@ button.ui-datepicker-trigger:hover {
 }
 
 #footer_survey #logo.english {
-  background-image: url("../../../public/img/logo/1ka_eng.svg");
+  background-image: url("../../../public/img/logo/1ka_logo_eng.svg");
+}
+
+#footer_survey #logo.namestitev {
+  background-image: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
+#footer_survey #logo.namestitev.english {
+  background-image: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
+#footer_survey #logo.arnes {
+  background-image: url("../../../public/img/logo/1ka_logo_arnes.svg");
 }
 
 /*# sourceMappingURL=MobileRed.css.map */
diff --git a/main/survey/skins/MobileUni.css b/main/survey/skins/MobileUni.css
index d7f4af8..3322414 100644
--- a/main/survey/skins/MobileUni.css
+++ b/main/survey/skins/MobileUni.css
@@ -9,26 +9,26 @@
 */
 /* Fonti */
 body {
-  font-family: Montserrat, Arial, Sans-Serif !important;
-  color: #505050;
+  font-family: Source Sans Pro, sans-serif !important;
+  color: #333;
   background-color: white;
 }
 
 span, label {
-  color: #505050;
+  color: #333;
 }
 
 /* GLAVNI ELEMENTI */
 #container h1 {
   color: #666666;
   background-color: #ffffff;
-  border-bottom: 8px #666666 solid;
+  border-bottom: 2px #666666 solid;
 }
 
 /* INPUT ELEMENTI */
 /* Textboxi, textarea, select */
 input, textarea, select {
-  font-family: Montserrat, Arial, Sans-Serif !important;
+  font-family: Source Sans Pro, sans-serif !important;
 }
 
 input[type=text], textarea, select {
@@ -49,17 +49,17 @@ input[type=radio] + span.enka-checkbox-radio,
 .grupa .spremenljivka {
   background-color: white;
   border: 0;
-  border-bottom: 1px #888888 solid;
+  border-bottom: 1px #E5E5E5 solid;
   /* Mejnik pri dvojni tabeli */
 }
 .grupa .spremenljivka:last-of-type {
   border-bottom: 0;
 }
 .grupa .spremenljivka .naslov {
-  color: #505050;
+  color: #333;
 }
 .grupa .spremenljivka .naslov .spremenljivka_info {
-  color: #505050;
+  color: #333;
 }
 .grupa .spremenljivka .sequence_number {
   background-color: #eeeeee;
@@ -116,7 +116,7 @@ input[type=radio] + span.enka-checkbox-radio,
 }
 
 .variable_holder .variabla {
-  color: #505050;
+  color: #333;
 }
 
 /* Koledar */
@@ -146,21 +146,19 @@ button.ui-datepicker-trigger:hover {
   margin-top: 20px;
   margin-bottom: 10px;
   padding-top: 10px;
-  border-top: 1px #888888 solid !important;
+  border-top: 1px #E5E5E5 solid !important;
 }
 .buttons input {
   cursor: pointer;
   margin: 8px 5px;
-  padding: 10px 20px;
+  padding: 10px 24px !important;
   text-align: center;
   font-size: 15px;
   letter-spacing: 0px;
   font-weight: 600;
   color: #FFFFFF;
-  border-radius: 20px;
-  -moz-border-radius: 20px 20px 20px 20px;
-  -webkit-border-radius: 20px;
   border: 0;
+  transition: 0.3s;
 }
 .buttons input.next {
   background-color: #666666;
@@ -182,13 +180,13 @@ button.ui-datepicker-trigger:hover {
 
 /* FOOTER */
 #footer_survey {
-  color: #505050;
-  border-top: 3px #666666 solid;
+  color: #333;
+  border-top: 1px #E5E5E5 solid;
 }
 #footer_survey a {
   font-weight: normal;
   text-decoration: none;
-  color: #505050;
+  color: #333;
 }
 
 /* LOGO */
@@ -204,7 +202,7 @@ button.ui-datepicker-trigger:hover {
   margin: 10px auto 30px auto;
   left: 0;
   right: 0;
-  background-image: url("../../../public/img/logo/1ka_slo.svg");
+  background-image: url("../../../public/img/logo/1ka_logo_slo.svg");
   background-repeat: no-repeat;
   background-size: auto 100% !important;
   background-position: center;
@@ -222,12 +220,24 @@ button.ui-datepicker-trigger:hover {
 }
 
 #footer_survey #logo.english {
-  background-image: url("../../../public/img/logo/1ka_eng.svg");
+  background-image: url("../../../public/img/logo/1ka_logo_eng.svg");
+}
+
+#footer_survey #logo.namestitev {
+  background-image: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
+#footer_survey #logo.namestitev.english {
+  background-image: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
+#footer_survey #logo.arnes {
+  background-image: url("../../../public/img/logo/1ka_logo_arnes.svg");
 }
 
 /* Popravimo se logo */
 #footer_survey #logo {
-  background-image: url("../../../public/img/logo/uni.png");
+  background-image: url("../../../public/img/logo/uni.png") !important;
 }
 
 /*# sourceMappingURL=MobileUni.css.map */
diff --git a/main/survey/skins/Otroci3.css b/main/survey/skins/Otroci3.css
index a8c1a23..5320137 100644
--- a/main/survey/skins/Otroci3.css
+++ b/main/survey/skins/Otroci3.css
@@ -1,309 +1,304 @@
-/*
-	Tema Otroci 3
-*/
-/*$font_family: Open Sans, Arial, Sans-Serif;*/
-/* Barve */
-body {
-  margin: 0;
-  padding: 0;
-  color: #333;
-  font-size: 75%;
-  font-family: Montserrat, Arial, Sans-Serif !important;
-  background: #b0e8ff url(Otroci/otroci-3-footer.png) left bottom repeat-x;
-}
-
-body.preview, body.testdata {
-  margin-top: 26px;
-}
-
-#outercontainer {
-  width: 100%;
-  padding-top: 130px;
-  margin: 0 auto;
-  min-height: 600px;
-  background: url(Otroci/otroci-3-top.png) center top no-repeat;
-}
-
-#container {
-  position: relative;
-  width: 100%;
-  width: 980px;
-  margin: 0px auto 10px;
-  background: #fff;
-  -webkit-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5);
-  -moz-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5);
-  box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5);
-  border: 5px solid rgba(255, 255, 255, 0.5);
-}
-
-/* Warning bar (preview, cookie) */
-#cookie_alert, #test_alert {
-  height: 26px;
-  line-height: 25px;
-  color: #ffffff;
-  background-color: #ffa608;
-  border-bottom: 1px solid #ffa608;
-}
-#cookie_alert a, #test_alert a {
-  text-decoration: none;
-  font-weight: bold;
-  color: #ffffff;
-}
-#cookie_alert a:hover, #test_alert a:hover {
-  text-decoration: underline;
-}
-#cookie_alert span, #test_alert span {
-  color: #ffffff;
-}
-#cookie_alert span a, #test_alert span a {
-  color: #ffffff;
-  font-weight: normal;
-}
-
-/* Header - logo, naslov, progressbar */
-h1 {
-  margin: 0px auto 50px;
-  padding: 40px 0 0 0;
-  font-size: 24px;
-  color: #333;
-  text-align: center;
-}
-
-h1.evalvacija {
-  margin-bottom: 0;
-}
-
-#logo {
-  position: absolute;
-  top: -120px;
-  left: -40px;
-  width: 650px;
-  height: 230px;
-  background: url(Otroci/otroci-3-levo.png) left bottom no-repeat;
-}
-#logo #logo_right {
-  display: inline;
-  position: absolute;
-  top: 102px;
-  right: -475px;
-  width: 158px;
-  height: 311px;
-  background: url(Otroci/otroci-3-desno.png) right bottom no-repeat;
-}
-
-.header_settings_holder {
-  top: 0px;
-  right: -105px;
-  width: auto;
-  height: 110px;
-  padding-right: 150px;
-  padding-bottom: 25px;
-}
-.header_settings_holder .progress_bar span {
-  float: left !important;
-  /* ie6,7 doesnt support inline-block */
-  display: block;
-  width: 20px;
-  font-size: 11px;
-  color: #333;
-}
-.header_settings_holder .progress_bar div {
-  height: 10px;
-  width: 130px;
-  padding: 2px;
-  margin: 0 5px;
-  border: 1px #cccccc solid;
-  background-color: #ffffff;
-}
-.header_settings_holder .progress_bar div span {
-  height: 10px;
-  background-color: #f26b16;
-}
-.header_settings_holder .progress_bar p a {
-  color: #ef6c00;
-  text-decoration: none;
-}
-.header_settings_holder .progress_bar p a:hover {
-  color: #ff943d;
-}
-
-/* Spremenljivke */
-.spremenljivka {
-  margin: 20px 10px 20px 10px;
-  padding: 20px 2px 20px 12px !important;
-  border-top: 1px #B9C5D9 solid;
-}
-.spremenljivka .naslov {
-  padding-left: 5px;
-  padding-bottom: 15px;
-  font-size: 16px;
-  font-weight: 600;
-  color: #333;
-}
-.spremenljivka .naslov .spremenljivka_info {
-  font-size: 70%;
-}
-
-.spremenljivka.limited {
-  outline: 1px #F15A24 solid;
-}
-
-.required, .required_require, .required_limit {
-  outline: 1px #F15A24 solid;
-}
-
-div.variabla,
-td.variabla,
-td.question,
-td.differential {
-  font-size: 13px;
-}
-
-div.variable_holder {
-  padding: 0 30px;
-}
-div.variable_holder thead,
-div.variable_holder tr.table-header {
-  font-weight: 600;
-}
-div.variable_holder .frame_ranking {
-  border: 1px #B9C5D9 solid;
-  background-color: #f7f7f7;
-}
-div.variable_holder .frame_ranking_hover {
-  border: 1px #8A9FBF solid;
-  background-color: #e2e4e7;
-}
-
-table.grid_table tbody tr:nth-child(2n+1) {
-  background-color: #f7f7f7;
-}
-
-span.reminder {
-  left: 3px;
-}
-
-/* Textboxi, textarea, select */
-input, textarea, select {
-  font-family: Montserrat, Arial, Sans-Serif !important;
-}
-
-input[type=text], textarea, select {
-  padding: 10px 15px;
-  border-radius: 3px;
-  border: 1px solid #B9C5D9;
-  border-radius: 3px;
-  background-color: #fff;
-}
-
-button.ui-datepicker-trigger {
-  color: #ef6c00;
-}
-button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus {
-  color: #ff943d;
-}
-
-input[type=checkbox]:focus + span.enka-checkbox-radio:before,
-input[type=radio]:focus + span.enka-checkbox-radio:before,
-input[type=radio]:focus + span.enka-custom-radio:before,
-input[type=radio]:focus + span.enka-vizualna-skala::before {
-  color: #777;
-}
-
-/* Photo upload button */
-button.record_foto {
-  border: 2px solid #ef6c00;
-}
-button.record_foto::before {
-  color: #ef6c00;
-}
-button.record_foto:hover, button.record_foto:focus {
-  border-color: #ff943d;
-}
-button.record_foto:hover::before, button.record_foto:focus::before {
-  color: #ff943d;
-}
-
-/* Gumbi na dnu */
-div.buttons {
-  padding: 30px 20px 35px;
-  margin: 0 10px;
-  border-top: 1px #B9C5D9 solid;
-}
-div.buttons input {
-  cursor: pointer;
-  margin: 8px 10px;
-  padding: 10px 20px;
-  text-align: center;
-  font-size: 12px;
-  letter-spacing: 1px;
-  font-weight: 600;
-  color: #FFFFFF;
-  border-radius: 20px;
-  border: 0;
-}
-div.buttons input.next {
-  background-color: #ef6c00;
-  border: 1px solid #ef6c00;
-  color: #fff;
-}
-div.buttons input.next:hover, div.buttons input.next:focus {
-  background-color: #ff943d;
-  border: 1px solid #ff943d;
-  color: #fff;
-}
-div.buttons input.prev {
-  background-color: #fff;
-  border: 1px solid #ef6c00;
-  color: #ef6c00;
-}
-div.buttons input.prev:hover, div.buttons input.prev:focus {
-  background-color: #ef6c00;
-  border: 1px solid #ef6c00;
-  color: #fff;
-}
-
-/* Footer */
-#footer_survey {
-  padding: 20px;
-}
-#footer_survey a, #footer_survey a:visited {
-  color: #333;
-  text-decoration: none;
-}
-#footer_survey a:hover, #footer_survey a:active {
-  text-decoration: underline;
-}
-
-/* #Tablet (Portrait) */
-@media only screen and (min-width: 768px) and (max-width: 959px) {
-  #container {
-    width: 760px;
-  }
-
-  #logo {
-    width: 550px;
-  }
-}
-/*  #Mobile (Portrait) */
-@media only screen and (max-width: 767px) {
-  #container {
-    width: 280px;
-  }
-
-  #logo {
-    width: 350px;
-  }
-}
-/* #Mobile (Landscape) */
-@media only screen and (min-width: 480px) and (max-width: 767px) {
-  #container {
-    width: 480px;
-  }
-
-  #logo {
-    width: 450px;
-  }
-}
-
-/*# sourceMappingURL=Otroci3.css.map */
+/*
+	Tema Otroci 3
+*/
+/* Barve */
+body {
+  margin: 0;
+  padding: 0;
+  color: #333;
+  font-size: 75%;
+  font-family: Montserrat, sans-serif !important;
+  background: #b0e8ff url(Otroci/otroci-3-footer.png) left bottom repeat-x;
+}
+
+body.preview, body.testdata {
+  margin-top: 26px;
+}
+
+#outercontainer {
+  width: 100%;
+  padding-top: 130px;
+  margin: 0 auto;
+  min-height: 600px;
+  background: url(Otroci/otroci-3-top.png) center top no-repeat;
+}
+
+#container {
+  position: relative;
+  width: 100%;
+  width: 980px;
+  margin: 0px auto 10px;
+  background: #fff;
+  -webkit-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5);
+  -moz-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5);
+  box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5);
+  border: 5px solid rgba(255, 255, 255, 0.5);
+}
+
+/* Warning bar (preview, cookie) */
+#cookie_alert, #test_alert {
+  height: 26px;
+  line-height: 25px;
+  color: #ffffff;
+  background-color: #ffa608;
+  border-bottom: 1px solid #ffa608;
+}
+#cookie_alert a, #test_alert a {
+  text-decoration: none;
+  font-weight: bold;
+  color: #ffffff;
+}
+#cookie_alert a:hover, #test_alert a:hover {
+  text-decoration: underline;
+}
+#cookie_alert span, #test_alert span {
+  color: #ffffff;
+}
+#cookie_alert span a, #test_alert span a {
+  color: #ffffff;
+  font-weight: normal;
+}
+
+/* Header - logo, naslov, progressbar */
+h1 {
+  margin: 0px auto 50px;
+  padding: 40px 0 0 0;
+  font-size: 24px;
+  color: #333;
+  text-align: center;
+}
+
+h1.evalvacija {
+  margin-bottom: 0;
+}
+
+#logo {
+  position: absolute;
+  top: -120px;
+  left: -40px;
+  width: 650px;
+  height: 230px;
+  background: url(Otroci/otroci-3-levo.png) left bottom no-repeat;
+}
+#logo #logo_right {
+  display: inline;
+  position: absolute;
+  top: 102px;
+  right: -475px;
+  width: 158px;
+  height: 311px;
+  background: url(Otroci/otroci-3-desno.png) right bottom no-repeat;
+}
+
+.header_settings_holder {
+  top: 0px;
+  right: -105px;
+  width: auto;
+  height: 110px;
+  padding-right: 150px;
+  padding-bottom: 25px;
+}
+.header_settings_holder .progress_bar span {
+  float: left !important; /* ie6,7 doesnt support inline-block */
+  display: block;
+  width: 20px;
+  font-size: 11px;
+  color: #333;
+}
+.header_settings_holder .progress_bar div {
+  height: 10px;
+  width: 130px;
+  padding: 2px;
+  margin: 0 5px;
+  border: 1px #cccccc solid;
+  background-color: #ffffff;
+}
+.header_settings_holder .progress_bar div span {
+  height: 10px;
+  background-color: #f26b16;
+}
+.header_settings_holder .progress_bar p a {
+  color: #ef6c00;
+  text-decoration: none;
+}
+.header_settings_holder .progress_bar p a:hover {
+  color: #ff943d;
+}
+
+/* Spremenljivke */
+.spremenljivka {
+  margin: 20px 10px 20px 10px;
+  padding: 20px 2px 20px 12px !important;
+  border-top: 1px #B9C5D9 solid;
+}
+.spremenljivka .naslov {
+  padding-left: 5px;
+  padding-bottom: 15px;
+  font-size: 16px;
+  font-weight: 600;
+  color: #333;
+}
+.spremenljivka .naslov .spremenljivka_info {
+  font-size: 70%;
+}
+
+.spremenljivka.limited {
+  outline: 1px #F15A24 solid;
+}
+
+.required, .required_require, .required_limit {
+  outline: 1px #F15A24 solid;
+}
+
+div.variabla,
+td.variabla,
+td.question,
+td.differential {
+  font-size: 13px;
+}
+
+div.variable_holder {
+  padding: 0 30px;
+}
+div.variable_holder thead,
+div.variable_holder tr.table-header {
+  font-weight: 600;
+}
+div.variable_holder .frame_ranking {
+  border: 1px #B9C5D9 solid;
+  background-color: #f7f7f7;
+}
+div.variable_holder .frame_ranking_hover {
+  border: 1px #8A9FBF solid;
+  background-color: #e2e4e7;
+}
+
+table.grid_table tbody tr:nth-child(2n+1) {
+  background-color: #f7f7f7;
+}
+
+span.reminder {
+  left: 3px;
+}
+
+/* Textboxi, textarea, select */
+input, textarea, select {
+  font-family: Montserrat, sans-serif !important;
+}
+
+input[type=text], textarea, select {
+  padding: 10px 15px;
+  border-radius: 3px;
+  border: 1px solid #B9C5D9;
+  border-radius: 3px;
+  background-color: #fff;
+}
+
+button.ui-datepicker-trigger {
+  color: #ef6c00;
+}
+button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus {
+  color: #ff943d;
+}
+
+input[type=checkbox]:focus + span.enka-checkbox-radio:before,
+input[type=radio]:focus + span.enka-checkbox-radio:before,
+input[type=radio]:focus + span.enka-custom-radio:before,
+input[type=radio]:focus + span.enka-vizualna-skala::before {
+  color: #777;
+}
+
+/* Photo upload button */
+button.record_foto {
+  border: 2px solid #ef6c00;
+}
+button.record_foto::before {
+  color: #ef6c00;
+}
+button.record_foto:hover, button.record_foto:focus {
+  border-color: #ff943d;
+}
+button.record_foto:hover::before, button.record_foto:focus::before {
+  color: #ff943d;
+}
+
+/* Gumbi na dnu */
+div.buttons {
+  padding: 30px 20px 35px;
+  margin: 0 10px;
+  border-top: 1px #B9C5D9 solid;
+}
+div.buttons input {
+  cursor: pointer;
+  margin: 8px 10px;
+  padding: 10px 20px;
+  text-align: center;
+  font-size: 12px;
+  letter-spacing: 1px;
+  font-weight: 600;
+  color: #FFFFFF;
+  border-radius: 20px;
+  border: 0;
+}
+div.buttons input.next {
+  background-color: #ef6c00;
+  border: 1px solid #ef6c00;
+  color: #fff;
+}
+div.buttons input.next:hover, div.buttons input.next:focus {
+  background-color: #ff943d;
+  border: 1px solid #ff943d;
+  color: #fff;
+}
+div.buttons input.prev {
+  background-color: #fff;
+  border: 1px solid #ef6c00;
+  color: #ef6c00;
+}
+div.buttons input.prev:hover, div.buttons input.prev:focus {
+  background-color: #ef6c00;
+  border: 1px solid #ef6c00;
+  color: #fff;
+}
+
+/* Footer */
+#footer_survey {
+  padding: 20px;
+}
+#footer_survey a, #footer_survey a:visited {
+  color: #333;
+  text-decoration: none;
+}
+#footer_survey a:hover, #footer_survey a:active {
+  text-decoration: underline;
+}
+
+/* #Tablet (Portrait) */
+@media only screen and (min-width: 768px) and (max-width: 959px) {
+  #container {
+    width: 760px;
+  }
+  #logo {
+    width: 550px;
+  }
+}
+/*  #Mobile (Portrait) */
+@media only screen and (max-width: 767px) {
+  #container {
+    width: 280px;
+  }
+  #logo {
+    width: 350px;
+  }
+}
+/* #Mobile (Landscape) */
+@media only screen and (min-width: 480px) and (max-width: 767px) {
+  #container {
+    width: 480px;
+  }
+  #logo {
+    width: 450px;
+  }
+}
+
+/*# sourceMappingURL=Otroci3.css.map */
diff --git a/main/survey/skins/Otroci4.css b/main/survey/skins/Otroci4.css
index 32cabe5..63e2282 100644
--- a/main/survey/skins/Otroci4.css
+++ b/main/survey/skins/Otroci4.css
@@ -1,293 +1,291 @@
-/*
-	Tema Otroci 4
-*/
-/*$font_family: Open Sans, Arial, Sans-Serif;*/
-/* Barve */
-body {
-  margin: 0;
-  padding: 0;
-  color: #333;
-  font-size: 75%;
-  font-family: Montserrat, Arial, Sans-Serif !important;
-  background: #fff url(Otroci/otroci-4-footer.png) left bottom repeat-x;
-}
-
-body.preview, body.testdata {
-  margin-top: 26px;
-}
-
-#outercontainer {
-  width: 100%;
-  padding-top: 130px;
-  margin: 0 auto;
-  background: url(Otroci/otroci-4-top.png) left top repeat-x;
-}
-
-#container {
-  position: relative;
-  width: 100%;
-  width: 980px;
-  margin: 0px auto 10px;
-  background: #fff;
-  -webkit-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5);
-  -moz-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5);
-  box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5);
-  border: 5px solid rgba(255, 255, 255, 0.5);
-}
-
-/* Warning bar (preview, cookie) */
-#cookie_alert, #test_alert {
-  height: 26px;
-  line-height: 25px;
-  color: #ffffff;
-  background-color: #ffa608;
-  border-bottom: 1px solid #ffa608;
-}
-#cookie_alert a, #test_alert a {
-  text-decoration: none;
-  font-weight: bold;
-  color: #ffffff;
-}
-#cookie_alert a:hover, #test_alert a:hover {
-  text-decoration: underline;
-}
-#cookie_alert span, #test_alert span {
-  color: #ffffff;
-}
-#cookie_alert span a, #test_alert span a {
-  color: #ffffff;
-  font-weight: normal;
-}
-
-/* Header - logo, naslov, progressbar */
-h1 {
-  margin: 0px auto 50px;
-  padding: 40px 0 0 0;
-  font-size: 24px;
-  color: #333;
-  text-align: center;
-}
-
-h1.evalvacija {
-  margin-bottom: 0;
-}
-
-#logo {
-  position: absolute;
-  top: -50px;
-  left: -20px;
-}
-#logo #logo_right {
-  display: inline;
-  position: absolute;
-  top: 31px;
-  right: -125px;
-  width: 158px;
-  height: 311px;
-  background: url(Otroci/otroci-3-desno.png) right bottom no-repeat;
-}
-
-.header_settings_holder {
-  top: 0px;
-  right: -105px;
-  width: auto;
-  height: 110px;
-  padding-right: 150px;
-  padding-bottom: 25px;
-}
-.header_settings_holder .progress_bar span {
-  float: left !important;
-  /* ie6,7 doesnt support inline-block */
-  display: block;
-  width: 20px;
-  font-size: 11px;
-  color: #333;
-}
-.header_settings_holder .progress_bar div {
-  height: 10px;
-  width: 130px;
-  padding: 2px;
-  margin: 0 5px;
-  border: 1px #cccccc solid;
-  background-color: #ffffff;
-}
-.header_settings_holder .progress_bar div span {
-  height: 10px;
-  background-color: #f26b16;
-}
-.header_settings_holder .progress_bar p a {
-  color: #ef6c00;
-  text-decoration: none;
-}
-.header_settings_holder .progress_bar p a:hover {
-  color: #ff943d;
-}
-
-/* Spremenljivke */
-.spremenljivka {
-  margin: 20px 10px 20px 10px;
-  padding: 20px 2px 20px 12px !important;
-  border-top: 1px #B9C5D9 solid;
-}
-.spremenljivka .naslov {
-  padding-left: 5px;
-  padding-bottom: 15px;
-  font-size: 16px;
-  font-weight: 600;
-  color: #333;
-}
-.spremenljivka .naslov .spremenljivka_info {
-  font-size: 70%;
-}
-
-.spremenljivka.limited {
-  outline: 1px #F15A24 solid;
-}
-
-.required, .required_require, .required_limit {
-  outline: 1px #F15A24 solid;
-}
-
-div.variabla,
-td.variabla,
-td.question,
-td.differential {
-  font-size: 13px;
-}
-
-div.variable_holder {
-  padding: 0 30px;
-}
-div.variable_holder thead,
-div.variable_holder tr.table-header {
-  font-weight: 600;
-}
-div.variable_holder .frame_ranking {
-  border: 1px #B9C5D9 solid;
-  background-color: #f7f7f7;
-}
-div.variable_holder .frame_ranking_hover {
-  border: 1px #8A9FBF solid;
-  background-color: #e2e4e7;
-}
-
-table.grid_table tbody tr:nth-child(2n+1) {
-  background-color: #f7f7f7;
-}
-
-span.reminder {
-  left: 3px;
-}
-
-/* Textboxi, textarea, select */
-input, textarea, select {
-  font-family: Montserrat, Arial, Sans-Serif !important;
-}
-
-input[type=text], textarea, select {
-  padding: 10px 15px;
-  border-radius: 3px;
-  border: 1px solid #B9C5D9;
-  border-radius: 3px;
-  background-color: #fff;
-}
-
-button.ui-datepicker-trigger {
-  color: #ef6c00;
-}
-button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus {
-  color: #ff943d;
-}
-
-input[type=checkbox]:focus + span.enka-checkbox-radio:before,
-input[type=radio]:focus + span.enka-checkbox-radio:before,
-input[type=radio]:focus + span.enka-custom-radio:before,
-input[type=radio]:focus + span.enka-vizualna-skala::before {
-  color: #777;
-}
-
-/* Photo upload button */
-button.record_foto {
-  border: 2px solid #ef6c00;
-}
-button.record_foto::before {
-  color: #ef6c00;
-}
-button.record_foto:hover, button.record_foto:focus {
-  border-color: #ff943d;
-}
-button.record_foto:hover::before, button.record_foto:focus::before {
-  color: #ff943d;
-}
-
-/* Gumbi na dnu */
-div.buttons {
-  padding: 30px 20px 35px;
-  margin: 0 10px;
-  border-top: 1px #B9C5D9 solid;
-}
-div.buttons input {
-  cursor: pointer;
-  margin: 8px 10px;
-  padding: 10px 20px;
-  text-align: center;
-  font-size: 12px;
-  letter-spacing: 1px;
-  font-weight: 600;
-  color: #FFFFFF;
-  border-radius: 20px;
-  border: 0;
-}
-div.buttons input.next {
-  background-color: #ef6c00;
-  border: 1px solid #ef6c00;
-  color: #fff;
-}
-div.buttons input.next:hover, div.buttons input.next:focus {
-  background-color: #ff943d;
-  border: 1px solid #ff943d;
-  color: #fff;
-}
-div.buttons input.prev {
-  background-color: #fff;
-  border: 1px solid #ef6c00;
-  color: #ef6c00;
-}
-div.buttons input.prev:hover, div.buttons input.prev:focus {
-  background-color: #ef6c00;
-  border: 1px solid #ef6c00;
-  color: #fff;
-}
-
-/* Footer */
-#footer_survey {
-  padding: 20px;
-}
-#footer_survey a, #footer_survey a:visited {
-  color: #333;
-  text-decoration: none;
-}
-#footer_survey a:hover, #footer_survey a:active {
-  text-decoration: underline;
-}
-
-/* #Tablet (Portrait) */
-@media only screen and (min-width: 768px) and (max-width: 959px) {
-  #container {
-    width: 760px;
-  }
-}
-/*  #Mobile (Portrait) */
-@media only screen and (max-width: 767px) {
-  #container {
-    width: 280px;
-  }
-}
-/* #Mobile (Landscape) */
-@media only screen and (min-width: 480px) and (max-width: 767px) {
-  #container {
-    width: 480px;
-  }
-}
-
-/*# sourceMappingURL=Otroci4.css.map */
+/*
+	Tema Otroci 4
+*/
+/* Barve */
+body {
+  margin: 0;
+  padding: 0;
+  color: #333;
+  font-size: 75%;
+  font-family: Montserrat, sans-serif !important;
+  background: #fff url(Otroci/otroci-4-footer.png) left bottom repeat-x;
+}
+
+body.preview, body.testdata {
+  margin-top: 26px;
+}
+
+#outercontainer {
+  width: 100%;
+  padding-top: 130px;
+  margin: 0 auto;
+  background: url(Otroci/otroci-4-top.png) left top repeat-x;
+}
+
+#container {
+  position: relative;
+  width: 100%;
+  width: 980px;
+  margin: 0px auto 10px;
+  background: #fff;
+  -webkit-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5);
+  -moz-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5);
+  box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5);
+  border: 5px solid rgba(255, 255, 255, 0.5);
+}
+
+/* Warning bar (preview, cookie) */
+#cookie_alert, #test_alert {
+  height: 26px;
+  line-height: 25px;
+  color: #ffffff;
+  background-color: #ffa608;
+  border-bottom: 1px solid #ffa608;
+}
+#cookie_alert a, #test_alert a {
+  text-decoration: none;
+  font-weight: bold;
+  color: #ffffff;
+}
+#cookie_alert a:hover, #test_alert a:hover {
+  text-decoration: underline;
+}
+#cookie_alert span, #test_alert span {
+  color: #ffffff;
+}
+#cookie_alert span a, #test_alert span a {
+  color: #ffffff;
+  font-weight: normal;
+}
+
+/* Header - logo, naslov, progressbar */
+h1 {
+  margin: 0px auto 50px;
+  padding: 40px 0 0 0;
+  font-size: 24px;
+  color: #333;
+  text-align: center;
+}
+
+h1.evalvacija {
+  margin-bottom: 0;
+}
+
+#logo {
+  position: absolute;
+  top: -50px;
+  left: -20px;
+}
+#logo #logo_right {
+  display: inline;
+  position: absolute;
+  top: 31px;
+  right: -125px;
+  width: 158px;
+  height: 311px;
+  background: url(Otroci/otroci-3-desno.png) right bottom no-repeat;
+}
+
+.header_settings_holder {
+  top: 0px;
+  right: -105px;
+  width: auto;
+  height: 110px;
+  padding-right: 150px;
+  padding-bottom: 25px;
+}
+.header_settings_holder .progress_bar span {
+  float: left !important; /* ie6,7 doesnt support inline-block */
+  display: block;
+  width: 20px;
+  font-size: 11px;
+  color: #333;
+}
+.header_settings_holder .progress_bar div {
+  height: 10px;
+  width: 130px;
+  padding: 2px;
+  margin: 0 5px;
+  border: 1px #cccccc solid;
+  background-color: #ffffff;
+}
+.header_settings_holder .progress_bar div span {
+  height: 10px;
+  background-color: #f26b16;
+}
+.header_settings_holder .progress_bar p a {
+  color: #ef6c00;
+  text-decoration: none;
+}
+.header_settings_holder .progress_bar p a:hover {
+  color: #ff943d;
+}
+
+/* Spremenljivke */
+.spremenljivka {
+  margin: 20px 10px 20px 10px;
+  padding: 20px 2px 20px 12px !important;
+  border-top: 1px #B9C5D9 solid;
+}
+.spremenljivka .naslov {
+  padding-left: 5px;
+  padding-bottom: 15px;
+  font-size: 16px;
+  font-weight: 600;
+  color: #333;
+}
+.spremenljivka .naslov .spremenljivka_info {
+  font-size: 70%;
+}
+
+.spremenljivka.limited {
+  outline: 1px #F15A24 solid;
+}
+
+.required, .required_require, .required_limit {
+  outline: 1px #F15A24 solid;
+}
+
+div.variabla,
+td.variabla,
+td.question,
+td.differential {
+  font-size: 13px;
+}
+
+div.variable_holder {
+  padding: 0 30px;
+}
+div.variable_holder thead,
+div.variable_holder tr.table-header {
+  font-weight: 600;
+}
+div.variable_holder .frame_ranking {
+  border: 1px #B9C5D9 solid;
+  background-color: #f7f7f7;
+}
+div.variable_holder .frame_ranking_hover {
+  border: 1px #8A9FBF solid;
+  background-color: #e2e4e7;
+}
+
+table.grid_table tbody tr:nth-child(2n+1) {
+  background-color: #f7f7f7;
+}
+
+span.reminder {
+  left: 3px;
+}
+
+/* Textboxi, textarea, select */
+input, textarea, select {
+  font-family: Montserrat, sans-serif !important;
+}
+
+input[type=text], textarea, select {
+  padding: 10px 15px;
+  border-radius: 3px;
+  border: 1px solid #B9C5D9;
+  border-radius: 3px;
+  background-color: #fff;
+}
+
+button.ui-datepicker-trigger {
+  color: #ef6c00;
+}
+button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus {
+  color: #ff943d;
+}
+
+input[type=checkbox]:focus + span.enka-checkbox-radio:before,
+input[type=radio]:focus + span.enka-checkbox-radio:before,
+input[type=radio]:focus + span.enka-custom-radio:before,
+input[type=radio]:focus + span.enka-vizualna-skala::before {
+  color: #777;
+}
+
+/* Photo upload button */
+button.record_foto {
+  border: 2px solid #ef6c00;
+}
+button.record_foto::before {
+  color: #ef6c00;
+}
+button.record_foto:hover, button.record_foto:focus {
+  border-color: #ff943d;
+}
+button.record_foto:hover::before, button.record_foto:focus::before {
+  color: #ff943d;
+}
+
+/* Gumbi na dnu */
+div.buttons {
+  padding: 30px 20px 35px;
+  margin: 0 10px;
+  border-top: 1px #B9C5D9 solid;
+}
+div.buttons input {
+  cursor: pointer;
+  margin: 8px 10px;
+  padding: 10px 20px;
+  text-align: center;
+  font-size: 12px;
+  letter-spacing: 1px;
+  font-weight: 600;
+  color: #FFFFFF;
+  border-radius: 20px;
+  border: 0;
+}
+div.buttons input.next {
+  background-color: #ef6c00;
+  border: 1px solid #ef6c00;
+  color: #fff;
+}
+div.buttons input.next:hover, div.buttons input.next:focus {
+  background-color: #ff943d;
+  border: 1px solid #ff943d;
+  color: #fff;
+}
+div.buttons input.prev {
+  background-color: #fff;
+  border: 1px solid #ef6c00;
+  color: #ef6c00;
+}
+div.buttons input.prev:hover, div.buttons input.prev:focus {
+  background-color: #ef6c00;
+  border: 1px solid #ef6c00;
+  color: #fff;
+}
+
+/* Footer */
+#footer_survey {
+  padding: 20px;
+}
+#footer_survey a, #footer_survey a:visited {
+  color: #333;
+  text-decoration: none;
+}
+#footer_survey a:hover, #footer_survey a:active {
+  text-decoration: underline;
+}
+
+/* #Tablet (Portrait) */
+@media only screen and (min-width: 768px) and (max-width: 959px) {
+  #container {
+    width: 760px;
+  }
+}
+/*  #Mobile (Portrait) */
+@media only screen and (max-width: 767px) {
+  #container {
+    width: 280px;
+  }
+}
+/* #Mobile (Landscape) */
+@media only screen and (min-width: 480px) and (max-width: 767px) {
+  #container {
+    width: 480px;
+  }
+}
+
+/*# sourceMappingURL=Otroci4.css.map */
diff --git a/main/survey/skins/Uni.css b/main/survey/skins/Uni.css
index 182f2a0..8c91143 100644
--- a/main/survey/skins/Uni.css
+++ b/main/survey/skins/Uni.css
@@ -6,13 +6,14 @@
 /*
 	Osnovna tema ankete - 1ka - brez definiranih barv
 */
+/* Barve */
 /* Fonti */
 body {
   margin: 0;
   padding: 0;
-  color: #505050;
+  color: #333333;
   font-size: 100%;
-  font-family: Montserrat, Arial, Sans-Serif !important;
+  font-family: Source Sans Pro, sans-serif !important;
   background: #ffffff;
 }
 
@@ -28,13 +29,15 @@ body.preview, body.testdata {
   position: absolute;
   width: 100%;
   height: 80px;
-  border-bottom: 6px #666666 solid;
+  border-bottom: 2px #666666 solid;
 }
 #outercontainer #container {
   position: relative;
   width: 100%;
   max-width: 1200px;
-  margin: 0px auto 10px;
+  margin: 0px auto;
+  padding: 0 16px;
+  box-sizing: border-box;
 }
 
 /* Warning bar (preview, cookie) */
@@ -69,12 +72,14 @@ body.preview, body.testdata {
 
 /* Header - logo, naslov, progressbar */
 h1 {
-  margin: 0px auto 30px;
-  padding: 120px 0 50px 0;
-  font-size: 28px;
+  margin: 0px auto;
+  padding: 114px 0 32px 0;
+  font-size: 32px;
+  font-weight: 600;
+  line-height: 40px;
   color: #666666;
   text-align: center;
-  border-bottom: 1px solid #eeeeee;
+  border-bottom: 1px solid #E5E5E5;
 }
 
 h1.evalvacija {
@@ -83,10 +88,10 @@ h1.evalvacija {
 
 #logo {
   right: auto;
-  left: 25px;
+  left: 16px;
   top: 13px;
   max-height: 56px !important;
-  background: url("../../../public/img/logo/1ka_slo.svg");
+  background: url("../../../public/img/logo/1ka_logo_slo.svg");
   background-repeat: no-repeat !important;
   background-size: auto 100% !important;
 }
@@ -96,7 +101,19 @@ h1.evalvacija {
 }
 
 #logo.english {
-  background: url("../../../public/img/logo/1ka_eng.svg");
+  background: url("../../../public/img/logo/1ka_logo_eng.svg");
+}
+
+#logo.namestitev {
+  background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
+#logo.namestitev.english {
+  background: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
+#logo.arnes {
+  background: url("../../../public/img/logo/1ka_logo_arnes.svg");
 }
 
 .header_settings_holder {
@@ -105,11 +122,11 @@ h1.evalvacija {
   left: auto;
 }
 .header_settings_holder .progress_bar span {
-  float: left !important;
-  /* ie6,7 doesnt support inline-block */
+  float: left !important; /* ie6,7 doesnt support inline-block */
   display: block;
   width: 20px;
-  font-size: 11px;
+  font-size: 14px;
+  line-height: 16px;
   color: #6D87AF;
 }
 .header_settings_holder .progress_bar div {
@@ -144,21 +161,38 @@ h1.evalvacija {
   color: #8c8c8c;
 }
 
+/* Uvod in zakljucek */
+.intro .spremenljivka .naslov,
+.concl .spremenljivka .naslov {
+  margin: 0;
+}
+
+#continue_later input[type=email],
+#return_edit input[type=email] {
+  margin-left: 4px;
+}
+#continue_later button,
+#return_edit button {
+  padding: 7px 20px;
+  margin-left: 4px;
+}
+
 /* Spremenljivke */
 .spremenljivka {
-  margin: 20px 10px 20px 10px;
-  padding: 20px 2px 50px 12px !important;
-  border-bottom: 1px #eeeeee solid;
+  margin: 0;
+  padding: 48px 16px !important;
+  border-bottom: 1px #E5E5E5 solid;
 }
 .spremenljivka .naslov {
-  padding: 5px 0 15px 5px;
-  font-size: 18px;
+  padding: 0 !important;
+  margin: 0 0 24px 0;
+  font-size: 20px;
   font-weight: 600;
 }
 .spremenljivka .naslov .spremenljivka_info {
   font-size: 14px;
   font-weight: 400;
-  padding-top: 7px;
+  padding-top: 8px;
 }
 .spremenljivka .sequence_number {
   background-color: #eeeeee;
@@ -183,6 +217,10 @@ h1.evalvacija {
 .spremenljivka .arrow:hover {
   color: #8c8c8c;
 }
+.spremenljivka span.reminder {
+  left: 3px;
+  text-indent: 0;
+}
 
 .spremenljivka.limited {
   outline: 1px #F15A24 solid;
@@ -192,55 +230,97 @@ h1.evalvacija {
   outline: 1px #F15A24 solid;
 }
 
+.spremenljivka.tip_1 .variabla,
+.spremenljivka.tip_2 .variabla {
+  display: flex;
+  align-items: center;
+}
+.spremenljivka.tip_1 .variabla.floatLeft,
+.spremenljivka.tip_2 .variabla.floatLeft {
+  margin-right: 16px;
+}
+.spremenljivka.tip_1 .variabla label,
+.spremenljivka.tip_2 .variabla label {
+  display: flex;
+  line-height: 23px;
+}
+.spremenljivka.tip_1 .variabla input[type=text].input_other,
+.spremenljivka.tip_1 .variabla textarea.input_other,
+.spremenljivka.tip_2 .variabla input[type=text].input_other,
+.spremenljivka.tip_2 .variabla textarea.input_other {
+  margin: 0 0 0 8px;
+}
+.spremenljivka.tip_1 .custom_radio_picture,
+.spremenljivka.tip_1 .visual-radio-scale,
+.spremenljivka.tip_2 .custom_radio_picture,
+.spremenljivka.tip_2 .visual-radio-scale {
+  display: inline-block;
+  margin-right: 24px;
+}
+.spremenljivka.tip_1 .custom_radio_picture label,
+.spremenljivka.tip_1 .visual-radio-scale label,
+.spremenljivka.tip_2 .custom_radio_picture label,
+.spremenljivka.tip_2 .visual-radio-scale label {
+  display: inline-block !important;
+}
+
+.spremenljivka.tip_7 input.width_100:not(:first-of-type) {
+  margin-top: 16px;
+}
+
+.variabla.missing:first-of-type {
+  margin-top: 16px;
+}
+
+.spremenljivka .variabla.missing label {
+  padding: 0;
+}
+
 div.variabla,
 td.variabla,
 td.question,
 td.differential,
 .variabla_sum label {
-  font-size: 14px;
+  font-size: 16px;
 }
 
 div.variable_holder {
-  padding: 10px 0 0 0;
+  padding: 0 !important;
+}
+div.variable_holder .variabla {
+  padding: 0;
+  margin-bottom: 16px;
+}
+div.variable_holder .variabla:last-child {
+  margin-bottom: 0;
 }
 div.variable_holder thead,
 div.variable_holder tr.table-header {
   font-weight: normal;
-  font-size: 14px;
+  font-size: 16px;
 }
 div.variable_holder thead td,
 div.variable_holder tr.table-header td {
   padding: 10px 5px;
 }
 
-table.grid_table thead tr td {
-  border-bottom: 2px #888888 solid;
-}
-table.grid_table thead tr.middle_row td {
-  border-top: 2px #888888 solid;
-}
 table.grid_table tbody tr.table-header td {
-  border-bottom: 2px #888888 solid;
   border-top: 2px #888888 solid;
   background-color: #ffffff;
 }
 table.grid_table tbody tr:nth-child(2n+1) {
-  background-color: #ffffff;
+  background-color: #eeeeee;
 }
 table.grid_table tbody tr:nth-child(2n) {
-  background-color: #eeeeee;
+  background-color: #ffffff;
 }
 table.grid_table td {
-  padding: 10px 10px;
-}
-
-span.reminder {
-  left: 3px;
+  padding: 12px 16px;
 }
 
 /* Textboxi, textarea, select */
 input, textarea, select {
-  font-family: Montserrat, Arial, Sans-Serif !important;
+  font-family: Source Sans Pro, sans-serif !important;
 }
 
 input[type=text], textarea, select {
@@ -253,7 +333,6 @@ input[type=text], textarea, select {
 
 /* ranking */
 .dropzone {
-  border-top: 1px #eeeeee solid;
   margin-top: 12px;
   padding-top: 17px;
 }
@@ -273,8 +352,8 @@ table.ranking_table ul {
 .frame_dropping,
 .frame_dropping_hover,
 .frame_moving {
-  font-size: 13px;
-  padding: 7px 10px 9px;
+  font-size: 16px;
+  padding: 8px 12px 14px;
   border: 2px solid #666666;
   background-color: #ffffff;
 }
@@ -298,7 +377,7 @@ div.variable_holder .frame_dropping_hover {
 }
 
 table.ranking_table b {
-  font-size: 13px;
+  font-size: 16px;
   font-weight: 600;
 }
 
@@ -330,7 +409,7 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus {
 
 /* Slider */
 .grupa .spremenljivka .ui-slider-pips .ui-slider-pip {
-  color: #505050;
+  color: #333333;
 }
 .grupa .spremenljivka .slider.ui-widget-content {
   /*background-color: $color_light !important;*/
@@ -355,7 +434,7 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus {
 }
 .grupa .spremenljivka .sliderText {
   padding-top: 2px;
-  color: #505050;
+  color: #333333;
   background-color: #888888;
   border: 0;
 }
@@ -384,21 +463,20 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus {
 
 /* Gumbi na dnu */
 div.buttons {
-  padding: 20px 20px 35px;
-  margin: 0 10px;
+  padding: 64px 0;
+  margin: 0;
 }
 div.buttons input {
   cursor: pointer;
   margin: 8px 10px;
-  /*padding: 7px 11px;*/
-  padding: 10px 20px;
+  padding: 0 32px;
+  height: 40px;
   text-align: center;
-  font-size: 12px;
-  letter-spacing: 1px;
+  font-size: 16px;
   font-weight: 600;
   color: #FFFFFF;
-  border-radius: 20px;
   border: 0;
+  transition: 0.3s;
 }
 div.buttons input.next {
   background-color: #666666;
@@ -420,12 +498,12 @@ div.buttons input.prev:hover, div.buttons input.prev:focus {
 
 /* Footer */
 #footer_survey {
-  padding: 40px;
+  padding: 48px 0 64px 0;
   background-color: #ffffff;
-  border-top: 1px #eeeeee solid;
+  border-top: 1px #E5E5E5 solid;
 }
 #footer_survey p, #footer_survey a, #footer_survey a:visited {
-  color: #505050;
+  color: #333333;
   font-size: 14px;
   line-height: 25px;
   font-weight: 400;
@@ -472,16 +550,16 @@ textarea:focus {
 }
 
 .frame_dropping_titles {
-  width: 240px;
+  width: 244px;
   padding: 5px;
   margin: 0px auto 0px auto;
-  height: 15px;
+  height: 20px;
   text-align: center;
   background-color: #FFFFFF;
   border-top: 2px solid #b9c5d9;
   border-left: 2px solid #b9c5d9;
   border-right: 2px solid #b9c5d9;
-  font-size: 13px;
+  font-size: 16px;
 }
 
 .drag_and_drop_box {
@@ -509,16 +587,17 @@ textarea:focus {
 }
 
 .frame_dropping_titles_box {
-  width: 240px;
+  width: 244px;
   padding: 5px;
   margin: 0px auto 0px auto;
-  height: 15px;
+  height: 20px;
   text-align: center;
   background-color: #FFFFFF;
-  font-size: 13px;
+  font-size: 16px;
 }
 
 .frame_dropping {
+  width: 234px;
   padding: 7px 10px 9px;
 }
 
@@ -528,7 +607,7 @@ textarea:focus {
 
 /* Popravimo se logo */
 #logo, #logo.english {
-  background-image: url("../../../public/img/logo/uni.png");
+  background-image: url("../../../public/img/logo/uni.png") !important;
 }
 
 /*# sourceMappingURL=Uni.css.map */
diff --git a/main/survey/skins/glasovanje/Classic.css b/main/survey/skins/glasovanje/Classic.css
index c0c943f..4d31084 100644
--- a/main/survey/skins/glasovanje/Classic.css
+++ b/main/survey/skins/glasovanje/Classic.css
@@ -36,7 +36,7 @@
 }
 .spol_buttons input{
 	cursor: pointer;
-	width: 75px;
+	width: 80px;
 	padding: 2px;
 	margin: 0 4px 0 4px;
 	
diff --git a/main/survey/skins/glasovanje/Modern.css b/main/survey/skins/glasovanje/Modern.css
index 9face9a..a081a28 100644
--- a/main/survey/skins/glasovanje/Modern.css
+++ b/main/survey/skins/glasovanje/Modern.css
@@ -31,8 +31,9 @@
 	text-align: center;
 }
 .spol_buttons input{
-	width: 60px;
+	width: 80px;
 	margin: 0 2px 0 2px;
+    padding: 2px;
 }
 .spol_buttons input.active{
 	font-weight: bold;