Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

2013-11-21 10:16:47 +01:00
parent 64e84ff296 89f400d3fc
commit 5a9bb5106f
258 changed files with 7028 additions and 4678 deletions
@@ -44,6 +44,12 @@ themes/default/modules/*/*.php
 !themes/default/modules/*/index.php
 themes/default/lang/*.php
 !themes/default/lang/index.php
+themes/default-bootstrap/cache/*.js
+themes/default-bootstrap/cache/*.css
+themes/default-bootstrap/modules/*/*.php
+!themes/default-bootstrap/modules/*/index.php
+themes/default-bootstrap/lang/*.php
+!themes/default-bootstrap/lang/index.php
 modules/*/translations/*.php
 !modules/*/translations/index.php
 mails/*
@@ -0,0 +1 @@
+#content.nobootstrap { background-color: white; width: 1200px; padding: 80px 40px; }
@@ -1 +1 @@
-#nobootstrap{width:100%;background-color:#fff;margin:-20px 0 0 -20px;padding:20px;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}#nobootstrap *,#nobootstrap *:before,#nobootstrap *:after{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}#nobootstrap fieldset h1,#nobootstrap fieldset h2,#nobootstrap fieldset h3,#nobootstrap fieldset h4,#nobootstrap fieldset h5,#nobootstrap fieldset h6{margin:0 !important;padding:0 !important;background-color:transparent !important;border:none !important;text-transform:none !important}#nobootstrap a{line-height:normal}#nobootstrap .categorieList a{line-height:20px}#nobootstrap p{line-height:normal}#nobootstrap legend{font-size:13px;line-height:20px;width:auto}#nobootstrap label{font-size:13px;display:inline;line-height:normal}#nobootstrap .breadcrumb{padding:0}#nobootstrap li{line-height:normal}#nobootstrap select,#nobootstrap textarea,#nobootstrap input{height:inherit}#nobootstrap label,#nobootstrap input,#nobootstrap button,#nobootstrap select,#nobootstrap textarea{font-size:12px;line-height:13px;border-radius:none !important}#nobootstrap input[type="radio"],#nobootstrap input[type="checkbox"]{margin:0}#nobootstrap input[type="text"]{height:14px !important}#nobootstrap table.table{margin:0;padding:0;width:100%;border-collapse:collapse}#nobootstrap table.widthfull{width:100%}#nobootstrap .table thead th{vertical-align:top}#nobootstrap .table th,#nobootstrap .table td{line-height:normal;vertical-align:middle;border-top:none}#nobootstrap [class^="icon-"],#nobootstrap [class*=" icon-"]{width:auto}#nobootstrap .toolbarBox [class^="process-icon-"],#nobootstrap .toolbarBox [class*=" process-icon-"]{text-indent:-9000px;overflow:hidden}
+#content.nobootstrap { background-color: white; width: 1200px; padding: 80px 40px; }
@@ -1,150 +1,84 @@
+//Compass is required to pre-compile this stylesheets to .css
@import "compass"
+
@import "admin-theme/admin-theme-colors"
-@import "admin-theme/_bootstrap-variables"
-@import "admin-theme/_bootstrap-init"
-@import "admin-theme/_font-awesome"
-@import "admin-theme/animate"
+@import "admin-theme/bootstrap-variables"
+@import "admin-theme/font-awesome"
+@import "admin-theme/vendor/animate"

-html, body
-	min-height: 100%
-	height: 100%
+//Bootstrap from bower-components

-#header
-	z-index: 20
-#main
-	z-index: 10
-	float: left
-	width: 100%
-	min-height: 100%
-	padding: 36px 0 60px
-	margin: 0 0 -60px 0
-	background-color: $bg-content-color
-	background-image: url('../img/patterns/bedge_grunge.png') // texture
+//Bootstrap Core : Variables + Mixins + Reset + Print
+@import "../bower_components/sass-bootstrap/lib/variables"
+@import "../bower_components/sass-bootstrap/lib/mixins"
+@import "../bower_components/sass-bootstrap/lib/normalize"
+@import "../bower_components/sass-bootstrap/lib/print"

-#content
-	padding: 80px 10px 0
-	@include transition-property(margin)
-	@include transition-duration(0.4s)
-	@include transition-timing-function(ease-out)
-	.panel
-		padding: 20px
-		margin-bottom: 20px
-		border: solid 1px darken($bg-content-color,10%)
-		background-color: lighten($bg-content-color,20%)
-		@include border-radius(5px)
-		@include box-shadow(rgba(black,0.10) 0 2px 0, white 0 0 0 3px inset)
-	.panel-heading
-		@extend h3
-	h3:not(.modal-title), .panel-heading
-		border: none
-		padding: 0 5px
-		margin: -16px -16px 15px -16px
-		color: contrasted($bg-panel-heading-color)	
-		font-size: 1.2em
-		line-height: 30px
-		font-weight: 300
-		text-transform: uppercase
-		background-color: white
-		border-bottom: solid 1px #ccc
-		i, a
-			color: contrasted($bg-panel-heading-color)
-		.badge
-			background-color: $brand-primary
-			+border-radius(0)
-			height: 29px
-			line-height: 25px
-			font-size: 1.3em
-			margin-right: 7px
-			font-weight: 300
-			float: left
-			margin-left: -5px
-		.panel-heading-action
-			@extend .pull-right
-			margin-right: -5px
-			a.list-toolbar-btn
-				float: left
-				height: 30px
-				width: 30px
-				color: $brand-primary
-				border-left: solid 1px #ccc
-				&:hover
-					text-decoration: none
-					color: black
-				i
-					text-align: center
-					font-size: 1.3em
-					line-height: 30px
-	.panel-danger .panel-heading
-		background-color: $badge-notif-color!important
-	form .alert
-		clear: both		
-	@media (max-width: $screen-phone)
-		margin: 0
-		padding: 80px 5px 0
+//bootstrap rules apply only on div#content.bootstrap, nav.bootstrap, header.bootstrap, footer.bootstrap
+.bootstrap
+	// Core CSS
+	@import "../bower_components/sass-bootstrap/lib/scaffolding"
+	@import "../bower_components/sass-bootstrap/lib/type"
+	@import "../bower_components/sass-bootstrap/lib/code"
+	@import "../bower_components/sass-bootstrap/lib/grid"
+	@import "../bower_components/sass-bootstrap/lib/tables"
+	@import "../bower_components/sass-bootstrap/lib/forms"
+	@import "../bower_components/sass-bootstrap/lib/buttons"
+	// Components
+	@import "../bower_components/sass-bootstrap/lib/component-animations"
+	@import "../bower_components/sass-bootstrap/lib/glyphicons"
+	@import "../bower_components/sass-bootstrap/lib/dropdowns"
+	@import "../bower_components/sass-bootstrap/lib/button-groups"
+	@import "../bower_components/sass-bootstrap/lib/input-groups"
+	@import "../bower_components/sass-bootstrap/lib/navs"
+	@import "../bower_components/sass-bootstrap/lib/navbar"
+	@import "../bower_components/sass-bootstrap/lib/breadcrumbs"
+	@import "../bower_components/sass-bootstrap/lib/pagination"
+	@import "../bower_components/sass-bootstrap/lib/pager"
+	@import "../bower_components/sass-bootstrap/lib/labels"
+	@import "../bower_components/sass-bootstrap/lib/badges"
+	@import "../bower_components/sass-bootstrap/lib/jumbotron"
+	@import "../bower_components/sass-bootstrap/lib/thumbnails"
+	@import "../bower_components/sass-bootstrap/lib/alerts"
+	@import "../bower_components/sass-bootstrap/lib/progress-bars"
+	@import "../bower_components/sass-bootstrap/lib/media"
+	@import "../bower_components/sass-bootstrap/lib/list-group"
+	@import "../bower_components/sass-bootstrap/lib/panels"
+	@import "../bower_components/sass-bootstrap/lib/wells"
+	@import "../bower_components/sass-bootstrap/lib/close"
+	// Components w/ JavaScript
+	@import "../bower_components/sass-bootstrap/lib/modals"
+	@import "../bower_components/sass-bootstrap/lib/tooltip"
+	@import "../bower_components/sass-bootstrap/lib/popovers"
+	@import "../bower_components/sass-bootstrap/lib/carousel"

-//backward
-#nobootstrap
-	float: left
+// Utility classes
+@import "../bower_components/sass-bootstrap/lib/utilities"
+@import "../bower_components/sass-bootstrap/lib/responsive-utilities"

-//data-focus
-.data-focus
-	&.data-focus-primary
-		background-color: $brand-primary
-		color: white
-		@include border-radius(10px)
-
-//orders
-#customer_part
-	.customerCard
-		&.selected-customer .panel
-			color: $brand-success
-			border: solid 2px $brand-success
-
-//modal 
-body.display-modal
-	#content, #main
-		margin: 0
-		padding: 0
-		background: #F8F8F8
-
-//todo: remove temp fix for bootstrap RC1 -> final
-input[type="text"],input[type="search"],input[type="password"], textarea, select
-	@extend .form-control
-
-//panels
-#content
-	.panel
-		.panel-footer
-			margin: 15px -20px -20px
-			height: 73px
-.panel-footer
-	.btn.pull-right
-		margin-left: 3px
-
-//colors
-.attributes-color-container
-	width: 40px
-	height: 25px
-	display: block
-	border: solid 1px black
-
-//components
+//PrestaShop Elements
+@import "admin-theme/admin-content"
@import "admin-theme/admin-header"
@import "admin-theme/admin-footer"
@import "admin-theme/admin-nav"
-@import "admin-theme/admin-commons"
-@import "admin-theme/admin-tables"
-@import "admin-theme/admin-tree"
-@import "admin-theme/admin-forms"
-@import "admin-theme/admin-kpi"
-@import "admin-theme/admin-switch"
-@import "admin-theme/admin-toolbar"
-@import "admin-theme/admin-date-range-picker"
-@import "admin-theme/ladda"
-
-//page specific
@import "admin-theme/admin-login"
-@import "admin-theme/admin-carrier-wizard"
-@import "admin-theme/admin-modules"
-@import "admin-theme/admin-dashboard"
-@import "admin-theme/admin-search"
+
+.bootstrap
+	//components
+	@import "admin-theme/admin-commons"
+	@import "admin-theme/admin-tables"
+	@import "admin-theme/admin-tree"
+	@import "admin-theme/admin-forms"
+	@import "admin-theme/admin-kpi"
+	@import "admin-theme/admin-switch"
+	@import "admin-theme/admin-toolbar"
+	@import "admin-theme/admin-date-range-picker"
+	@import "admin-theme/ladda"
+	//page specific
+	@import "admin-theme/admin-carrier-wizard"
+	@import "admin-theme/admin-modules"
+	@import "admin-theme/admin-dashboard"
+	@import "admin-theme/admin-search"
+
+//backward compatibility
+@import "admin-theme/admin-backward"
@@ -0,0 +1,4 @@
+#content.nobootstrap
+	background-color: white
+	width: 1200px
+	padding: 80px 40px
@@ -0,0 +1,128 @@
+html
+	min-height: 100%
+	height: 100%
+	font-size: 62.5%
+	-webkit-tap-highlight-color: rgba(0,0,0,0)
+body
+	min-height: 100%
+	height: 100%
+	font: 400 #{$font-size-base}/#{$line-height-base} $font-family-base
+	color: $text-color
+	background-color: $body-bg
+
+#main
+	z-index: 10
+	float: left
+	width: 100%
+	min-height: 100%
+	padding: 36px 0 60px
+	margin: 0 0 -60px 0
+	background-color: $bg-content-color
+	//background-image: url('../img/patterns/bedge_grunge.png') // texture
+
+#content.bootstrap
+	padding: 80px 10px 0
+	@include transition-property(margin)
+	@include transition-duration(0.4s)
+	@include transition-timing-function(ease-out)
+	.panel
+		padding: 20px
+		margin-bottom: 20px
+		border: solid 1px darken($bg-content-color,10%)
+		background-color: lighten($bg-content-color,20%)
+		@include border-radius(5px)
+		@include box-shadow(rgba(black,0.10) 0 2px 0, white 0 0 0 3px inset)
+	.panel-heading
+		@extend h3
+	h3:not(.modal-title), .panel-heading
+		border: none
+		padding: 0 5px
+		margin: -16px -16px 15px -16px
+		color: contrasted($bg-panel-heading-color)	
+		font-size: 1.2em
+		line-height: 30px
+		font-weight: 300
+		text-transform: uppercase
+		background-color: white
+		border-bottom: solid 1px #ccc
+		i, a
+			color: contrasted($bg-panel-heading-color)
+		.badge
+			background-color: $brand-primary
+			+border-radius(0)
+			height: 29px
+			line-height: 25px
+			font-size: 1.3em
+			margin-right: 7px
+			font-weight: 300
+			float: left
+			margin-left: -5px
+		.panel-heading-action
+			@extend .pull-right
+			margin-right: -5px
+			a.list-toolbar-btn
+				float: left
+				height: 30px
+				width: 30px
+				color: $brand-primary
+				border-left: solid 1px #ccc
+				&:hover
+					text-decoration: none
+					color: black
+				i
+					text-align: center
+					font-size: 1.3em
+					line-height: 30px
+	.panel-danger .panel-heading
+		background-color: $badge-notif-color!important
+	form .alert
+		clear: both		
+	@media (max-width: $screen-phone)
+		margin: 0
+		padding: 80px 5px 0
+
+//data-focus
+.data-focus
+	&.data-focus-primary
+		background-color: $brand-primary
+		color: white
+		@include border-radius(10px)
+
+//orders
+#customer_part
+	.customerCard
+		&.selected-customer .panel
+			color: $brand-success
+			border: solid 2px $brand-success
+
+//modal 
+body.display-modal
+	#content, #main
+		margin: 0
+		padding: 0
+		background: #F8F8F8
+
+//todo: remove temp fix for bootstrap RC1 -> final
+.bootstrap
+	input[type="text"],input[type="search"],input[type="password"], textarea, select
+		@extend .form-control
+		
+//panels
+.bootstrap
+	.panel
+		.panel-footer
+			margin: 15px -20px -20px
+			height: 73px
+			.btn.pull-right
+				margin-left: 3px
+#header
+	.panel-footer
+		margin: 15px 0 0!important
+		height: 40px!important
+
+//colors
+.attributes-color-container
+	width: 40px
+	height: 25px
+	display: block
+	border: solid 1px black
@@ -1,3 +1,5 @@
+#header
+	z-index: 20
 #header_infos
 	@extend .navbar
 	@extend .navbar-inverse
@@ -7,20 +9,21 @@
 	@extend .navbar-brand
 	font: 300 1.3em/100% $headings-font-family
 	position: relative
-	padding: 0 0 0 45px
 	margin: 0 20px 0 0
-	height: 37px
-	line-height: 37px
+	height: 36px
+	padding-left: 45px!important
+	line-height: 36px
 	img
 		position: absolute
 		top: 0
 		left: 0
-		width: 37px
-		height: 37px
+		width: 36px
+		height: 36px
 #header_notifs_icon_wrapper
 	@extend .hidden-xs
 	@extend .nav
 	@extend .navbar-nav
+	height: 36px
 	li a
 		padding: 9px 5px
 	> li > a > i
@@ -47,7 +50,6 @@
 				margin: 0
 		.notifs_panel_footer
 			@extend .panel-footer
-
 #header_nav_toggle
 	background-color: black
 	border: none
@@ -64,7 +66,7 @@
 #header_search
 	@extend .navbar-form
 	@extend .navbar-left
-	width: 160px
+	width: 160px!important
 	padding: 0 0 0 10px
 	position: relative
 	@media (max-width: $screen-tablet)
@@ -77,39 +79,32 @@
 		top: 0
 		left: 10px
 		width: 400px
-
 #employee_infos
-	
-.employee_name
-	position: relative
-	padding-left: 34px!important
-
-.employee_avatar_small
-	height: 30px
-	width: 30px
-	display: inline-block
-	position: absolute
-	top: 4px
-	left: 0
-	img
-		width: 100%
-		height: 100%
-		@include border-radius(30px)
-
-.employee_avatar
-	height: 100px
-	width: 100px
-	display: block
-	margin: 10px auto 10px auto
-	overflow: hidden
-	@include border-radius(120px)
-	@include box-shadow(white 0 0 0 2px, #ccc 0 0 10px 3px)
-	img
-		width: 100%
-		height: 100%
-		
-
-
+	.employee_name
+		position: relative
+		padding-left: 34px!important
+	.employee_avatar_small
+		height: 30px
+		width: 30px
+		display: inline-block
+		position: absolute
+		top: 4px
+		left: 0
+		img
+			width: 100%
+			height: 100%
+			@include border-radius(30px)
+	.employee_avatar
+		height: 100px
+		width: 100px
+		display: block
+		margin: 10px auto
+		overflow: hidden
+		@include border-radius(120px)
+		@include box-shadow(white 0 0 0 2px, #ccc 0 0 10px 3px)
+		img
+			width: 100%
+			height: 100%
 #header_quick
 	@extend .nav
 	@extend .navbar-nav
@@ -1,10 +1,14 @@
 #login
-	height: 100%	
+	height: 100%
 	@include background(radial-gradient(color-stops(rgba(104,128,138,.4) 10%,rgba(138,114,76,0) 40%), top left),linear-gradient(top,rgba(57,173,219,.25),rgba(42,60,87,.4)),linear-gradient(left top,#670D10,#092756))

 #login-header
-	margin: 0 0 60px 0
+	padding-top: 40px
+	margin-bottom: 30px
 	color: white
+	h1, h4
+		margin: 0
+		padding: 0

 #login-panel
 	margin: 0 auto
@@ -22,12 +26,13 @@

 	.flipper
 		@include transition-duration(0.6s)
-		@include transform-style(preserve-3d)
+		@include transform-style
 		position: relative

 	.front, .back
 		@include backface-visibility(hidden)
 		width: 420px
+		padding: 20px
 		position: absolute
 		top: 0
 		left: 0
@@ -88,8 +93,7 @@
 	-webkit-animation-name: fadeInDown
 	-moz-animation-name: fadeInDown
 	-o-animation-name: fadeInDown
-	animation-name: fadeInDown
-
+	//animation-name: fadeInDown

@-webkit-keyframes fadeIn
 	0%
@@ -119,4 +123,4 @@
 	-webkit-animation-name: fadeIn
 	-moz-animation-name: fadeIn
 	-o-animation-name: fadeIn
-	animation-name: fadeIn
+	//animation-name: fadeIn
@@ -169,17 +169,20 @@
 						color: white
 			span.submenu_expand
 				position: absolute
-				right: 10px
-				top: 2px
+				right: 0
+				top: 0
+				width: 28px
+				height: 36px
+				text-align: center
 				cursor: pointer
 				font-family: FontAwesome
 				font-size: 24px
 				font-weight: 100
 				color: black
-				background-color: transparent
 				@extend .icon-angle-down
 				@include text-shadow(lighten($main-color,10%) 1px 1px 0)
 				&:hover
+					background: rgba(black,0.1)
 					color: white
 					@include text-shadow(darken($main-color,20%) -1px -1px 0)
 	ul.submenu
@@ -396,4 +399,3 @@

 [class^="icon-Admin"]
 	margin-right: 6px
-
@@ -116,4 +116,11 @@
 	@extend .icon-refresh
 .process-icon-configure
 	@extend .icon-cog
+.process-icon-uninstall
+	@extend .icon-trash
+.process-icon-off
+	@extend .icon-off
+.process-icon-reset
+	@extend .icon-rotate-left
+

@@ -1,59 +0,0 @@
-/*!
- * Bootstrap v3.0.0
- *
- * Copyright 2013 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world by @mdo and @fat.
- */
-
-// Core variables and mixins
-@import "../bower_components/sass-bootstrap/lib/variables";
-@import "../bower_components/sass-bootstrap/lib/mixins";
-
-// Reset
-@import "../bower_components/sass-bootstrap/lib/normalize";
-@import "../bower_components/sass-bootstrap/lib/print";
-
-// Core CSS
-@import "../bower_components/sass-bootstrap/lib/scaffolding";
-@import "../bower_components/sass-bootstrap/lib/type";
-@import "../bower_components/sass-bootstrap/lib/code";
-@import "../bower_components/sass-bootstrap/lib/grid";
-@import "../bower_components/sass-bootstrap/lib/tables";
-@import "../bower_components/sass-bootstrap/lib/forms";
-@import "../bower_components/sass-bootstrap/lib/buttons";
-
-// Components
-@import "../bower_components/sass-bootstrap/lib/component-animations";
-@import "../bower_components/sass-bootstrap/lib/glyphicons";
-@import "../bower_components/sass-bootstrap/lib/dropdowns";
-@import "../bower_components/sass-bootstrap/lib/button-groups";
-@import "../bower_components/sass-bootstrap/lib/input-groups";
-@import "../bower_components/sass-bootstrap/lib/navs";
-@import "../bower_components/sass-bootstrap/lib/navbar";
-@import "../bower_components/sass-bootstrap/lib/breadcrumbs";
-@import "../bower_components/sass-bootstrap/lib/pagination";
-@import "../bower_components/sass-bootstrap/lib/pager";
-@import "../bower_components/sass-bootstrap/lib/labels";
-@import "../bower_components/sass-bootstrap/lib/badges";
-@import "../bower_components/sass-bootstrap/lib/jumbotron";
-@import "../bower_components/sass-bootstrap/lib/thumbnails";
-@import "../bower_components/sass-bootstrap/lib/alerts";
-@import "../bower_components/sass-bootstrap/lib/progress-bars";
-@import "../bower_components/sass-bootstrap/lib/media";
-@import "../bower_components/sass-bootstrap/lib/list-group";
-@import "../bower_components/sass-bootstrap/lib/panels";
-@import "../bower_components/sass-bootstrap/lib/wells";
-@import "../bower_components/sass-bootstrap/lib/close";
-
-// Components w/ JavaScript
-@import "../bower_components/sass-bootstrap/lib/modals";
-@import "../bower_components/sass-bootstrap/lib/tooltip";
-@import "../bower_components/sass-bootstrap/lib/popovers";
-@import "../bower_components/sass-bootstrap/lib/carousel";
-
-// Utility classes
-@import "../bower_components/sass-bootstrap/lib/utilities";
-@import "../bower_components/sass-bootstrap/lib/responsive-utilities";
@@ -73,7 +73,7 @@ $border-radius-base:             3px ;
 // -------------------------

 // $table-bg:                           transparent ; overall background-color
-// $table-bg-accent:                    #f9f9f9 ; for striping
+$table-bg-accent:                    #f9f9f9 ; //for striping
 $table-bg-hover:                     $bg-panel-heading-color ;

 // $table-border-color:                 #ddd ; table and cell border
@@ -136,8 +136,8 @@ $input-height-base:              ($line-height-computed + ($padding-base-vertica
 // $dropdown-link-active-bg:        $component-active-bg ;

 // $dropdown-link-color:            $gray-dark ;
-// $dropdown-link-hover-color:      #fff ;
-// $dropdown-link-hover-bg:         $dropdown-link-active-bg ;
+$dropdown-link-hover-color:      	white ;
+$dropdown-link-hover-bg:         	$brand-primary ;


 // Grid system
@@ -1,63 +0,0 @@
-@import compass
-#nobootstrap
-	width: 100%
-	background-color: white
-	margin: -20px 0 0 -20px
-	padding: 20px
-	@include box-sizing(content-box)
-	*, *:before, *:after
-		@include box-sizing(content-box)
-	fieldset
-		h1, h2, h3, h4, h5, h6
-			margin: 0!important
-			padding: 0!important
-			background-color: transparent!important
-			border: none!important
-			text-transform: none!important
-	a
-		line-height: normal
-	.categorieList a
-		line-height: 20px
-	p
-		line-height: normal
-	legend
-		font-size: 13px
-		line-height: 20px
-		width: auto
-	label
-		font-size: 13px
-		display: inline
-		line-height: normal
-	.breadcrumb
-		padding: 0
-	li
-		line-height: normal
-	select, textarea, input
-		height: inherit
-	label, input, button, select, textarea
-		font-size: 12px
-		line-height: 13px
-		border-radius: none!important
-
-	input[type="radio"], input[type="checkbox"]
-		margin: 0
-	input[type="text"]
-		height: 14px!important
-	table.table
-		margin: 0
-		padding: 0
-		width: 100%
-		border-collapse: collapse
-	table.widthfull
-		width: 100%
-	.table thead th
-		vertical-align: top
-	.table th, .table td
-		line-height: normal
-		vertical-align: middle
-		border-top: none
-	[class^="icon-"], [class*=" icon-"]
-		width: auto
-	.toolbarBox [class^="process-icon-"], .toolbarBox [class*=" process-icon-"]
-		text-indent: -9000px
-		overflow: hidden
@@ -1,4 +1,4 @@
-#nobootstrap {
+#content.nobootstrap {
 	//old admin theme
 	h1,h2,h3,h4{font-family:Arial, Helvetica, sans-serif;line-height:1.4em;margin-bottom:.5em}
 	h2{font-size:1.7em}
@@ -37,24 +37,26 @@

 <div class="defaultForm">
 	<div class="panel">
-		{l s='Carrier name:'} <strong id="summary_name"></strong>
-		<div id="summary_meta_informations"></div>
-		<div id="summary_shipping_cost"></div>
-		<div id="summary_range"></div>
-		<div>
+		<div class="panel-heading">{l s='Carrier name:'} <strong id="summary_name"></strong></div>
+		<div class="panel-body">
+			<p id="summary_meta_informations"></p>
+			<p id="summary_shipping_cost"></p>
+			<p id="summary_range"></p>
+			<div>
 			{l s='This carrier will be proposed for those delivery zones:'}
-			<ul id="summary_zones"></ul>
+				<ul id="summary_zones"></ul>
+			</div>
+			<div>
+				{l s='And it will be proposed for those client groups:'}
+				<ul id="summary_groups"></ul>
+			</div>
+			{if $is_multishop}
+			<div>
+				{l s='Finally, this carrier will be proposed in those shops:'}
+				<ul id="summary_shops"></ul>
+			</div>
+			{/if}
 		</div>
-		<div>
-			{l s='And it will be proposed for those client groups:'}
-			<ul id="summary_groups"></ul>
-		</div>
-		{if $is_multishop}
-		<div>
-			{l s='Finally, this carrier will be proposed in those shops:'}
-			<ul id="summary_shops"></ul>
-		</div>
-		{/if}
-		{$active_form}
 	</div>
+	{$active_form}
 </div>
@@ -215,7 +215,7 @@
 									<th>{l s='State'}</th>
 									<th>{l s='Products'}</th>
 									<th>{l s='Total spent'}</th>
-									<th class="center">{l s='Actions'}</th>
+									<th class="text-right">{l s='Actions'}</th>
 								</tr>
 							</thead>
 							<tbody>
@@ -227,7 +227,7 @@
 									<td>{$order['order_state']}</td>
 									<td align="right">{$order['nb_products']}</td>
 									<td align="right">{$order['total_paid_real']}</td>
-									<td align="center">
+									<td class="text-right">
 										<a class="btn btn-default" href="?tab=AdminOrders&id_order={$order['id_order']}&vieworder&token={getAdminToken tab='AdminOrders'}">
 											<i class='icon-eye-open'></i> {l s='View'}
 										</a>
@@ -248,7 +248,7 @@
 									<th>{l s='State'}</th>
 									<th>{l s='Products'}</th>
 									<th>{l s='Total spent'}</th>
-									<th class="center">{l s='Actions'}</th>
+									<th class="text-right">{l s='Actions'}</th>
 								</tr>
 							</thead>
 							<tbody>
@@ -260,7 +260,7 @@
 									<td>{$order['order_state']}</td>
 									<td align="right">{$order['nb_products']}</td>
 									<td align="right">{$order['total_paid_real']}</td>
-									<td align="center">
+									<td class="text-right">
 										<a class="btn btn-default" href="?tab=AdminOrders&id_order={$order['id_order']}&vieworder&token={getAdminToken tab='AdminOrders'}">
 											<i class='icon-eye-open'></i> {l s='View'}
 										</a>
@@ -287,7 +287,7 @@
 								<th>{l s='Date'}</th>
 								<th>{l s='Carrier'}</th>
 								<th>{l s='Total'}</th>
-								<th class="center">{l s='Actions'}</th>
+								<th class="text-right">{l s='Actions'}</th>
 							</tr>
 						</thead>
 						<tbody>
@@ -297,7 +297,7 @@
 								<td>{dateFormat date=$cart['date_upd'] full=0}</td>
 								<td>{$cart['name']}</td>
 								<td align="right">{$cart['total_price']}</td>
-								<td align="center">
+								<td class="text-right">
 									<a class="btn btn-default" href="index.php?tab=AdminCarts&id_cart={$cart['id_cart']}&viewcart&token={getAdminToken tab='AdminCarts'}">
 										<i class='icon-eye-open'></i> {l s='View'}
 									</a>
@@ -322,7 +322,7 @@
 							<th class="center">{l s='Date'}</th>
 							<th class="center">{l s='Name'}</th>
 							<th class="center">{l s='Quantity'}</th>
-							<th class="center">{l s='Actions'}</th>
+							<th class="text-right">{l s='Actions'}</th>
 						</tr>
 					</thead>
 					<tbody>
@@ -331,7 +331,7 @@
 							<td>{dateFormat date=$order['date_add'] full=0}</td>
 							<td>{$product['product_name']}</td>
 							<td align="right">{$product['product_quantity']}</td>
-							<td align="center">
+							<td class="text-right">
 								<a class="btn btn-default" href="?tab=AdminOrders&id_order={$product['id_order']}&vieworder&token={getAdminToken tab='AdminOrders'}">
 									<i class='icon-eye-open'></i> {l s='View'}
 								</a>
@@ -407,7 +407,7 @@
 								<th>{l s='Code'}</th>
 								<th>{l s='Name'}</th>
 								<th>{l s='Status'}</th>
-								<th>{l s='Actions'}</th>
+								<th class="text-right">{l s='Actions'}</th>
 							<tr/>
 						</thead>
 						<tbody>
@@ -419,7 +419,7 @@
 								<td align="center">
 									<img src="../img/admin/{if $discount['active']}enabled.gif{else}disabled.gif{/if}" alt="{l s='Status'}" title="{l s='Status'}" />
 								</td>
-								<td align="center">
+								<td class="text-right">
 									<a href="?tab=AdminCartRules&id_cart_rule={$discount['id_cart_rule']}&addcart_rule&token={getAdminToken tab='AdminCartRules'}">
 										<img src="../img/admin/edit.gif" />
 									</a>
@@ -476,7 +476,7 @@
 						<tr>
 							<th>{l s='ID'}</th>
 							<th>{l s='Name'}</th>
-							<th class="center">{l s='Actions'}</th>
+							<th class="text-right">{l s='Actions'}</th>
 						</tr>
 					</thead>
 					<tbody>
@@ -484,7 +484,7 @@
 						<tr onclick="document.location = '?tab=AdminGroups&id_group={$group['id_group']}&viewgroup&token={getAdminToken tab='AdminGroups'}'">
 							<td>{$group['id_group']}</td>
 							<td>{$group['name']}</td>
-							<td class="center">
+							<td class="text-right">
 								<a class="btn btn-default" href="?tab=AdminGroups&id_group={$group['id_group']}&viewgroup&token={getAdminToken tab='AdminGroups'}">
 									<i class='icon-eye-open'></i> {l s='View'}
 								</a>
@@ -514,7 +514,7 @@
 						<tr>
 							<th>{l s='ID'}</th>
 							<th>{l s='Name'}</th>
-							<th class="center">{l s='Actions'}</th>
+							<th class="text-right">{l s='Actions'}</th>
 						</tr>
 					</thead>
 					<tbody>
@@ -522,7 +522,7 @@
 						<tr onclick="document.location = '{$p['url']}'">
 							<td>{$p['id']}</td>
 							<td>{$p['name']}</td>
-							<td align="center">
+							<td class="text-right">
 								<a class="btn btn-default" href="{$p['url']}">
 									<i class='icon-eye-open'></i> {l s='View'}
 								</a>
@@ -580,7 +580,7 @@
 								<th>{l s='Address'}</th>
 								<th>{l s='Country'}</th>
 								<th>{l s='Phone number(s)'}</th>
-								<th class="center">{l s='Actions'}</th>
+								<th class="text-right">{l s='Actions'}</th>
 							</tr>
 						</thead>
 						<tbody>
@@ -598,7 +598,7 @@
 										{if $address['phone_mobile']}<br />{$address['phone_mobile']}{else}--{/if}
 									{/if}
 								</td>
-								<td>
+								<td class="text-right">
 									<div class="btn-group">
 										<a class="btn btn-default" data-toggle="dropdown" href="?tab=AdminAddresses&id_address={$address['id_address']}&addaddress&token={getAdminToken tab='AdminAddresses'}">
 											<i class="icon-edit"></i> {l s='Edit'}
@@ -29,45 +29,44 @@
 	{l s='Your .CSV file has been sucessfully imported into your shop. Don\'t forget to Re-build the products search index.'}
 </div>
 {/if}
-<div style="display: none">
-	<div id="upload_file_import">
-		<div class="alert alert-info">{l s='Only UTF-8 and ISO-8859-1 encoding are allowed'}</div>
-		<form action="{$current}&token={$token}" method="post" enctype="multipart/form-data" class="form-horizontal">
-			<div class="panel">
-				<div class="form-group">
-					<label class="control-label col-lg-3">{l s='Select your CSV file'}</label>
-					<div class="col-lg-9">
-						<div class="row">
-							<div class="col-lg-7">
-								<input id="file" type="file" name="file" class="hide" />
-								<div class="dummyfile input-group">
-									<span class="input-group-addon"><i class="icon-file"></i></span>
-									<input id="file-name" type="text" class="disabled" name="filename" readonly />
-									<span class="input-group-btn">
-										<button id="file-selectbutton" type="button" name="submitAddAttachments" class="btn btn-default">
-											<i class="icon-folder-open"></i> {l s='Choose a file'}
-										</button>
-									</span>
-								</div>
-							</div>
-						</div>
-						<div class="row">
-							<div class="col-lg-7">
-								<p class="help-block">
-									{l s='You can also upload your file via FTP to the following directory:'} {$path_import}.
-								</p>
+<div id="upload_file_import" style="display: none">
+	<div class="alert alert-info">{l s='Only UTF-8 and ISO-8859-1 encoding are allowed'}</div>
+	<form action="{$current}&token={$token}" method="post" enctype="multipart/form-data" class="form-horizontal">
+		<div class="panel">
+			<div class="clearfix">&nbsp;</div>
+			<div class="form-group">
+				<label class="control-label col-lg-3">{l s='Select your CSV file'}</label>
+				<div class="col-lg-9">
+					<div class="row">
+						<div class="col-lg-7">
+							<input id="file" type="file" name="file" class="hide" />
+							<div class="dummyfile input-group">
+								<span class="input-group-addon"><i class="icon-file"></i></span>
+								<input id="file-name" type="text" class="disabled" name="filename" readonly />
+								<span class="input-group-btn">
+									<button id="file-selectbutton" type="button" name="submitAddAttachments" class="btn btn-default">
+										<i class="icon-folder-open"></i> {l s='Choose a file'}
+									</button>
+								</span>
 							</div>
 						</div>
 					</div>
-				</div>
-				<div class="form-group">
-					<div class="col-lg-9 col-lg-offset-3">
-						<input type="submit" name="submitFileUpload" value="{l s='Upload'}" class="btn btn-default" />
+					<div class="row">
+						<div class="col-lg-7">
+							<p class="help-block">
+								{l s='You can also upload your file via FTP to the following directory:'} {$path_import}.
+							</p>
+						</div>
 					</div>
 				</div>
 			</div>
-		</form>
-	</div>
+			<div class="form-group">
+				<div class="col-lg-9 col-lg-offset-3">
+					<button type="submit" name="submitFileUpload" class="btn btn-default"><i class="icon-upload"></i> {l s='Upload'}</button>
+				</div>
+			</div>
+		</div>
+	</form>
 </div>

 {* Import fieldset *}
@@ -93,6 +92,7 @@
 							<option value="{$filename}"{if $csv_selected == $filename} selected="selected"{/if}>{$filename|escape:'htmlall':'UTF-8'}</option>
 						{/foreach}
 					</select>
+				<div class="clearfix">&nbsp;</div>
 				{/if}

 				<a href="#upload_file_import" id="upload_file_import_link" class="btn btn-default">
@@ -132,10 +132,10 @@
 					</a>
 				</p>

-				<ul id="csv_files_import" style="display:none;">
+				<ul id="csv_files_import" style="display:none;" class="list-group">
 					{foreach $files_to_import AS $filename}
 					<li>
-						<a href="{$current}&token={$token}&csvfilename={$filename|@base64_encode}">{$filename}</a>
+						<a href="{$current}&token={$token}&csvfilename={$filename|@base64_encode}">{$filename}</a>&nbsp;&nbsp;
 						<a href="{$current}&token={$token}&csvfilename={$filename|@base64_encode}&delete=1" class="btn btn-default">
 							<i class="icon-trash"></i> {l s='Delete'}
 						</a>
@@ -201,11 +201,11 @@
 				</p>
 			</div>
 		</div>
-		<div class="form-group">
-			<label for="match_ref" class="control-label col-lg-3" style="display: none">{l s='Use product reference as key?'}</label>
+		<div class="form-group" style="display: none">
+			<label for="match_ref" class="control-label col-lg-3">{l s='Use product reference as key?'}</label>
 			<div class="col-lg-6">
 				<p class="checkbox">
-					<input name="match_ref" id="match_ref" type="checkbox" style="display:none"/>
+					<input name="match_ref" id="match_ref" type="checkbox" />
 				</p>
 			</div>
 		</div>
@@ -228,22 +228,22 @@
 			</div>
 		</div>
 		<div class="form-group">
-			<label for="match_ref" class="control-label col-lg-3" style="display: none">{l s='Use product reference as key?'}</label>
-			<div class="col-lg-6">
-				<input type="submit" name="submitImportFile" value="{l s='Next step'}" class="btn btn-default" {if empty($files_to_import)}disabled{/if}/>
+			<div class="col-lg-6 col-lg-push-3">
+				<input type="submit" name="submitImportFile" id="submitImportFile" value="{l s='Next step'}" class="btn btn-default" {if empty($files_to_import)}disabled{/if}/>
 			</div>
+		</div>

-			{if empty($files_to_import)}
-			<div class="alert alert-info">{l s='You must upload a file in order to proceed to the next step'}</div>
-			{/if}
+		{if empty($files_to_import)}
+		<div class="alert alert-info">{l s='You must upload a file in order to proceed to the next step'}</div>
+		{/if}

-			<div class="alert alert-warning import_products_categories">
-				<p>{l s='Note that the category import does not support categories of the same name.'}</p>
-				<p>{l s='Note that you can have several products with the same reference.'}</p>
-			</div>
-			<div class="alert alert-warning import_supply_orders_details">
-				<p>{l s='Importing Supply Order Details will reset products ordered, if there are any.'}</p>
-			</div>
+		<div class="alert alert-warning import_products_categories">
+			<p>{l s='Note that the category import does not support categories of the same name.'}</p>
+			<p>{l s='Note that you can have several products with the same reference.'}</p>
+		</div>
+		<div class="alert alert-warning import_supply_orders_details">
+			<p>{l s='Importing Supply Order Details will reset products ordered, if there are any.'}</p>
+		</div>
 		{if !count($files_to_import)}
 			<div class="alert alert-warning">
 				<p>{l s='There is no CSV file available. Please upload one using the \'Upload\' button above.'}</p>
@@ -274,7 +274,11 @@
 		$("a#upload_file_import_link").fancybox({
 				'titleShow' : false,
 				'transitionIn' : 'elastic',
-				'transitionOut' : 'elastic'
+				'transitionOut' : 'elastic',
+				'autoDimensions' : false,
+				'autoSize'   : false,
+				'width' : 700,
+				'height' : 300
 		});

 		$('#preview_import').submit(function(e){
@@ -305,9 +309,9 @@
 				$('input[name=multiple_value_separator]').val('{if isset($multiple_value_separator_selected)}{$multiple_value_separator_selected}{else},{/if}');
 			}
 			if ($("#entity > option:selected").val() == 1)
-				$("label[for=match_ref], #match_ref").show();
+				$("#match_ref").closest('.form-group.').show();
 			else
-				$("label[for=match_ref], #match_ref").hide();
+				$("#match_ref").closest('.form-group.').hide();

 			if ($("#entity > option:selected").val() == 1 || $("#entity > option:selected").val() == 0)
 				$(".import_products_categories").show();
@@ -316,14 +320,14 @@

 			if ($("#entity > option:selected").val() == 0 || $("#entity > option:selected").val() == 1 || 
 				$("#entity > option:selected").val() == 5 || $("#entity > option:selected").val() == 6)
-				$("label[for=regenerate], #regenerate").show()
+				$("#regenerate").closest('.form-group.').show();
 			else
-				$("label[for=regenerate], #regenerate").hide();
+				$("#regenerate").closest('.form-group.').hide();

 			if ($("#entity > option:selected").val() == 0 || $("#entity > option:selected").val() == 1 || $("#entity > option:selected").val() == 3 || $("#entity > option:selected").val() == 5 || $("#entity > option:selected").val() == 6 || $("#entity > option:selected").val() == 7)
-				$("label[for=forceIDs], #forceIDs").show();
+				$("#forceIDs").closest('.form-group.').show();
 			else
-				$("label[for=forceIDs], #forceIDs").hide();
+				$("#forceIDs").closest('.form-group.').hide();
 			$("#entitie").html($("#entity > option:selected").text().toLowerCase());
 			$.ajax({
 				url: 'ajax.php',
@@ -51,7 +51,7 @@
 			var btn_submit_import = $('#import');
 			if (btn_save_import.length > 0 && btn_submit_import.length > 0)
 			{
-				btn_submit_import.hide();
+				btn_submit_import.closest('.form-group').hide();
 				btn_save_import.find('span').removeClass('process-icon-save-import');
 				btn_save_import.find('span').addClass('process-icon-save');
 				btn_save_import.click(function(){
@@ -62,31 +62,43 @@
 			showTable(current);
 		});
 	</script>
-	<div id="container-customer">
-	<h2>{l s='View your data'}</h2>
-	<div>
-		<b>{l s='Save and load your configuration for importing files'} : </b><br/><br/>
-		<input type="text" name="newImportMatchs" id="newImportMatchs" />
-		<a id="saveImportMatchs" class="button" href="#">{l s='Save'}</a><br /><br />
-		<div id="selectDivImportMatchs" {if !$import_matchs}style="display:none"{/if}>
-			<select id="valueImportMatchs">
-				{foreach $import_matchs as $match}
-					<option id="{$match.id_import_match}" value="{$match.match}">{$match.name}</option>
-				{/foreach}
-			</select>
-			<a class="button" id="loadImportMatchs" href="#">{l s='Load'}</a>
-			<a class="button" id="deleteImportMatchs" href="#">{l s='Delete'}</a>
+	<div id="container-customer" class="panel">
+	<h3><i class="icon-list-alt"></i> {l s='View your data'}</h3>
+	<div class="form-horizontal">
+		<div class="form-group">
+			<label class="control-label col-lg-3">{l s='Save and load your configuration for importing files'} : </label>
+			<div class="col-lg-7">
+				<input type="text" name="newImportMatchs" id="newImportMatchs" />		
+			</div>
+			<div class="col-lg-2">
+				<a id="saveImportMatchs" class="btn btn-default" href="#"><i class="icon-save"></i> {l s='Save'}</a>
+			</div>
+		</div>
+		<div class="form-group" {if !$import_matchs}style="display:none"{/if}>
+			<label class="control-label col-lg-3">{l s='Matches'} : </label>
+			<div id="selectDivImportMatchs" class="col-lg-7">
+				<select id="valueImportMatchs">
+					{foreach $import_matchs as $match}
+						<option id="{$match.id_import_match}" value="{$match.match}">{$match.name}</option>
+					{/foreach}
+				</select>
+			</div>
+			<div class="col-lg-2">
+				<a id="loadImportMatchs" href="#" class="btn btn-default"><i class="icon-cogs"></i> {l s='Load'}</a>
+				<a id="deleteImportMatchs" href="#" class="btn btn-default"><i class="icon-remove"></i> {l s='Delete'}</a>
+			</div>
 		</div>
 	</div>
-	<h3>{l s='Please set the value type of each column'}</h3>
-	<div id="error_duplicate_type" class="warning warn" style="display:none;">
-		<h3>{l s='Columns cannot have the same value type'}</h3>
+	<div class="row">
+		<p>{l s='Please set the value type of each column'}</p>
 	</div>
-	<div id="required_column" class="warning warn" style="display:none;">
-		<h3>{l s='Column'} <span id="missing_column">&nbsp;</span> {l s='must be set'}</h3>
+	<div id="error_duplicate_type" class="alert alert-warning" style="display:none;">
+		{l s='Columns cannot have the same value type'}
 	</div>
-	<form action="{$current}&token={$token}" method="post" id="import_form" name="import_form">
-		{l s='Skip'} <input type="text" size="2" name="skip" value="1" /> {l s='lines'}
+	<div id="required_column" class="alert alert-warning" style="display:none;">
+		{l s='Column'} <span id="missing_column">&nbsp;</span> {l s='must be set'}
+	</div>
+	<form action="{$current}&token={$token}" method="post" id="import_form" name="import_form" class="form-horizontal">
 		<input type="hidden" name="csv" value="{$fields_value.csv}" />
 		<input type="hidden" name="convert" value="{$fields_value.convert}" />
 		<input type="hidden" name="regenerate" value="{$fields_value.regenerate}" />
@@ -103,27 +115,37 @@
 		{/if}
 		<input type="hidden" name="separator" value="{$fields_value.separator}" />
 		<input type="hidden" name="multiple_value_separator" value="{$fields_value.multiple_value_separator}" />
-		<table>
-			<tr>
-				<td colspan="3" align="center">
-					<input name="import" type="submit" onclick="return (validateImportation(new Array({$res})));" id="import" value="{l s='Import .CSV data'}" class="button" />
-				</td>
-			</tr>
-			<tr>
-				<td valign="top" align="center">
-					<input id="btn_left" value="{l s='<<'}" type="button" class="button" onclick="showTable(current - 1);" />
-				</td>
-				<td align="left">
-					{section name=nb_i start=0 loop=$nb_table step=1}
-						{assign var=i value=$smarty.section.nb_i.index}
-						{$data.$i}
-					{/section}
-				</td>
-				<td valign="top" align="center">
-					<input id="btn_right" value="{l s='>>'}" type="button" class="button" onclick="showTable(current + 1);" />
-				</td>
-			</tr>
-		</table>
+		<div class="form-group">
+			<label class="control-label col-lg-3">{l s='Lines to skip'}</label>
+			<div class="col-lg-9">
+				<input type="text" size="2" name="skip" value="1" />
+			</div>
+		</div>
+		<div class="form-group">
+			<div class="col-lg-12">
+				<table class="table">
+					<tr>
+						<td valign="top" align="center">
+							<button id="btn_left" type="button" class="btn btn-default" onclick="showTable(current - 1);">{l s='<<'}</button>
+						</td>
+						<td align="left">
+							{section name=nb_i start=0 loop=$nb_table step=1}
+								{assign var=i value=$smarty.section.nb_i.index}
+								{$data.$i}
+							{/section}
+						</td>
+						<td valign="top" align="center">
+							<button id="btn_right" type="button" class="btn btn-default" onclick="showTable(current + 1);">{l s='>>'}</button>
+						</td>
+					</tr>
+				</table>
+			</div>
+		</div>
+		<div class="form-group">
+			<div class="col-lg-12">
+				<button name="import" type="submit" onclick="return (validateImportation(new Array({$res})));" id="import" class="btn btn-default pull-right"><i class="icon-cloud-upload"></i> {l s='Import .CSV data'}</button>
+			</div>
+		</div>
 	</form>
 	</div>
 {/block}
@@ -46,5 +46,5 @@
 	<link rel="shortcut icon" type="image/x-icon" href="{$img_dir}favicon.ico" />
 </head>
 <body class="page-topbar">
-	<div id="login">
-		<div id="content" class="page-content">
+	<div id="login" class="bootstrap">
+		<div id="content">
@@ -22,26 +22,23 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-<div class="panel">
+<div class="bootstrap">
 	<h3><i class="icon-cogs"></i> {l s='Configuration'}</h3>
-	<div class="row">
-		<div class="input-group">
-			<button type="button" class="btn btn-default dropdown-toggle" tabindex="-1" data-toggle="dropdown">
-				{l s='Manage translations'}
-				<span class="caret"></span>
-			</button>
-			<ul class="dropdown-menu">
-				{foreach from=$module_languages item=language}
-				<li><a href="{$trad_link}{$language['iso_code']}#{$module_name}">{$language.name}</a></li>
-				{/foreach}
-			</ul>
-		</div>
+	<div class="input-group">
+		<button type="button" class="btn btn-default dropdown-toggle" tabindex="-1" data-toggle="dropdown">
+			<i class="icon-flag"></i>
+			{l s='Manage translations'}
+			<span class="caret"></span>
+		</button>
+		<ul class="dropdown-menu">
+			{foreach from=$module_languages item=language}
+			<li><a href="{$trad_link}{$language['iso_code']}#{$module_name}">{$language.name}</a></li>
+			{/foreach}
+		</ul>
 	</div>
 	{if isset($display_multishop_checkbox) && $display_multishop_checkbox}
-	<div class="row">
-		<input type="checkbox" name="activateModule" value="1"{if $module->active} checked="checked"{/if} 
-			onclick="location.href = '{$current_url}&enable='+(($(this).attr('checked')) ? 1 : 0)" />
-			{l s='Activate module for '}{$shop_context}
-	</div>
+	<input type="checkbox" name="activateModule" value="1"{if $module->active} checked="checked"{/if} 
+		onclick="location.href = '{$current_url}&enable='+(($(this).attr('checked')) ? 1 : 0)" />
+		{l s='Activate module for '}{$shop_context}
 	{/if}
 </div>
@@ -22,52 +22,54 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-<div class="page-head">
-	<h2 class="page-title">
-		{l s='Configure:'} {$module_display_name} ({$module_name})
-	</h2>
-	<div class="page-bar toolbarBox">
-		<div class="btn-toolbar">
-			<ul class="cc_button nav nav-pills pull-right">
-				<li>
-					<a id="desc-module-hook" class="toolbar_btn" href="{$module_disable_link}" title="{l s='Disable'}">
-						<i class="process-icon-off"></i>
-						<div>{l s='Disable'}</div>
-					</a>
-				</li>
-				<li>
-					<a id="desc-module-hook" class="toolbar_btn" href="{$module_uninstall_link}" title="{l s='Uninstall'}">
-						<i class="process-icon-minus-sign-alt"></i>
-						<div>{l s='Uninstall'}</div>
-					</a>
-				</li>
-				<li>
-					<a id="desc-module-hook" class="toolbar_btn" href="{$module_reset_link}" title="{l s='Reset'}">
-						<i class="process-icon-share-alt"></i>
-						<div>{l s='Reset'}</div>
-					</a>
-				</li>
-				{if isset($module_update_link)}
-				<li>
-					<a id="desc-module-hook" class="toolbar_btn" href="{$module_update_link}" title="{l s='Update'}">
-						<i class="process-icon-refresh"></i>
-						<div>{l s='Update'}</div>
-					</a>
-				</li>
-				{/if}
-				<li>
-					<a id="desc-module-hook" class="toolbar_btn" href="{$module_hook_link}" title="{l s='Manage hooks'}">
-						<i class="process-icon-anchor"></i>
-						<div>{l s='Manage hooks'}</div>
-					</a>
-				</li>
-				<li>
-					<a id="desc-module-back" class="toolbar_btn" href="{$back_link}" title="{l s='Back'}">
-						<i class="process-icon-back" ></i>
-						<div>{l s='Back'}</div>
-					</a>
-				</li>
-			</ul>
+<div class="bootstrap">
+	<div class="page-head">
+		<h2 class="page-title">
+			{l s='Configure:'} {$module_display_name} ({$module_name})
+		</h2>
+		<div class="page-bar toolbarBox">
+			<div class="btn-toolbar">
+				<ul class="cc_button nav nav-pills pull-right">
+					<li>
+						<a id="desc-module-hook" class="toolbar_btn" href="{$module_disable_link}" title="{l s='Disable'}">
+							<i class="process-icon-off"></i>
+							<div>{l s='Disable'}</div>
+						</a>
+					</li>
+					<li>
+						<a id="desc-module-hook" class="toolbar_btn" href="{$module_uninstall_link}" title="{l s='Uninstall'}">
+							<i class="process-icon-uninstall"></i>
+							<div>{l s='Uninstall'}</div>
+						</a>
+					</li>
+					<li>
+						<a id="desc-module-hook" class="toolbar_btn" href="{$module_reset_link}" title="{l s='Reset'}">
+							<i class="process-icon-reset"></i>
+							<div>{l s='Reset'}</div>
+						</a>
+					</li>
+					{if isset($module_update_link)}
+					<li>
+						<a id="desc-module-hook" class="toolbar_btn" href="{$module_update_link}" title="{l s='Update'}">
+							<i class="process-icon-refresh"></i>
+							<div>{l s='Update'}</div>
+						</a>
+					</li>
+					{/if}
+					<li>
+						<a id="desc-module-hook" class="toolbar_btn" href="{$module_hook_link}" title="{l s='Manage hooks'}">
+							<i class="process-icon-anchor"></i>
+							<div>{l s='Manage hooks'}</div>
+						</a>
+					</li>
+					<li>
+						<a id="desc-module-back" class="toolbar_btn" href="{$back_link}" title="{l s='Back'}">
+							<i class="process-icon-back" ></i>
+							<div>{l s='Back'}</div>
+						</a>
+					</li>
+				</ul>
+			</div>
 		</div>
 	</div>
 </div>
@@ -26,7 +26,6 @@
 <div class="leadin">{block name="leadin"}{/block}</div>

 <form action="{$url_submit}" id="{$table}_form" method="post" class="form-horizontal">
-
 	{if $display_key}
 		<input type="hidden" name="show_modules" value="{$display_key}" />
 	{/if}
@@ -35,9 +34,9 @@
 			<i class="icon-paste"></i>
 			{l s='Transplant a module'}
 		</h3>
-		<div class="row">
+		<div class="form-group">
 			<label class="control-label col-lg-3 required"> {l s='Module:'}</label>
-			<div class="col-lg-6">
+			<div class="col-lg-9">
 				<select name="id_module" {if $edit_graft} disabled="disabled"{/if}>
 					{foreach $modules as $module}
 						<option value="{$module->id}" {if $id_module == $module->id || (!$id_module && $show_modules == $module->id)}selected="selected"{/if}>{$module->displayName|stripslashes}</option>
@@ -45,9 +44,9 @@
 				</select>
 			</div>
 		</div>
-		<div class="row">
+		<div class="form-group">
 			<label class="control-label col-lg-3 required"> {l s='Hook into'} :</label>
-			<div class="col-lg-6">
+			<div class="col-lg-9">
 				<select name="id_hook" {if $edit_graft} disabled="disabled"{/if}>
 					{foreach $hooks as $hook}
 						<option value="{$hook['id_hook']}" {if $id_hook == $hook['id_hook']} selected="selected"{/if}>{$hook['name']}{if $hook['name'] != $hook['title']} ({$hook['title']}){/if}</option>
@@ -55,10 +54,10 @@
 				</select>
 			</div>
 		</div>
-		<div class="row">
+		<div class="form-group">
 			<label class="control-label col-lg-3">{l s='Exceptions'} :</label>
-			<div class="col-lg-6">
-				<div class="alert alert-warning">
+			<div class="col-lg-9">
+				<div class="well">
 					<p>
 						{l s='Please specify the files for which you do not want the module to be displayed.'}<br />
 						{l s='Please input each filename, separated by a comma.'}<br />
@@ -73,22 +72,18 @@
 				</div>
 			</div>
 		</div>
-
-		<div class="row">
-			<div class="col-lg-12">
-				{if $edit_graft}
-					<input type="hidden" name="id_module" value="{$id_module}" />
-					<input type="hidden" name="id_hook" value="{$id_hook}" />
-				{/if}
-				<input type="submit" value="{l s='Save'}" name="{if $edit_graft}submitEditGraft{else}submitAddToHook{/if}" id="{$table}_form_submit_btn" class="btn btn-default" />
-			</div>
+		<div class="panel-footer">
+			{if $edit_graft}
+				<input type="hidden" name="id_module" value="{$id_module}" />
+				<input type="hidden" name="id_hook" value="{$id_hook}" />
+			{/if}
+			<input type="submit" value="{l s='Save'}" name="{if $edit_graft}submitEditGraft{else}submitAddToHook{/if}" id="{$table}_form_submit_btn" class="btn btn-default" />
 		</div>
 	</div>
 </form>
 <script type="text/javascript">
 	//<![CDATA
-	function position_exception_textchange()
-	{
+	function position_exception_textchange() {
 		// TODO : Add & Remove automatically the "custom pages" in the "em_list_x"
 		var obj = $(this);
 		var shopID = obj.attr('id').replace(/\D/g, '');
@@ -100,21 +95,16 @@
 		for (var i = 0; i < len; i++)
 			list.find('option[value="' + $.trim(values[i]) + '"]').prop('selected', true);
 	}
-
-	function position_exception_listchange()
-	{
-
+	function position_exception_listchange() {
 		var obj = $(this);
 		var shopID = obj.attr('id').replace(/\D/g, '');
 		var str = obj.val().join(', ');
 		obj.closest('form').find('#em_text_' + shopID).val(str);
 	}
-	
 	$(document).ready(function(){
 		$('form[id="hook_module_form"] input[id^="em_text_"]').each(function(){
 			$(this).change(position_exception_textchange).change();
 		});
-
 		$('form[id="hook_module_form"] select[id^="em_list_"]').each(function(){
 			$(this).change(position_exception_listchange);
 		});
@@ -66,11 +66,11 @@
 				<i class="icon-file-text"></i>
 				{l s='Modify translations'}
 			</h3>
-			<p class="alert alert-warning">
+			<p class="alert alert-info">
 				{l s='Here you can modify translations for every line of code inside PrestaShop.'}<br />
 				{l s='First, select a section (such as Back Office or Installed modules), and then click the flag representing the language you want to edit.'}
 			</p>
-			<div class="row">
+			<div class="form-group">
 				<input type="hidden" name="controller" value="AdminTranslations" />
 				<input type="hidden" name="lang" id="translation_lang" value="0" />
 				<label class="control-label col-lg-3" for="type">{l s='Type of translation:'}</label>
@@ -82,7 +82,7 @@
 					</select>
 				</div>
 			</div>
-			<div class="row">
+			<div class="form-group">
 				<label class="control-label col-lg-3" for="theme">{l s='Choose your theme:'}</label>
 				<div class="col-lg-4">
 					<select name="theme" id="theme">
@@ -93,7 +93,7 @@
 					</select>
 				</div>
 			</div>
-			<div class="row">
+			<div class="form-group">
 				<label class="control-label col-lg-3" for="language-button">{l s='Select your language:'}</label>
 				<div class="input-group col-lg-4">
 					<button type="button" id="language-button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
@@ -104,8 +104,7 @@
 						{foreach $languages as $language}
 						<li>
 							<a href="javascript:chooseTypeTranslation('{$language['iso_code']}');">
-								<img src="{$theme_lang_dir}{$language['id_lang']}.jpg" alt="{$language['iso_code']}" title="{$language['iso_code']}" />
-								{$language['iso_code']}
+								{$language['name']}
 							</a>
 						</li>
 						{/foreach}
@@ -121,28 +120,39 @@
 				<i class="icon-download"></i>
 				{l s='Add / Update a language'}
 			</h3>
-			<div id="submitAddLangContent" class="row">
-				<p class="alert alert-warning">
+			<div id="submitAddLangContent" class="form-group">
+				<p class="alert alert-info">
 					{l s='You can add or update a language directly from the PrestaShop website here:'}<br/>
 					{l s='If you choose to update an existing language pack, all of your previous customization\'s in the theme named "Default" will be lost. This includes Front Office expressions and default email templates.'}
 				</p>
 				{if $packs_to_update || $packs_to_install}
 					<label class="control-label col-lg-3" for="params_import_language">{l s='Please select the language you want to add or update:'}</label>
-					<div class="col-lg-4">
-						<select id="params_import_language" name="params_import_language">
-							<optgroup label="{l s='Update a language'}">
-								{foreach $packs_to_update as $lang_pack}
-									<option value="{$lang_pack['iso_code']}|{$lang_pack['version']}">{$lang_pack['name']}</option>
-								{/foreach}
-							</optgroup>
-							<optgroup label="{l s='Add a language'}">		
-								{foreach $packs_to_install as $lang_pack}
-									<option value="{$lang_pack['iso_code']}|{$lang_pack['version']}">{$lang_pack['name']}</option>
-								{/foreach}
-							</optgroup>
-						</select> 
+					<div class="col-lg-9">
+						<div class="row">
+							<div class="col-sm-8">
+								<select id="params_import_language" name="params_import_language">
+								<optgroup label="{l s='Update a language'}">
+									{foreach $packs_to_update as $lang_pack}
+										<option value="{$lang_pack['iso_code']}|{$lang_pack['version']}">{$lang_pack['name']}</option>
+									{/foreach}
+								</optgroup>
+								<optgroup label="{l s='Add a language'}">		
+									{foreach $packs_to_install as $lang_pack}
+										<option value="{$lang_pack['iso_code']}|{$lang_pack['version']}">{$lang_pack['name']}</option>
+									{/foreach}
+								</optgroup>
+							</select> 
+							</div>
+							<div class="col-sm-4">
+								<button type="submit" name="submitAddLanguage" class="btn btn-default">
+									<i class="icon-plus"></i>
+									{l s='Add or update a language'}
+								</button>
+							</div>
+							
+						</div>
 					</div>
-					<input type="submit" value="{l s='Add or update a language'}" name="submitAddLanguage" class="btn btn-default" />
+					
 				{else}
 					<p class="text-danger">{l s='Cannot connect to the PrestaShop website to get the language list.'}</p>
 				{/if}				
@@ -156,17 +166,30 @@
 				<i class="icon-download"></i>
 				{l s='Import a language pack manually'}
 			</h3>
-			<p class="alert alert-warning">
+			<p class="alert alert-info">
 				{l s='If the language file format is: isocode.gzip (e.g. us.gzip), and the language corresponding to this package does not exist, it will automatically be created.'}
 				{l s='Warning: This will replace all of the existing data inside the destination language.'}
 			</p>
-			<div class="row">
+			<div class="form-group">
 				<label for="importLanguage" class="control-label col-lg-3" for="importLanguage">{l s='Language pack to import:'}</label>
 				<div class="col-lg-4">
-					<input type="file" name="file" id="importLanguage"/>
+					<div class="form-group">
+						<div class="col-lg-12">
+							<input id="importLanguage" type="file" name="file" class="hide" />
+							<div class="dummyfile input-group">
+								<span class="input-group-addon"><i class="icon-file"></i></span>
+								<input id="file-name" type="text" class="disabled" name="filename" readonly />
+								<span class="input-group-btn">
+									<button id="file-selectbutton" type="button" name="submitAddAttachments" class="btn btn-default">
+										<i class="icon-folder-open"></i> {l s='Add file'}
+									</button>
+								</span>
+							</div>
+						</div>
+					</div>
 				</div>
 			</div>
-			<div class="row">
+			<div class="form-group">
 				<label for="selectThemeForImport" class="control-label col-lg-3" for="selectThemeForImport">{l s='Select your theme:'}</label>
 				<div class="col-lg-4">
 					<select name="theme[]" id="selectThemeForImport" {if count($themes) > 1}multiple="multiple"{/if} >
@@ -176,7 +199,7 @@
 					</select>
 				</div>
 			</div>
-			<div class="row">
+			<div class="form-group">
 				<div class="col-lg-9 pull-right">
 					<input type="submit" value="{l s='   Import   '}" name="submitImport" class="btn btn-default" />
 				</div>
@@ -190,11 +213,11 @@
 				<i class="icon-upload"></i>
 				{l s='Export a language'}
 			</h3>
-			<p class="alert alert-warning">
+			<p class="alert alert-info">
 				{l s='Export data from one language to a file (language pack).'}<br />
 				{l s='Choose which theme you\'d like to export your translations to. '}
 			</p>
-			<div class="row">
+			<div class="form-group">
 				<label class="control-label col-lg-3" for="iso_code">{l s='Language:'}</label>
 				<div class="col-lg-4">
 					<select name="iso_code" id="iso_code">
@@ -204,7 +227,7 @@
 					</select>
 				</div>
 			</div>
-			<div class="row">
+			<div class="form-group">
 				<label class="control-label col-lg-3" for="export-theme">{l s='Choose your theme:'}</label>
 				<div class="col-lg-4">
 					<select name="theme" id="export-theme">
@@ -214,7 +237,7 @@
 					</select>
 				</div>
 			</div>
-			<div class="row">
+			<div class="form-group">
 				<div class="col-lg-9 pull-right">
 					<input type="submit" class="btn btn-default" name="submitExport" value="{l s='Export'}" />
 				</div>
@@ -228,12 +251,12 @@
 				<i class="icon-copy"></i>
 				{l s='Copy'}
 			</h3>
-			<p class="alert alert-warning">
+			<p class="alert alert-info">
 				{l s='Copies data from one language to another.'}<br />
 				{l s='Warning: This will replace all of the existing data inside the destination language.'}<br />
 				{l s='If necessary'}, <b><a href="{$url_create_language}" class="btn btn-link"><i class="icon-external-link-sign"></i> {l s='you must first create a new language.'}</a></b>.
 			</p>
-			<div class="row">
+			<div class="form-group">
 				<label class="control-label col-lg-3 required" for="fromLang"> {l s='From:'}</label>
 				<div class="col-lg-4">
 					<select name="fromLang" id="fromLang">
@@ -250,7 +273,7 @@
 					</select>
 				</div>
 			</div>
-			<div class="row">
+			<div class="form-group">
 				<label class="control-label col-lg-3" for="toLang">{l s='To:'}</label>
 				<div class="col-lg-4">
 					<select name="toLang" id="toLang">
@@ -267,12 +290,12 @@
 					</select>
 				</div>			
 			</div>
-			<div class="row">
+			<div class="form-group">
 				<div class="col-lg-9 pull-right">
 					<input type="submit" value="{l s='Copy'}" name="submitCopyLang" class="btn btn-default" />
 				</div>
 			</div>
-			<div class="row">
+			<div class="form-group">
 				<p class="col-lg-12 text-muted required">
 					<span class="text-danger">*</span>
 					{l s='Language files must be complete to allow copying of translations.'}
@@ -280,4 +303,34 @@
 			</div>
 		</div>
 	</form>
-{/block}
+<script type="text/javascript">
+	$(document).ready(function(){
+		$('#file-selectbutton').click(function(e) {
+			$('#importLanguage').trigger('click');
+		});
+
+		$('#file-name').click(function(e) {
+			$('#importLanguage').trigger('click');
+		});
+
+		$('#importLanguage').change(function(e) {
+			if ($(this)[0].files !== undefined)
+			{
+				var files = $(this)[0].files;
+				var name  = '';
+
+				$.each(files, function(index, value) {
+					name += value.name+', ';
+				});
+
+				$('#file-name').val(name.slice(0, -2));
+			}
+			else // Internet Explorer 9 Compatibility
+			{
+				var name = $(this).val().split(/[\\/]/);
+				$('#file-name').val(name[name.length-1]);
+			}
+		});
+	});
+</script>
+{/block}
@@ -27,7 +27,7 @@
 </div>
 {if $display_footer}
 {hook h="displayBackOfficeFooter"}
-<div id="footer">
+<div id="footer" class="bootstrap">
 	<div class="col-sm-5 hidden-xs">
 		<a href="http://www.prestashop.com/" target="_blank">PrestaShop&trade; {$ps_version}</a> - <span>{l s='Load time: '} {number_format(microtime(true) - $timer_start, 3, '.', '')}s</span>
 	</div>
@@ -47,10 +47,21 @@
 	</div>	

 	<div class="col-sm-5">
-		<a href="http://www.prestashop.com/en/contact_us?utm_source=backoffice_footer" target="_blank" class="footer_link">{l s='Contact'}</a>
-		|&nbsp;<a href="http://forge.prestashop.com/?utm_source=backoffice_footer" target="_blank" class="footer_link">{l s='Bug Tracker'}</a>
-		|&nbsp;<a href="http://www.prestashop.com/forums/?utm_source=backoffice_footer" target="_blank" class="footer_link">{l s='Forum'}</a>
-		|&nbsp;<a href="http://addons.prestashop.com/?utm_source=backoffice_footer" target="_blank" class="footer_link">{l s='Addons'}</a>
+		<a href="http://www.prestashop.com/en/contact_us?utm_source=backoffice_footer" target="_blank" class="footer_link">
+			{l s='Contact'}
+		</a>
+		|&nbsp;
+		<a href="http://forge.prestashop.com/?utm_source=backoffice_footer" target="_blank" class="footer_link">
+			{l s='Bug Tracker'}
+		</a>
+		|&nbsp;
+		<a href="http://www.prestashop.com/forums/?utm_source=backoffice_footer" target="_blank" class="footer_link">
+			{l s='Forum'}
+		</a>
+		|&nbsp;
+		<a href="http://addons.prestashop.com/?utm_source=backoffice_footer" target="_blank" class="footer_link">
+			{l s='Addons'}
+		</a>
 		{if $iso_is_fr}
 		<p>Questions / Renseignements / Formations : 
 			<strong>+33 (0)1.40.18.30.04</strong>
@@ -102,11 +102,11 @@
 	{/if}
 </head>

+
 {if $display_header}
 	<body class="{if $employee->bo_menu}page-sidebar {* page-sidebar-closed *}{else}page-topbar{/if} {$smarty.get.controller|escape|strtolower}">
-
-{* begin  HEADER *}
-	<header id="header">
+	{* begin  HEADER *}
+	<header id="header" class="bootstrap">
 		<nav id="header_infos" role="navigation">
 			<div class="navbar-header">
 			<button id="header_nav_toggle" type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse-primary">
@@ -341,12 +341,15 @@
 	<div id="main">
 		{include file='nav.tpl'}

-		<div id="content" class="page-content">
+		<div id="content" class="{if !$bootstrap}nobootstrap{else}bootstrap{/if}">
+		
+
 {if $install_dir_exists}
 			<div class="alert alert-warning">
 				{l s='For security reasons, you must also:'}&nbsp;{l s='delete the /install folder'}
 			</div>
 {/if}
+
 {if $is_multishop && $shop_list && ($multishop_context & Shop::CONTEXT_GROUP || $multishop_context & Shop::CONTEXT_SHOP)}
 			<div class="panel multishop_toolbar">
 				<div class="col-lg-12 form-horizontal">
@@ -355,10 +358,10 @@
 				</div>
 			</div>
 {/if}
+{* end display_header*}

-{* end display_header*}	
 {else}
 	<body{if isset($lite_display) && $lite_display} class="display-modal"{/if}>
 		<div id="main">
-			<div id="content" class="page-content">
+			<div id="content" class="{if !$bootstrap}nobootstrap{else}bootstrap{/if}">
 {/if}
@@ -53,8 +53,7 @@
 									<label for="{if isset($input.id)}{$input.id}{if isset($input.lang) AND $input.lang}_{$current_id_lang}{/if}{else}{$input.name}{if isset($input.lang) AND $input.lang}_{$current_id_lang}{/if}{/if}" class="control-label col-lg-3 {if isset($input.required) && $input.required && $input.type != 'radio'}required{/if}">
 										{if isset($input.hint)}
 										<span class="label-tooltip" data-toggle="tooltip" data-html="true"
-											title="
-												{if is_array($input.hint)}
+											title="{if is_array($input.hint)}
 													{foreach $input.hint as $hint}
 														{if is_array($hint)}
 															{$hint.text}
@@ -64,8 +63,7 @@
 													{/foreach}
 												{else}
 													{$input.hint}
-												{/if}
-											">
+												{/if}">
 										{/if}
 										{$input.label}
 										{if isset($input.hint)}
@@ -235,7 +235,9 @@
 														</div>
 														<div class="col-lg-2">
 															<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-																<!-- name -->
+																{foreach $languages as $language}
+																	{if $language.id_lang == $id_lang}{$language.iso_code}{/if}
+																{/foreach}
 																<span class="caret"></span>
 															</button>
 															<ul class="dropdown-menu">
@@ -263,7 +265,9 @@
 														</div>
 														<div class="col-lg-2">
 															<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-																<!-- name -->
+																{foreach $languages as $language}
+																	{if $language.id_lang == $id_lang}{$language.iso_code}{/if}
+																{/foreach}
 																<span class="caret"></span>
 															</button>
 															<ul class="dropdown-menu">
@@ -33,30 +33,36 @@
 		<div class="alert alert-info">
 			{l s='Select the fields you would like to be required for this section.'}
 		</div>
-		<table class="table">
-			<thead>
-				<tr>
-					<th class="fixed-width-xs">
-						<input type="checkbox" onclick="checkDelBoxes(this.form, 'fieldsBox[]', this.checked)" class="noborder" name="checkme">
-					</th>
-					<th><span class="title_box">{l s='Field Name'}</span></th>
-				</tr>
-			</thead>
-			<tbody>
-			{foreach $table_fields as $field}
-				{if !in_array($field, $required_class_fields)}
-				<tr>
-					<td class="noborder">
-						<input type="checkbox" name="fieldsBox[]" value="{$field}" {if in_array($field, $required_fields)} checked="checked"{/if} />
-					</td>
-					<td>
-						{$field}
-					</td>
-				</tr>
-				{/if}
-			{/foreach}
-			</tbody>
-		</table>
-		<button class="btn btn-default pull-right" type="submit" name="submitFields"><i class="icon-save"></i> {l s='Save'}</button>
+		<div class="row">
+			<table class="table">
+				<thead>
+					<tr>
+						<th class="fixed-width-xs">
+							<input type="checkbox" onclick="checkDelBoxes(this.form, 'fieldsBox[]', this.checked)" class="noborder" name="checkme">
+						</th>
+						<th><span class="title_box">{l s='Field Name'}</span></th>
+					</tr>
+				</thead>
+				<tbody>
+				{foreach $table_fields as $field}
+					{if !in_array($field, $required_class_fields)}
+					<tr>
+						<td class="noborder">
+							<input type="checkbox" name="fieldsBox[]" value="{$field}" {if in_array($field, $required_fields)} checked="checked"{/if} />
+						</td>
+						<td>
+							{$field}
+						</td>
+					</tr>
+					{/if}
+				{/foreach}
+				</tbody>
+			</table>
+		</div>
+		<div class="panel-footer">
+			<button name="submitFields" type="submit" class="btn btn-default pull-right">
+				<i class="process-icon-save "></i> <span>{l s='Save'}</span>
+			</button>					
+		</div>
 	</form>
 </div>
@@ -87,8 +87,5 @@
 		{/if}
 	</div>
 {/if}
-
-{if !$bootstrap}<div id="nobootstrap">{/if}
 {$page}
-{if !$bootstrap}</div>{/if}
 {$footer}
@@ -1,4 +1,4 @@
-<nav id="nav-sidebar" role="navigation">
+<nav id="nav-sidebar" class="bootstrap" role="navigation">
 {if !$tab}
 	<div class="mainsubtablist" style="display:none"></div>
 {/if}
@@ -3380,7 +3380,7 @@ class ProductCore extends ObjectModel
 		{
 			$sql->leftJoin('product_attribute', 'pa', 'pa.`id_product` = p.`id_product`');
 			$sql->join(Shop::addSqlAssociation('product_attribute', 'pa', false));
-			$where .= ' OR pa.`reference` LIKE \'%'.pSQL($query).'%\'';
+			$where .= ' OR pa.`reference` LIKE \'%'.pSQL($query).'%\' OR pa.`ean13` LIKE \'%'.pSQL($query).'%\'';
 		}
 		$sql->where($where);
 		$sql->join(Product::sqlStock('p', 'pa', false, $context->shop));
@@ -1940,8 +1940,9 @@ class AdminControllerCore extends Controller
 	{
 		$admin_webpath = str_ireplace(_PS_ROOT_DIR_, '', _PS_ADMIN_DIR_);
 		$admin_webpath = preg_replace('/^'.preg_quote(DIRECTORY_SEPARATOR, '/').'/', '', $admin_webpath);
-		$this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/backward-admin-bootstrap-reset.css', 'all', 1);
-		$this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/backward-admin-old.css', 'all', 2);
+		//$this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/backward-admin-old.css', 'all', 1);
+		$this->addCSS(__PS_BASE_URI__.$admin_webpath.'/themes/'.$this->bo_theme.'/css/backward-admin-bootstrap-reset.css', 'all', 2);
+		
 	}

 	public function setMedia()
@@ -111,10 +111,10 @@ class TaxRulesTaxManagerCore implements TaxManagerInterface
 					 break;
 			}

-			self::$cache_tax_calculator[$postcode.'-'.$this->type] = new TaxCalculator($taxes, $behavior);
+			self::$cache_tax_calculator[(int)$this->address->id_country.'-'.$postcode.'-'.$this->type] = new TaxCalculator($taxes, $behavior);
 		}

-		return self::$cache_tax_calculator[$postcode.'-'.$this->type];
+		return self::$cache_tax_calculator[(int)$this->address->id_country.'-'.$postcode.'-'.$this->type];
 	}
 }

@@ -116,6 +116,7 @@ class AdminCmsContentControllerCore extends AdminController
 	public function renderPageHeaderToolbar()
 	{
 		$id_cms_category = (int)Tools::getValue('id_cms_category');
+		$id_cms_page = Tools::getValue('id_cms');

 		if (!$id_cms_category)
 			$id_cms_category = 1;
@@ -124,7 +125,24 @@ class AdminCmsContentControllerCore extends AdminController
 		$this->toolbar_title[] = 'CMS';

 		if ($this->display == 'edit_category')
-			$this->toolbar_title[] = sprintf($this->l('Edit: %s'), $cms_category->name[$this->context->employee->id_lang]);
+		{
+			if (Tools::getValue('addcms_category') !== false)
+				$this->toolbar_title[] =$this->l('Add new');
+			else
+				$this->toolbar_title[] = sprintf($this->l('Edit: %s'), $cms_category->name[$this->context->employee->id_lang]);
+		}
+		elseif ($this->display == 'edit_page')
+		{
+			$this->toolbar_title[] = $cms_category->name[$this->context->employee->id_lang];
+
+			if (Tools::getValue('addcms') !== false)
+				$this->toolbar_title[] = $this->l('Add new');
+			elseif ($id_cms_page)
+			{
+				$cms_page = new CMS($id_cms_page);
+				$this->toolbar_title[] = sprintf($this->l('Edit: %s'), $cms_page->meta_title[$this->context->employee->id_lang]);
+			}
+		}
 		else
 			$this->toolbar_title[] = $cms_category->name[$this->context->employee->id_lang];

@@ -64,7 +64,7 @@ class AdminCurrenciesControllerCore extends AdminController
 				'title' =>	$this->l('Automatically update currency rates'),
 				'image' => '../img/admin/tab-tools.gif',
 				'info' => '<div class="alert alert-block"><p>'.$this->l('Use PrestaShop\'s webservice to update your currency exchange rates. Please use caution, rates are provided as-is. You can place this URL in the crontab,or access it manually.').':</p>
-					<p><strong>'.Tools::getShopDomain(true, true).__PS_BASE_URI__.basename(_PS_ADMIN_DIR_).'/cron_currency_rates.php?secure_key='.md5(_COOKIE_KEY_.Configuration::get('PS_SHOP_NAME')).'</strong></p></div>',
+					<p><strong><a href="'.Tools::getShopDomain(true, true).__PS_BASE_URI__.basename(_PS_ADMIN_DIR_).'/cron_currency_rates.php?secure_key='.md5(_COOKIE_KEY_.Configuration::get('PS_SHOP_NAME')).'" onclick="return !window.open($(this).attr(\'href\'));">'.Tools::getShopDomain(true, true).__PS_BASE_URI__.basename(_PS_ADMIN_DIR_).'/cron_currency_rates.php?secure_key='.md5(_COOKIE_KEY_.Configuration::get('PS_SHOP_NAME')).'</a></strong></p></div>',
 			)
 		);

@@ -78,7 +78,7 @@ class AdminDashboardControllerCore extends AdminController
 		{
 			$form['icon'] = 'tab-preferences';
 			$form['fields'] = array();
-			$form['submit'] = array('title' => $this->l('Save'), 'class' => 'button');
+			$form['submit'] = array('title' => $this->l('Save'), 'class' => 'btn btn-default');
 		}

 		foreach ($modules as $module)
@@ -90,7 +90,7 @@ class AdminGendersControllerCore extends AdminController
 		if(empty($this->display))
 			$this->page_header_toolbar_btn['new_gender'] = array(
 				'href' => self::$currentIndex.'&amp;addgender&amp;token='.$this->token,
-				'desc' => $this->l('Add new gender'),
+				'desc' => $this->l('Add new title'),
 				'icon' => 'process-icon-new'
 			);

@@ -43,7 +43,7 @@ class AdminLanguagesControllerCore extends AdminController
 				'dir' => 'l'
 			),
 			array(
- 				'name' => 'no-picture',
+ 				'name' => 'no_picture',
 				'dir' => 'p'
 			)
 		);
@@ -165,7 +165,7 @@ class AdminLanguagesControllerCore extends AdminController
 					'label' => $this->l('Date format:'),
 					'name' => 'date_format_lite',
 					'required' => true,
-					'hint' => $this->l('Short date format (e.g., %s)')
+					'hint' => sprintf($this->l('Short date format (e.g., %s)'), 'Y-m-d')
 					/* TO DO - ajouter les liens dans le hint ? */
 					/*'desc' => sprintf($this->l('Short date format (e.g., %s)'), '<a href="http://php.net/date" target="_blank">Y-m-d</a>')*/
 				),
@@ -174,7 +174,7 @@ class AdminLanguagesControllerCore extends AdminController
 					'label' => $this->l('Date format (full):'),
 					'name' => 'date_format_full',
 					'required' => true,
-					'hint' => $this->l('Full date format (e.g., %s)')
+					'hint' => sprintf($this->l('Full date format (e.g., %s)'), 'Y-m-d H:i:s')
 					/* TO DO - ajouter les liens dans le hint ? */
 					/*'desc' => sprintf($this->l('Full date format (e.g., %s)'), '<a href="http://php.net/date" target="_blank">Y-m-d H:i:s</a>')*/
 				),
@@ -188,7 +188,7 @@ class AdminLanguagesControllerCore extends AdminController
 				array(
 					'type' => 'file',
 					'label' => $this->l('"No-picture" image:'),
-					'name' => 'no-picture',
+					'name' => 'no_picture',
 					'hint' => $this->l('Image is displayed when "no picture is found"')
 				),
 				array(
@@ -385,11 +385,11 @@ class AdminLanguagesControllerCore extends AdminController
 	{
 		if (isset($_POST['iso_code']) && !empty($_POST['iso_code']) && Validate::isLanguageIsoCode(Tools::getValue('iso_code')) && Language::getIdByIso($_POST['iso_code']))
 			$this->errors[] = Tools::displayError('This ISO code is already linked to another language.');
-		if ((!empty($_FILES['no-picture']['tmp_name']) || !empty($_FILES['flag']['tmp_name'])) && Validate::isLanguageIsoCode(Tools::getValue('iso_code')))
+		if ((!empty($_FILES['no_picture']['tmp_name']) || !empty($_FILES['flag']['tmp_name'])) && Validate::isLanguageIsoCode(Tools::getValue('iso_code')))
 		{
-			if ($_FILES['no-picture']['error'] == UPLOAD_ERR_OK)
+			if ($_FILES['no_picture']['error'] == UPLOAD_ERR_OK)
 				$this->copyNoPictureImage(strtolower(Tools::getValue('iso_code')));
-			unset($_FILES['no-picture']);
+			unset($_FILES['no_picture']);
 		}
 		else
 			$this->errors[] = Tools::displayError('Flag and "No picture" image fields are required.');
@@ -399,13 +399,13 @@ class AdminLanguagesControllerCore extends AdminController

 	public function processUpdate()
 	{
-		if (( isset($_FILES['no-picture']) && !$_FILES['no-picture']['error'] || isset($_FILES['flag']) && !$_FILES['flag']['error'])
+		if (( isset($_FILES['no_picture']) && !$_FILES['no_picture']['error'] || isset($_FILES['flag']) && !$_FILES['flag']['error'])
 				&& Validate::isLanguageIsoCode(Tools::getValue('iso_code')))
 			{
-				if ($_FILES['no-picture']['error'] == UPLOAD_ERR_OK)
+				if ($_FILES['no_picture']['error'] == UPLOAD_ERR_OK)
 					$this->copyNoPictureImage(strtolower(Tools::getValue('iso_code')));
-						// class AdminTab deal with every $_FILES content, don't do that for no-picture
-					unset($_FILES['no-picture']);
+						// class AdminTab deal with every $_FILES content, don't do that for no_picture
+					unset($_FILES['no_picture']);
 			}
 			$object = $this->loadObject();
 			if (Tools::getValue('active') != (int)$object->active)
@@ -419,16 +419,16 @@ class AdminLanguagesControllerCore extends AdminController
 	/**
 	 * Copy a no-product image
 	 *
-	 * @param string $language Language iso_code for no-picture image filename
+	 * @param string $language Language iso_code for no_picture image filename
 	 */
 	public function copyNoPictureImage($language)
 	{
-		if (isset($_FILES['no-picture']) && $_FILES['no-picture']['error'] === 0)
-			if ($error = ImageManager::validateUpload($_FILES['no-picture'], Tools::getMaxUploadSize()))
+		if (isset($_FILES['no_picture']) && $_FILES['no_picture']['error'] === 0)
+			if ($error = ImageManager::validateUpload($_FILES['no_picture'], Tools::getMaxUploadSize()))
 				$this->errors[] = $error;
 			else
 			{
-				if (!($tmp_name = tempnam(_PS_TMP_IMG_DIR_, 'PS')) || !move_uploaded_file($_FILES['no-picture']['tmp_name'], $tmp_name))
+				if (!($tmp_name = tempnam(_PS_TMP_IMG_DIR_, 'PS')) || !move_uploaded_file($_FILES['no_picture']['tmp_name'], $tmp_name))
 					return false;
 				if (!ImageManager::resize($tmp_name, _PS_IMG_DIR_.'p/'.$language.'.jpg'))
 					$this->errors[] = Tools::displayError('An error occurred while copying "No Picture" image to your product folder.');
@@ -131,12 +131,7 @@ class AdminLocalizationControllerCore extends AdminController
 			);
 	}

-	public function initPageHeaderToolbar()
-	{
-		parent::initPageHeaderToolbar();

-		$this->page_header_toolbar_title = $this->l('Localization');
-	}

 	public function postProcess()
 	{
@@ -112,8 +112,7 @@ class AdminShippingControllerCore extends AdminController
 						'identifier' => 'value',
 						'list' => $carrier_default_order
 					),
-				),
-				'submit' => array()
+				)
 			)
 		);		
 	}
@@ -175,14 +175,14 @@ function displaySummary()
 	$('#summary_zones').html('');
 	$('.input_zone').each(function(){
 		if ($(this).attr('checked'))
-			$('#summary_zones').html($('#summary_zones').html() + '<li><strong>' + $(this).closest().prev().text() + '</strong></li>');
+			$('#summary_zones').html($('#summary_zones').html() + '<li><strong>' + $(this).closest('tr').find('label').text() + '</strong></li>');
 	});
 	
 	// Group restrictions
 	$('#summary_groups').html('');
 	$('input[name$="groupBox[]"]').each(function(){
 		if ($(this).attr('checked'))
-			$('#summary_groups').html($('#summary_groups').html() + '<li><strong>' + $(this).closest().next().next().text() + '</strong></li>');
+			$('#summary_groups').html($('#summary_groups').html() + '<li><strong>' + $(this).closest('tr').find('td:eq(2)').text() + '</strong></li>');
 	});
 	
 	// shop restrictions
@@ -68,6 +68,6 @@
 				{/foreach}
 			</tbody>
 		</table>
-		<input class="btn btn-default" name="submitDashGoals" type="submit" value="{l s='Save' mod='dashgoals'}" />
+		<button class="btn btn-default" name="submitDashGoals" type="submit"><i class="icon-save"></i> {l s='Save' mod='dashgoals'}</button>
 	</form>
 </section>
@@ -508,4 +508,217 @@ class Loyalty extends Module

 		return (array_key_exists($key, $translations)) ? $translations[$key] : $key;
 	}
+	
+	public function renderForm()
+	{
+		$order_states = OrderState::getOrderStates($this->context->language->id);
+		$currency = new Currency((int)(Configuration::get('PS_CURRENCY_DEFAULT')));
+		
+		$root_category = Category::getRootCategory();
+		$root_category = array('id_category' => $root_category->id, 'name' => $root_category->name);
+		
+		if (Tools::getValue('categoryBox'))
+			$selected_categories = Tools::getValue('categoryBox');
+		else
+			$selected_categories = explode(',', Configuration::get('PS_LOYALTY_VOUCHER_CATEGORY'));
+
+		$fields_form_1 = array(
+			'form' => array(
+				'legend' => array(
+					'title' => $this->l('Settings'),
+					'icon' => 'icon-cogs'
+				),
+				'input' => array(
+					array(
+						'type' => 'text',
+						'label' => $this->l('Ratio'),
+						'name' => 'point_rate',
+						'prefix' => $currency->sign,
+						'suffix' => $this->l('= 1 reward point.'),
+					),
+					array(
+						'type' => 'text',
+						'label' => $this->l('1 point ='),
+						'name' => 'point_value',
+						'prefix' => $currency->sign,
+						'suffix' => $this->l('for the discount.'),
+					),
+					array(
+						'type' => 'text',
+						'label' => $this->l('Voucher details'),
+						'name' => 'voucher_details',
+						'lang' => true,
+					),
+					array(
+						'type' => 'text',
+						'label' => $this->l('Minimum amount in which the voucher can be used'),
+						'name' => 'minimal',
+						'prefix' => $currency->sign,
+						'class' => 'fixed-width-sm',
+					),
+					array(
+						'type' => 'select',
+						'label' => $this->l('Points are awarded when the order is'),
+						'name' => 'id_order_state_validation',
+						'options' => array(
+							'query' => $order_states,
+							'id' => 'id_order_state',
+							'name' => 'name',
+						)
+					),
+					array(
+						'type' => 'select',
+						'label' => $this->l('Points are cancelled when the order is'),
+						'name' => 'id_order_state_cancel',
+						'options' => array(
+							'query' => $order_states,
+							'id' => 'id_order_state',
+							'name' => 'name',
+						)
+					),
+					array(
+						'type' => 'switch',
+						'label' => $this->l('Give points on discounted products'),
+						'name' => 'PS_LOYALTY_NONE_AWARD',
+						'values' => array(
+							array(
+								'id' => 'active_on',
+								'value' => 1,
+								'label' => $this->l('Enabled')
+							),
+							array(
+								'id' => 'active_off',
+								'value' => 0,
+								'label' => $this->l('Disabled')
+							)
+						)
+					),
+					array(
+						'type' => 'categories',
+						'label' => $this->l('Vouchers created by the loyalty system can be used in the following categories :'),
+						'name' => 'categoryBox',
+						'desc' => $this->l('Mark the box(es) of categories in which loyalty vouchers are usable.'),
+						'tree' => array(
+							'use_search' => false,
+							'id' => 'categoryBox',
+							'use_checkbox' => true,
+							'selected_categories' => $selected_categories,
+							),
+					//retro compat 1.5 for category tree
+					'values' => array(
+						'trads' => array(
+							 'Root' => $root_category,
+							 'selected' => $this->l('Selected'),
+							 'Collapse All' => $this->l('Collapse All'),
+							 'Expand All' => $this->l('Expand All'),
+							 'Check All' => $this->l('Check All'),
+							 'Uncheck All' => $this->l('Uncheck All')
+							),
+						'selected_cat' => $selected_categories,
+						'input_name' => 'categoryBox',
+						'use_radio' => false,
+						'use_search' => false,
+						'disabled_categories' => array(),
+						'top_category' => Category::getTopCategory(),
+						'use_context' => true,
+						)
+					),
+				),
+				'submit' => array(
+					'title' => $this->l('Save'),
+					'class' => 'btn btn-primary')
+			),
+		);
+		
+		
+					
+		
+		
+		$fields_form_2 = array(
+			'form' => array(
+				'legend' => array(
+					'title' => $this->l('Loyalty points progression'),
+					'icon' => 'icon-cogs'
+				),
+				'input' => array(
+					array(
+						'type' => 'text',
+						'label' => $this->l('Initial'),
+						'name' => 'default_loyalty_state',
+						'lang' => true,
+					),
+					array(
+						'type' => 'text',
+						'label' => $this->l('Unavailable'),
+						'name' => 'none_award_loyalty_state',
+						'lang' => true,
+					),
+					array(
+						'type' => 'text',
+						'label' => $this->l('Converted'),
+						'name' => 'convert_loyalty_state',
+						'lang' => true,
+					),
+					array(
+						'type' => 'text',
+						'label' => $this->l('Validation'),
+						'name' => 'validation_loyalty_state',
+						'lang' => true,
+					),
+					array(
+						'type' => 'text',
+						'label' => $this->l('Cancelled'),
+						'name' => 'cancel_loyalty_state',
+						'lang' => true,
+					),
+				),
+				'submit' => array(
+					'title' => $this->l('Save'),
+					'class' => 'btn btn-primary')
+			),
+		);
+		
+		$helper = new HelperForm();
+		$helper->show_toolbar = false;
+		$helper->table =  $this->table;
+		$lang = new Language((int)Configuration::get('PS_LANG_DEFAULT'));
+		$helper->default_form_language = $lang->id;
+		$helper->allow_employee_form_lang = Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') ? Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') : 0;
+		$helper->identifier = $this->identifier;
+		$helper->submit_action = 'submitLoyalty';
+		$helper->currentIndex = $this->context->link->getAdminLink('AdminModules', false).'&configure='.$this->name.'&tab_module='.$this->tab.'&module_name='.$this->name;
+		$helper->token = Tools::getAdminTokenLite('AdminModules');
+		$helper->tpl_vars = array(
+			'fields_value' => $this->getConfigFieldsValues(),
+			'languages' => $this->context->controller->getLanguages(),
+			'id_language' => $this->context->language->id
+		);
+		return $helper->generateForm(array($fields_form_1, $fields_form_2));
+	}
+	
+	public function getConfigFieldsValues()
+	{	
+		$fields_values = array(
+			'point_rate' => Tools::getValue('PS_LOYALTY_POINT_RATE', Configuration::get('PS_LOYALTY_POINT_RATE')),
+			'point_value' => Tools::getValue('PS_LOYALTY_POINT_VALUE', Configuration::get('PS_LOYALTY_POINT_VALUE')),
+			'PS_LOYALTY_NONE_AWARD' => Tools::getValue('PS_LOYALTY_NONE_AWARD', Configuration::get('PS_LOYALTY_NONE_AWARD')),
+			'minimal' => Tools::getValue('PS_LOYALTY_MINIMAL', Configuration::get('PS_LOYALTY_MINIMAL')),
+			'id_order_state_validation' => Tools::getValue('id_order_state_validation', $this->loyaltyStateValidation->id_order_state),
+			'id_order_state_cancel' => Tools::getValue('id_order_state_cancel', $this->loyaltyStateCancel->id_order_state),
+			
+		);
+	
+		$languages = Language::getLanguages(false);
+		
+		foreach ($languages as $lang)
+		{
+			$fields_values['voucher_details'][$lang['id_lang']] = Tools::getValue('voucher_details_'.(int)$lang['id_lang'], Configuration::get('PS_LOYALTY_VOUCHER_DETAILS', (int)$lang['id_lang']));
+			$fields_values['default_loyalty_state'][$lang['id_lang']] = Tools::getValue('default_loyalty_state_'.(int)$lang['id_lang'], $this->loyaltyStateDefault->name[(int)($lang['id_lang'])]);
+			$fields_values['validation_loyalty_state'][$lang['id_lang']] = Tools::getValue('validation_loyalty_state_'.(int)$lang['id_lang'], $this->loyaltyStateValidation->name[(int)($lang['id_lang'])]);
+			$fields_values['cancel_loyalty_state'][$lang['id_lang']] = Tools::getValue('cancel_loyalty_state_'.(int)$lang['id_lang'], $this->loyaltyStateCancel->name[(int)($lang['id_lang'])]);
+			$fields_values['convert_loyalty_state'][$lang['id_lang']] = Tools::getValue('convert_loyalty_state_'.(int)$lang['id_lang'], $this->loyaltyStateConvert->name[(int)($lang['id_lang'])]);
+			$fields_values['none_award_loyalty_state'][$lang['id_lang']] = Tools::getValue('none_award_loyalty_state_'.(int)$lang['id_lang'], $this->loyaltyStateNoneAward->name[(int)($lang['id_lang'])]);
+		}
+		return $fields_values;
+	}
 }
@@ -579,6 +579,7 @@ class MailAlerts extends Module
 				'input' => array(
 					array(
 						'type' => 'switch',
+						'is_bool' => true, //retro compat 1.5
 						'label' => $this->l('Product availability:'),
 						'name' => 'MA_CUSTOMER_QTY',
 						'desc' => $this->l('Gives the customer the option of receiving a notification for an available product if this one is out of stock.'),
@@ -613,6 +614,7 @@ class MailAlerts extends Module
 				'input' => array(
 					array(
 						'type' => 'switch',
+						'is_bool' => true, //retro compat 1.5
 						'label' => $this->l('New order:'),
 						'name' => 'MA_MERCHANT_ORDER',
 						'desc' => $this->l('Receive a notification when an order is placed'),
@@ -631,6 +633,7 @@ class MailAlerts extends Module
 					),
 					array(
 						'type' => 'switch',
+						'is_bool' => true, //retro compat 1.5
 						'label' => $this->l('Out of stock:'),
 						'name' => 'MA_MERCHANT_OOS',
 						'desc' => $this->l('Receive a notification if the available quantity of a product is below the following threshold'),
@@ -656,6 +659,7 @@ class MailAlerts extends Module
 					),
 					array(
 						'type' => 'switch',
+						'is_bool' => true, //retro compat 1.5
 						'label' => $this->l('Coverage warning:'),
 						'name' => 'MA_MERCHANT_COVERAGE',
 						'desc' => $this->l('Receive a notification when an order is placed'),
@@ -701,6 +705,7 @@ class MailAlerts extends Module
 		$helper->table =  $this->table;
 		$lang = new Language((int)Configuration::get('PS_LANG_DEFAULT'));
 		$helper->default_form_language = $lang->id;
+		$helper->module = $this;
 		$helper->allow_employee_form_lang = Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') ? Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') : 0;
 		$helper->identifier = $this->identifier;
 		$helper->submit_action = 'submitMailAlert';
@@ -0,0 +1,52 @@
+{*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2013 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+
+{extends file="helpers/form/form.tpl"}
+
+{block name="input"}
+    {if $input.type == 'switch'}
+		{foreach $input.values as $value}
+			<input type="radio" name="{$input.name}" id="{$value.id}" value="{$value.value|escape:'htmlall':'UTF-8'}"
+					{if $fields_value[$input.name] == $value.value}checked="checked"{/if}
+					{if isset($input.disabled) && $input.disabled}disabled="disabled"{/if} />
+			<label class="t" for="{$value.id}">
+			 {if isset($input.is_bool) && $input.is_bool == true}
+				{if $value.value == 1}
+					<img src="../img/admin/enabled.gif" alt="{$value.label}" title="{$value.label}" />
+				{else}
+					<img src="../img/admin/disabled.gif" alt="{$value.label}" title="{$value.label}" />
+				{/if}
+			 {else}
+				{$value.label}
+			 {/if}
+			</label>
+			{if isset($input.br) && $input.br}<br />{/if}
+			{if isset($value.p) && $value.p}<p>{$value.p}</p>{/if}
+		{/foreach}
+	{else}
+		{$smarty.block.parent}
+    {/if}
+
+{/block}
@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2013 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;
@@ -536,6 +536,7 @@ class ReferralProgram extends Module
 						'type' => 'radio',
 						'label' => $this->l('Voucher type :'),
 						'name' => 'discount_type',
+						'class' => 't',
 						'values' => array(
 							array(
 								'id' => 'discount_type1',
@@ -102,26 +102,30 @@
  top: -26px;
 }

+#tool_customization #color-box ul li.theme1{display:none}
+
+#tool_customization #color-box ul li{cursor:pointer}
+
 #tool_customization #color-box .theme1 .color1{border:13px solid #ffffff;}
 #tool_customization #color-box .theme1 .color2{background: #484848;}

 #tool_customization #color-box .theme2 .color1{border:13px solid #f6f6f6;}
 #tool_customization #color-box .theme2 .color2{background: #f2404e;}

-#tool_customization #color-box .theme3 .color1{border:13px solid #333333;}
-#tool_customization #color-box .theme3 .color2{background: #545454;}
+#tool_customization #color-box .theme3 .color1{border:13px solid #cbccbe;}
+#tool_customization #color-box .theme3 .color2{background: #584336;}

-#tool_customization #color-box .theme4 .color1{border:13px solid #272727;}
-#tool_customization #color-box .theme4 .color2{background: #eac22d;}
+#tool_customization #color-box .theme4 .color1{border:13px solid #fdfdfd;}
+#tool_customization #color-box .theme4 .color2{background: #eac12d;}

 #tool_customization #color-box .theme5 .color1{border:13px solid #ffffff;}
 #tool_customization #color-box .theme5 .color2{background: #729f42;}

-#tool_customization #color-box .theme6 .color1{border:13px solid #f5f1e8;}
-#tool_customization #color-box .theme6 .color2{background: #b04444;}
+#tool_customization #color-box .theme6 .color1{border:13px solid #f1f1f1;}
+#tool_customization #color-box .theme6 .color2{background: #317081;}

-#tool_customization #color-box .theme7 .color1{border:13px solid #f1f1f1;}
-#tool_customization #color-box .theme7 .color2{background: #317081;}
+#tool_customization #color-box .theme7 .color1{border:13px solid #f5f1e8;}
+#tool_customization #color-box .theme7 .color2{background: #b04444;}

 #tool_customization #color-box .theme8 .color1{border:13px solid #fcfcfc;}
 #tool_customization #color-box .theme8 .color2{background: #43bebc;}
@@ -0,0 +1,172 @@
+@import 'compass';
+@import 'bootstrap_lib/_variables';
+$header-background:#dadada;
+$color-style1:#f44051;
+$color1-style1:#333;
+$color2-style1:#b7b7b7;
+
+body{background:#282828}
+.header-container,
+.columns-container{background:#f6f6f6}
+
+  //-------- HEADER
+  #header {
+   background:none;	
+	.header-row {
+	  background:$header-background;	 	   
+	  .shop-phone{
+		  color:$color1-style1;
+		i,
+		strong{color:$color-style1} 
+		
+		  } 	
+	}
+	
+	 #currencies-block-top, 
+	 #languages-block-top,
+	 .header-row #header_user_info{
+	 border-color:#c6c6c6;  
+	 }
+  
+   #currencies-block-top div.current, 
+  #languages-block-top div.current,
+  .header-row #header_user_info a
+  {
+	 color:$color1-style1; 
+	  &:hover, &.active {
+		background:$color2-style1;
+		color:white
+		}
+
+ }
+    #currencies-block-top div.current, 
+  #languages-block-top div.current{
+	 strong{color:$color1-style1;} 
+	  }
+	   
+  #currencies-block-top div.current, 
+ #languages-block-top div.current
+   {&:hover,
+    &.active {
+	  strong,
+	  &:after
+	   {
+	    background:$color2-style1;
+		color:white}
+       }
+	 }
+	
+	#contact-link{ 
+	   border-color:#c6c6c6;
+	   a{color:$color1-style1;
+		  &:hover, &.active {
+			background:$color2-style1;
+			color:white
+			}
+		}	
+	}	
+	
+}
+
+
+	#search_block_top .btn.button-search{background:$color-style1;
+	   &:hover{color:white;
+    	background:$color1-style1}
+	}
+
+     #header_right #header_user #shopping_cart a{
+		background:$color-style1; 
+		color:white;
+		 &:after{color:white}
+		&:hover{color:white;
+    	background:$color1-style1}		 
+	 }
+	 
+    .sf-menu{
+		background:white;
+		border-bottom:3px solid #e8e8e8;
+		>li{
+			border-right:1px solid #e8e8e8;
+			>a{border-bottom: 3px solid #e8e8e8;}
+		&.sfHover > a, > a:hover, &.sfHoverForce > a 
+		{color:#fff;background:$color-style1;
+		border-bottom-color:#ce2434;}
+		}
+	} 
+	
+	
+
+//-------- columns-container
+
+     #home-page-tabs{
+		background:#f6f6f6;
+		  > li.active a, 
+		  > li a:hover{
+			background:$color-style1;
+			color:white 
+			 }
+		 
+	 }
+	 
+
+	.new,
+	.sale
+	{background:$color-style1;
+		&:before,
+		&:after{
+				border-color: #ad2b34  transparent   transparent transparent ;			
+			}	
+	}
+
+
+   ul.product_list.grid > li .product-container{
+	background:#f6f6f6;
+   .product-image-container{
+	background:white;
+   .product_img_link{background:#fbfbfb;
+     img{background:#fbfbfb;}
+   }   
+   }
+   }
+  
+
+
+  .button.lnk_view {
+	text-shadow:none;
+	padding:0;
+	border:none;
+		span {
+			border:none;		
+			padding:12px 16px;
+		   background:$color1-style1;
+		   color:white;	
+		}
+		
+	&:hover {
+		span {
+			background:$color-style1;
+			}	
+	}
+  }
+
+
+  #cmsinfo_block em{background:$color-style1;}
+  #facebook_block, #cmsinfo_block{background:#e8e8e8}
+  #cmsinfo_block,
+   #cmsinfo_block > div + div{border-color:#d0d0d0;}  
+   
+   .footer-container #footer #social_block  { background:#1b1b1b;padding-bottom:15px;}  
+  .footer-container {	
+  background:#1b1b1b;
+																		@media (min-width: $screen-sm) { // min 768px
+																			background:url(../img/footer-bg1.gif) repeat-x;
+																		}
+}
+	 #footer #newsletter_block_left .form-group{ 
+	.form-control{background:#1b1b1b;}
+	 .button-small {color:$color-style1;} 
+	}
+	
+ .footer-container #footer #social_block ul li a:hover{color:$color-style1;}	
+	
+	
@@ -0,0 +1,233 @@
+@import 'compass';
+@import 'bootstrap_lib/_variables';
+
+$header-background:     #545454;
+$color-style1:          #584336;
+$color1-style1:         #878872;
+$color2-style1:         #b7b7b7;
+$color3-style1:         #333;
+$color4-style1:         #e4dfb9;
+$base-border-color:		#d6d4d4;
+
+body{background:#3c281c}
+.header-container,
+.columns-container{background:url(../img/bg-theme2.jpg) repeat 50% 0}
+
+  //-------- HEADER
+  #header {
+   background:none;	
+	.header-row {
+	  background:$header-background;	 	   
+	  .shop-phone{
+		  color:#fff;
+		  text-shadow:0 1px #404040;
+		i,
+		strong{color:#aaa} 	
+		  } 		  	
+	}
+		
+     #currencies-block-top, 
+	 #languages-block-top,
+	 .header-row #header_user_info{
+	 border-color:#656565;  
+	 }  
+  
+   #currencies-block-top div.current, 
+  #languages-block-top div.current,
+  .header-row #header_user_info a
+  {
+	 color:#fff; 
+	  &:hover, &.active {
+		background:$color1-style1;
+		color:white
+		}
+
+ }
+    #currencies-block-top div.current, 
+  #languages-block-top div.current{
+	 strong{color:#fff} 
+	  }
+	   
+ #currencies-block-top div.current, 
+ #languages-block-top div.current
+   {&:hover,
+    &.active {
+	    background:$color1-style1;
+		color:white}
+   
+	 }
+	
+ #header #currencies-block-top ul li.selected,
+ #header #currencies-block-top ul li:hover a,
+ #header #languages-block-top ul li.selected,
+ #header #languages-block-top ul li:hover a{
+	background:$color2-style1	
+	}	
+		
+	#contact-link{ 
+	   border-color:#656565;
+	   a{color:#fff;
+		  &:hover, &.active {
+			background:$color1-style1;
+			color:white
+			}
+		}	
+	}		
+}
+
+    #header #currencies-block-top div.current:after,
+    #header #languages-block-top div.current:after{color:#fff}
+
+	  #search_block_top{
+		  .btn.button-search{
+			background:$color-style1;		 
+		   &:hover{color:white;
+			background:$color3-style1;
+			}
+		}
+	
+	 #search_query_top{
+		border-color:$base-border-color;
+		background:rgba(248,248 ,248,0.63);
+		color:#686666;}
+	}
+
+
+
+     #header_right #header_user #shopping_cart a{
+		background:$color1-style1; 
+		color:white;	
+		    &:after{color:white}
+			&:hover{color:white;
+			text-shadow:0 1px #333;
+			background:$color3-style1}		 
+	 }
+	 
+    .sf-menu{
+		background:#cbccbe;
+		border-bottom:3px solid #c1c2b4;
+		>li{
+			border-right:1px solid #d8d9ce;
+			>a{border-bottom: 3px solid #c1c2b4;color:#515150}
+		&.sfHover > a, > a:hover, &.sfHoverForce > a 
+		{color:#fff;background:$color-style1;
+		border-bottom-color:#584336;}
+		}
+	} 
+	
+
+//-------- columns-container
+
+
+ul.product_list.grid > li .product-container .product-image-container{border-color:$base-border-color}
+
+
+     #home-page-tabs{
+		background:none;
+		>li{border-color:$base-border-color}
+		  > li.active a, 
+		  > li a:hover{
+			background:$color-style1;
+			color:white 
+			 }
+		  }	 
+
+	.new,
+	.sale
+	{background:$color-style1;
+		&:before,
+		&:after{
+				border-color: $color-style1  transparent   transparent transparent ;			
+			}	
+	}
+
+   ul.product_list.grid > li .product-container{
+  	background:none;
+    .product-image-container{
+  	   background:white;
+       .product_img_link{
+        background:#f1e8e3;
+        img{
+          background:#f1e8e3;
+        }
+       }   
+     }
+   }
+  
+  .button.lnk_view {
+	text-shadow:none;
+	padding:0;
+	border:none;
+		span {
+			border:1px solid #9a9a9a;		
+			padding:12px 16px;
+		   background:#f2f2f2;
+		   color:white;	
+		}
+		
+	&:hover {
+		span {
+			background:$color2-style1;
+			}	
+	}
+  }
+  
+    .product-name{color:$color1-style1}  
+  
+    .button.ajax_add_to_cart_button{background:$color-style1}
+	.price-percent-reduction{background:$color-style1;border-color:$color-style1}
+	.price,
+	.price.product-price{color:$color-style1}
+	.old-price{color:#b1b0b0}
+	
+	ul.product_list.grid > li .product-container:hover{background:#fff;
+     @include box-shadow( 0 5px 13px rgba(0,0,0,0.17));
+	}
+	
+	.button.lnk_view span{color:#fff;background:$color1-style1;border-color:$color1-style1}
+	.button.lnk_view:hover span{color:#fff;background:$color-style1;border-color:$color-style1} 
+
+   #cmsinfo_block em{background:$color-style1;text-shadow:0 1px #4e3c30;}
+   #facebook_block, #cmsinfo_block{background:#adae9d}
+   #cmsinfo_block,
+   #cmsinfo_block > div + div{border-color:#c6c7bb;}     
+   
+   .footer-container #footer #social_block  { background:none;padding-bottom:15px;}  
+  .footer-container {	
+  background:#584336;
+																		@media (min-width: $screen-sm) { // min 768px
+																			background:url(../img/footer-bg2.gif) repeat-x;
+																		}
+}
+
+  #facebook_block h4, #cmsinfo_block h4,
+   #cmsinfo_block h3,
+   #cmsinfo_block p strong{color:#fff;}
+   #facebook_block p, #cmsinfo_block p{
+   color:#e7e7e2;}
+
+
+ #footer #newsletter_block_left .form-group{ 
+	.form-control{background:#534034;color:#fff;border-color:#79695e}
+	 .button-small {color:#fff;
+	 text-shadow:0 1px #47362c;
+	 &:hover{color:$color4-style1}
+	 } 
+	}
+  #footer #newsletter_block_left h4	{text-shadow:0 1px #47362c;}
+	
+ .footer-container #footer #social_block ul li a {
+	 color:#fff;text-shadow:0 1px #47362c;
+	 &:hover{color:$color4-style1;}	}
+	
+.footer-container #footer a{color:#fff;
+	&:hover{color:$color4-style1;}
+	}	
+	
+.footer-container #footer #block_contact_infos > div ul li{color:#fff}	
+	
+	.footer-container #footer .bottom-footer div{color:#fff}
+	.footer-container #footer #block_contact_infos,
+	.footer-container #footer .bottom-footer div{
+	border-color:#503e33;	
+		}
@@ -0,0 +1,236 @@
+@import 'compass';
+@import 'bootstrap_lib/_variables';
+
+$header-background:     #545454;
+$color-style1:          #eac12d;
+$color1-style1:         #fff;
+$color2-style1:         #b7b7b7;
+$color3-style1:         #333;
+$color4-style1:         #e4dfb9;
+$base-border-color:		#dfd8ca;
+$color-shadow:          0 1px #8b3637;
+
+body{background:#1b1b1b}
+.header-container,
+.columns-container{background:url(../img/bg-theme3.jpg) repeat 50% 0}
+
+  //-------- HEADER
+  #header {
+   background:none;	
+	.header-row {
+	  background:$header-background;	 	   
+	  .shop-phone{
+		  color:#fff;
+		  text-shadow:0 1px #404040;
+		i,
+		strong{color:$color-style1} 	
+		  } 		  	
+	}
+		
+     #currencies-block-top, 
+	 #languages-block-top,
+	 .header-row #header_user_info{
+	 border-color:#656565;  
+	 }  
+  
+   #currencies-block-top div.current, 
+  #languages-block-top div.current,
+  .header-row #header_user_info a
+  {
+	 color:$color1-style1; 
+	  &:hover, &.active {
+		background:$color-style1;
+		color:white
+		}
+
+ }
+    #currencies-block-top div.current, 
+  #languages-block-top div.current{
+	 strong{color:$color-style1;} 
+	  }
+	   
+ #currencies-block-top div.current, 
+ #languages-block-top div.current
+   {&:hover,
+    &.active {
+	    background:$color3-style1;
+		color:white;
+		strong{color:#fff;}
+		}
+		
+   
+	 }
+	
+ #header #currencies-block-top ul li.selected,
+ #header #currencies-block-top ul li:hover a,
+ #header #languages-block-top ul li.selected,
+ #header #languages-block-top ul li:hover a{
+	background:$color-style1	
+	}	
+		
+	#contact-link{ 
+	   border-color:#656565;
+	   a{color:$color1-style1;
+		  &:hover, &.active {
+			background:$color3-style1;
+			color:white
+			}
+		}	
+	}		
+}
+
+    #header #currencies-block-top div.current:after,
+    #header #languages-block-top div.current:after{color:#fff}
+
+
+
+	  #search_block_top{
+		   .btn.button-search{
+			background:$color-style1;		 
+		   &:hover{color:white;
+			background:$color3-style1;
+			}
+		}
+	
+	 #search_query_top{
+		border-color:$base-border-color;
+		background:#fff;
+		color:#686666;}
+	}
+
+
+
+     #header_right #header_user #shopping_cart a{
+		background:$color-style1; 
+		color:white;		
+		 &:after{color:white}
+		&:hover{color:white;		
+    	background:#333}		 
+	 }
+	 
+    .sf-menu{
+		background:#404040;
+		border-bottom:3px solid #404040;
+		>li{
+			border-right:1px solid #565656;
+			>a{border-bottom: 3px solid #404040;color:#fff}
+		&.sfHover > a, > a:hover, &.sfHoverForce > a 
+		{color:#fff;background:$color-style1;
+		border-bottom-color:$color-style1;}
+		}
+	} 
+	
+
+//-------- columns-container
+
+
+ul.product_list.grid > li .product-container .product-image-container{border-color:$base-border-color}
+
+
+     #home-page-tabs{
+		background:none;
+		>li{border-color:$base-border-color}
+		  > li.active a, 
+		  > li a:hover{
+			background:$color-style1;
+			color:white 
+			 }
+		  }	 
+
+	.new,
+	.sale
+	{background:$color-style1;
+		&:before,
+		&:after{
+				border-color: $color-style1  transparent   transparent transparent ;			
+			}	
+	}
+
+   ul.product_list.grid > li .product-container{
+  	background:none;
+    .product-image-container{
+  	   background:white;
+       .product_img_link{
+        background:#f1e8e3;
+        img{
+          background:#f1e8e3;
+        }
+       }   
+     }
+   }
+  
+  .button.lnk_view {
+	text-shadow:none;
+	padding:0;
+	border:none;
+		span {
+			border:1px solid #9a9a9a;		
+			padding:12px 16px;
+		   background:#f2f2f2;
+		   color:white;	
+		}
+		
+	&:hover {
+		span {
+			background:$color2-style1;
+			}	
+	}
+  }
+  
+    .button.ajax_add_to_cart_button{background:$color-style1}
+	.price-percent-reduction{background:$color-style1;border-color:$color-style1}
+	.price,
+	.price.product-price{color:$color-style1}
+	.old-price{color:#b1b0b0}
+
+	
+	ul.product_list.grid > li .product-container:hover{background:#fff;
+   @include box-shadow( 0 5px 13px rgba(0,0,0,0.17));
+	}
+	
+	.button.lnk_view span{color:$color3-style1}
+	.button.lnk_view:hover span{color:#fff} 
+	
+	
+//-------- footer	
+
+  #cmsinfo_block em{background:$color-style1;text-shadow:0 1px #b29322}
+  #facebook_block, #cmsinfo_block{background:#e2e2e2}
+  #cmsinfo_block,
+   #cmsinfo_block > div + div{border-color:#d6d6d6;}  
+   
+  .footer-container #footer #block_contact_infos > div ul li{color:#777;} 
+  .footer-container #footer #block_contact_infos > div ul li i{color:#908f8f}
+   
+   
+   #facebook_block h4, #cmsinfo_block h4,
+   #cmsinfo_block h3{color:#191919;}
+   #facebook_block p, #cmsinfo_block p{color:#757575;}
+   
+  .footer-container #footer #social_block  {
+   background:none;
+   padding-bottom:15px;}  
+  .footer-container {	
+  background:#191919;
+																		@media (min-width: $screen-sm) { // min 768px
+																			background:url(../img/footer-bg3.gif) repeat-x;
+																		}
+}
+
+.footer-container #footer a{color:#777777}
+.footer-container #footer #block_contact_infos,
+.footer-container #footer .bottom-footer div{border-color:#515151}
+
+ #footer #newsletter_block_left .form-group{ 
+	.form-control{
+	 background:none;border-color:#515151}
+	 .button-small {color:#908f8f;
+	 &:hover{color:$color-style1}
+	 } 
+}
+.footer-container #footer #social_block ul li a{
+	color:#908f8f;
+	&:hover{color:$color-style1;}
+	}
+	
+	
@@ -0,0 +1,238 @@
+@import 'compass';
+@import 'bootstrap_lib/_variables';
+
+$header-background:     #181212;
+$color-style1:          #b04445;
+$color1-style1:         #fff;
+$color2-style1:         #b7b7b7;
+$color3-style1:         #333;
+$color4-style1:         #e4dfb9;
+$base-border-color:		#dfd8ca;
+$color-shadow:          0 1px #8b3637;
+
+body{background:#181212}
+.header-container,
+.columns-container{background:url(../img/bg-theme5.jpg) repeat 50% 0}
+
+  //-------- HEADER
+  #header {
+   background:none;	
+	.header-row {
+	  background:$header-background;	 	   
+	  .shop-phone{
+		  color:#777;
+		i,
+		strong{color:#fff} 	
+		  } 		  	
+	}
+		
+     #currencies-block-top, 
+	 #languages-block-top,
+	 .header-row #header_user_info{
+	 border-color:#515151;  
+	 }  
+  
+   #currencies-block-top div.current, 
+  #languages-block-top div.current,
+  .header-row #header_user_info a
+  {
+	 color:$color1-style1; 
+	  &:hover, &.active {
+		background:$color-style1;
+		color:white
+		}
+
+ }
+    #currencies-block-top div.current, 
+  #languages-block-top div.current{
+	 strong{color:$color-style1;} 
+	  }
+	   
+ #currencies-block-top div.current, 
+ #languages-block-top div.current
+   {&:hover,
+    &.active {
+	    background:$color-style1;
+		color:white;
+		strong{color:#fff;}
+		}
+		
+   
+	 }
+	
+ #header #currencies-block-top ul li.selected,
+ #header #currencies-block-top ul li:hover a,
+ #header #languages-block-top ul li.selected,
+ #header #languages-block-top ul li:hover a{
+	background:$color-style1	
+	}	
+		
+	#contact-link{ 
+	   border-color:#515151;
+	   a{color:$color1-style1;
+		  &:hover, &.active {
+			background:$color-style1;
+			color:white
+			}
+		}	
+	}		
+}
+
+    #header #currencies-block-top div.current:after,
+    #header #languages-block-top div.current:after{color:#fff}
+
+
+
+	  #search_block_top{
+		   .btn.button-search{
+			background:$color-style1;
+		    text-shadow:$color-shadow;
+		   &:hover{color:white;
+			background:$color3-style1;
+			text-shadow:0 1px #333;}
+		}
+	
+	 #search_query_top{
+		border-color:$base-border-color;
+		background:rgba(248,248 ,248,0.63);
+		color:#686666;}
+	}
+
+
+
+     #header_right #header_user #shopping_cart a{
+		background:$color-style1; 
+		color:white;
+		text-shadow:$color-shadow;
+		 &:after{color:white}
+		&:hover{color:white;
+		text-shadow:0 1px #333;
+    	background:$color3-style1}		 
+	 }
+	 
+    .sf-menu{
+		background:#faf8f4;
+		border-bottom:3px solid #dfd8ca;
+		>li{
+			border-right:1px solid #dfd8ca;
+			>a{border-bottom: 3px solid #dfd8ca;}
+		&.sfHover > a, > a:hover, &.sfHoverForce > a 
+		{color:#fff;background:$color-style1;
+		border-bottom-color:#983334;}
+		}
+	} 
+	
+
+//-------- columns-container
+
+
+ul.product_list.grid > li .product-container .product-image-container{border-color:$base-border-color}
+
+
+     #home-page-tabs{
+		background:none;
+		>li{border-color:$base-border-color}
+		  > li.active a, 
+		  > li a:hover{
+			background:$color-style1;
+			color:white 
+			 }
+		  }	 
+
+	.new,
+	.sale
+	{background:$color-style1;
+		&:before,
+		&:after{
+				border-color: $color-style1  transparent   transparent transparent ;			
+			}	
+	}
+
+   ul.product_list.grid > li .product-container{
+  	background:none;
+    .product-image-container{
+  	   background:white;
+       .product_img_link{
+        background:#f1e8e3;
+        img{
+          background:#f1e8e3;
+        }
+       }   
+     }
+   }
+  
+  .button.lnk_view {
+	text-shadow:none;
+	padding:0;
+	border:none;
+		span {
+			border:1px solid #9a9a9a;		
+			padding:12px 16px;
+		   background:#f2f2f2;
+		   color:white;	
+		}
+		
+	&:hover {
+		span {
+			background:$color2-style1;
+			}	
+	}
+  }
+  
+    .button.ajax_add_to_cart_button{background:$color-style1}
+	.price-percent-reduction{background:$color-style1;border-color:$color-style1}
+	.price,
+	.price.product-price{color:$color-style1}
+	.old-price{color:#b1b0b0}
+
+	
+	ul.product_list.grid > li .product-container:hover{background:#fff;
+   @include box-shadow( 0 5px 13px rgba(0,0,0,0.17));
+	}
+	
+	.button.lnk_view span{color:$color3-style1}
+	.button.lnk_view:hover span{color:#fff} 
+	
+	
+//-------- footer	
+
+  #cmsinfo_block em{background:$color-style1;text-shadow:$color-shadow}
+  #facebook_block, #cmsinfo_block{background:#e5ded1}
+  #cmsinfo_block,
+   #cmsinfo_block > div + div{border-color:#cec7bc;}  
+   
+  .footer-container #footer #block_contact_infos > div ul li{color:#b5a78d;} 
+  .footer-container #footer #block_contact_infos > div ul li i{color:$color-style1}
+   
+   
+   #facebook_block h4, #cmsinfo_block h4,
+   #cmsinfo_block h3{color:#181212;}
+   #facebook_block p, #cmsinfo_block p{color:#3d211f;}
+   
+  .footer-container #footer #social_block  {
+   background:none;
+   padding-bottom:15px;}  
+  .footer-container {	
+  background:#1f1818;
+																		@media (min-width: $screen-sm) { // min 768px
+																			background:url(../img/footer-bg5.gif) repeat-x;
+																		}
+}
+
+.footer-container #footer a{color:#b5a78d}
+.footer-container #footer #block_contact_infos,
+.footer-container #footer .bottom-footer div{border-color:#2e2828}
+
+
+ #footer #newsletter_block_left .form-group{ 
+	.form-control{background:#1f1919;border-color:#89837f}
+	 .button-small {color:#fff;
+	 &:hover{color:$color-style1}
+	 } 
+	}
+.footer-container #footer #social_block ul li a{
+	color:#f3eee6;
+	&:hover{color:$color-style1;}
+	}
+	
+	
@@ -0,0 +1,200 @@
+@import 'compass';
+@import 'bootstrap_lib/_variables';
+$color-style1:#719f41;
+$color1-style1:#333;
+$color2-style1:#b7b7b7;
+
+body{background:$color1-style1}
+.header-container,
+.columns-container{background:white}
+
+$color-shadow:          0 1px #567931;
+
+  //-------- HEADER
+  #header {
+   background:none;	
+	.header-row {
+	  background:$color1-style1;	 	   
+	  .shop-phone{
+		  color:#777;
+		i,
+		strong{color:$color-style1} 
+		
+		  } 	
+	}
+	
+	 #currencies-block-top, 
+	 #languages-block-top,
+	 .header-row #header_user_info{
+	 border-color:#515151;  
+	 }
+  
+   #currencies-block-top div.current, 
+  #languages-block-top div.current,
+  .header-row #header_user_info a
+  {
+	 color:white; 
+	  &:hover, &.active {
+		background:#2b2b2b;
+		color:white
+		}
+
+ }
+    #currencies-block-top div.current, 
+  #languages-block-top div.current{
+	 strong{color:$color-style1;} 
+	  }
+	   
+	   
+  #currencies-block-top div.current, 
+ #languages-block-top div.current{
+	  &:after {color:white} 
+	 
+	 }	   
+	   
+  #currencies-block-top div.current, 
+ #languages-block-top div.current
+   {&:hover,
+    &.active {
+	  strong,
+	  &:after
+	   {
+	  	color:white}
+       }
+	 }
+	
+	#contact-link{ 
+	   border-color:#515151;
+	   a{color:white;
+		  &:hover, &.active {
+			background:#2b2b2b;
+			color:white
+			}
+		}	
+	}	
+	
+}
+
+
+	#search_block_top .btn.button-search{
+	background:$color-style1;
+	text-shadow:$color-shadow;
+	   &:hover{color:white;
+    	background:$color1-style1;
+		text-shadow:0 1px  #333;}
+	}
+	
+	#search_block_top #search_query_top{color:#686666}
+	
+
+     #header_right #header_user #shopping_cart a{
+		background:$color-style1; 
+		color:white;
+		text-shadow:$color-shadow;
+		 &:after{color:white}
+		&:hover{color:white;
+		text-shadow:0 1px  #333;
+    	background:$color1-style1}		 
+	 }
+	 
+    .sf-menu{
+		background:#f6f6f6;
+		border-bottom:3px solid #e9e9e9;
+		>li{
+			border-right:1px solid #d6d4d4;
+			>a{border-bottom: 3px solid #e9e9e9;}
+		&.sfHover > a, > a:hover, &.sfHoverForce > a 
+		{color:#fff;background:$color-style1;
+		border-bottom-color:#598b24;}
+		}
+	} 
+	
+	
+
+//-------- columns-container
+
+     #home-page-tabs{
+		background:white;
+		  > li.active a, 
+		  > li a:hover{
+			background:$color-style1;
+			color:white 
+			 }
+		 
+	 }
+	 
+
+	.new,
+	.sale
+	{background:$color-style1;
+		&:before,
+		&:after{
+				border-color: #719f41  transparent   transparent transparent ;			
+			}	
+	}
+
+
+   ul.product_list.grid > li .product-container{
+	background:white;
+   .product-image-container{
+	background:white;
+   .product_img_link{background:white;
+     img{background:white;}
+   }   
+   }
+   }
+  
+.price.product-price{color:$color-style1;}
+.price-percent-reduction{background:$color-style1;border-color:$color-style1}
+  .button.lnk_view {
+	text-shadow:none;
+	padding:0;
+	border:none;
+		span {
+			border:none;		
+			padding:12px 16px;
+		   background:$color1-style1;
+		   color:white;	
+		}
+		
+	&:hover {
+		span {
+			background:$color-style1;
+			}	
+	}
+  }
+
+
+  #cmsinfo_block em{background:$color-style1;
+  text-shadow:$color-shadow;
+  }
+  #facebook_block, #cmsinfo_block{background:#e8e8e8}
+  #cmsinfo_block,
+   #cmsinfo_block > div + div{border-color:#d0d0d0;}  
+   
+   .footer-container #footer #social_block  { background:#3f3f3f;padding-bottom:15px;}  
+  .footer-container {	
+  background:#3f3f3f;
+																		@media (min-width: $screen-sm) { // min 768px
+																			background:url(../img/footer-bg.gif) repeat-x;
+																		}
+}
+    .footer-container #footer #social_block ul li a:hover{color:$color-style1;}
+     
+	 #footer #newsletter_block_left .form-group{ 
+	.form-control{background:#3f3f3f;}
+	
+	}
+	
+	#footer #newsletter_block_left h4,
+	.footer-container #footer #social_block h4{color:#fff}
+	
+	.footer-container #footer h4,
+	.footer-container #footer h4 a{color:$color-style1;}
+	.footer-container #footer .bottom-footer{color:$color-style1;
+	a{color:$color-style1;
+	&:hover{color:#fff}
+	}
+	}
+		
+	
@@ -0,0 +1,215 @@
+@import 'compass';
+@import 'bootstrap_lib/_variables';
+
+$header-background:     #333;
+$color-style1:          #327082;
+$color1-style1:         #fff;
+$color2-style1:         #b7b7b7;
+$color3-style1:         #333;
+$color4-style1:         #e4dfb9;
+$base-border-color:		#d6d4d4;
+$color-shadow:          0 1px #265563;
+
+body{background:#282828}
+.header-container,
+.columns-container{background:url(../img/bg-theme6.jpg) repeat 50% 0}
+
+  //-------- HEADER
+  #header {
+   background:none;	
+	.header-row {
+	  background:$header-background;	 	   
+	  .shop-phone{
+		  color:#777;
+		i,
+		strong{color:#fff} 	
+		  } 		  	
+	}
+		
+     #currencies-block-top, 
+	 #languages-block-top,
+	 .header-row #header_user_info{
+	 border-color:#515151;  
+	 }  
+  
+   #currencies-block-top div.current, 
+  #languages-block-top div.current,
+  .header-row #header_user_info a
+  {
+	 color:$color1-style1; 
+	  &:hover, &.active {
+		background:$color-style1;
+		color:white
+		}
+
+ }
+    #currencies-block-top div.current, 
+  #languages-block-top div.current{
+	 strong{color:$color4-style1;} 
+	  }
+	   
+ #currencies-block-top div.current, 
+ #languages-block-top div.current
+   {&:hover,
+    &.active {
+	    background:$color-style1;
+		color:white}
+   
+	 }
+	
+ #header #currencies-block-top ul li.selected,
+ #header #currencies-block-top ul li:hover a,
+ #header #languages-block-top ul li.selected,
+ #header #languages-block-top ul li:hover a{
+	background:$color-style1	
+	}	
+		
+	#contact-link{ 
+	   border-color:#515151;
+	   a{color:$color1-style1;
+		  &:hover, &.active {
+			background:$color-style1;
+			color:white
+			}
+		}	
+	}		
+}
+
+    #header #currencies-block-top div.current:after,
+    #header #languages-block-top div.current:after{color:#fff}
+
+	  #search_block_top{
+		  .btn.button-search{
+			background:$color-style1;
+		    text-shadow:$color-shadow;
+		   &:hover{color:white;
+			background:$color3-style1;
+			text-shadow:0 1px #333;}
+		}
+	
+	 #search_query_top{
+		border-color:$base-border-color;
+		background:rgba(248,248 ,248,0.63);
+		color:#686666;}
+	}
+
+
+
+     #header_right #header_user #shopping_cart a{
+		background:$color-style1; 
+		color:white;
+		 text-shadow:$color-shadow;
+		     &:after{color:white}
+			&:hover{color:white;
+			text-shadow:0 1px #333;
+			background:$color3-style1}		 
+	 }
+	 
+    .sf-menu{
+		background:#f6f6f6;
+		border-bottom:3px solid #e9e9e9;
+		>li{
+			border-right:1px solid #d6d4d4;
+			>a{border-bottom: 3px solid #e9e9e9;}
+		&.sfHover > a, > a:hover, &.sfHoverForce > a 
+		{color:#fff;background:$color-style1;
+		border-bottom-color:#1f6276;}
+		}
+	} 
+	
+
+//-------- columns-container
+
+
+ul.product_list.grid > li .product-container .product-image-container{border-color:$base-border-color}
+
+
+     #home-page-tabs{
+		background:none;
+		>li{border-color:$base-border-color}
+		  > li.active a, 
+		  > li a:hover{
+			background:$color-style1;
+			color:white 
+			 }
+		  }	 
+
+	.new,
+	.sale
+	{background:$color-style1;
+		&:before,
+		&:after{
+				border-color: $color-style1  transparent   transparent transparent ;			
+			}	
+	}
+
+   ul.product_list.grid > li .product-container{
+  	background:none;
+    .product-image-container{
+  	   background:white;
+       .product_img_link{
+        background:#f1e8e3;
+        img{
+          background:#f1e8e3;
+        }
+       }   
+     }
+   }
+  
+  .button.lnk_view {
+	text-shadow:none;
+	padding:0;
+	border:none;
+		span {
+			border:1px solid #9a9a9a;		
+			padding:12px 16px;
+		   background:#f2f2f2;
+		   color:white;	
+		}
+		
+	&:hover {
+		span {
+			background:$color2-style1;
+			}	
+	}
+  }
+  
+    .button.ajax_add_to_cart_button{background:$color-style1}
+	.price-percent-reduction{background:$color-style1;border-color:$color-style1}
+	.price,
+	.price.product-price{color:$color-style1}
+	.old-price{color:#b1b0b0}
+
+	
+	ul.product_list.grid > li .product-container:hover{background:#fff;
+   @include box-shadow( 0 5px 13px rgba(0,0,0,0.17));
+	}
+	
+	.button.lnk_view span{color:$color3-style1}
+	.button.lnk_view:hover span{color:#fff} 
+
+  #cmsinfo_block em{background:$color-style1;text-shadow:$color-shadow}
+  #facebook_block, #cmsinfo_block{background:rgba(230,230,230,0.5)}
+  #cmsinfo_block,
+   #cmsinfo_block > div + div{border-color:#d8d8d8;}  
+   
+   
+   
+   
+   .footer-container #footer #social_block  { background:none;padding-bottom:15px;}  
+  .footer-container {	
+  background:#3f3f3f;
+																		@media (min-width: $screen-sm) { // min 768px
+																			background:url(../img/footer-bg.gif) repeat-x;
+																		}
+}
+ #footer #newsletter_block_left .form-group{ 
+	.form-control{background:#3c3c3c;}
+	 .button-small {color:#fff;
+	 &:hover{color:$color4-style1}
+	 } 
+	}
+	
+ .footer-container #footer #social_block ul li a:hover{color:$color4-style1;}	
+	
+	
@@ -0,0 +1,221 @@
+@import 'compass';
+@import 'bootstrap_lib/_variables';
+
+$header-background:     #333;
+$color-style1:          #43bebd;
+$color1-style1:         #fff;
+$color2-style1:         #b7b7b7;
+$color3-style1:         #333;
+$base-border-color:		#d6d4d4;
+$color-shadow:          0 1px #379c9c;
+
+body{background:#282828}
+.header-container,
+.columns-container{background:url(../img/bg-theme7.jpg) repeat 50% 0}
+
+  //-------- HEADER
+  #header {
+   background:none;	
+	.header-row {
+	  background:$header-background;	 	   
+	  .shop-phone{
+		  color:#777;
+		i,
+		strong{color:#fff} 	
+		  } 
+		  	
+	}
+		
+     #currencies-block-top, 
+	 #languages-block-top,
+	 .header-row #header_user_info{
+	 border-color:#515151;  
+	 }
+  
+  
+   #currencies-block-top div.current, 
+  #languages-block-top div.current,
+  .header-row #header_user_info a
+  {
+	 color:$color1-style1; 
+	  &:hover, &.active {
+		background:#2b2b2b;
+		color:white
+		}
+
+ }
+    #currencies-block-top div.current, 
+  #languages-block-top div.current{
+	 strong{color:$color-style1;} 
+	  }
+	   
+  #currencies-block-top div.current, 
+ #languages-block-top div.current
+   {&:hover,
+    &.active {
+	    background:#2b2b2b;
+		color:white}
+   
+	 }
+	
+ #header #currencies-block-top ul li.selected,
+ #header #currencies-block-top ul li:hover a,
+ #header #languages-block-top ul li.selected,
+ #header #languages-block-top ul li:hover a{
+	background:$color-style1
+	
+	}
+	
+	
+	
+	#contact-link{ 
+	   border-color:#515151;
+	   a{color:$color1-style1;
+		  &:hover, &.active {
+			background:#2b2b2b;
+			color:white
+			}
+		}	
+	}		
+}
+
+  #header #currencies-block-top div.current:after,
+  #header #languages-block-top div.current:after{color:#fff}
+
+
+
+	#search_block_top{
+		   .btn.button-search{
+			background:$color-style1;
+		    text-shadow:$color-shadow;
+		   &:hover{color:white;
+			background:$color3-style1;
+			text-shadow:0 1px #333;}
+		}
+	
+		 #search_query_top{
+		border-color:$base-border-color;
+		background:rgba(248,248 ,248,0.63);
+		color:#686666;}
+	}
+
+
+
+     #header_right #header_user #shopping_cart a{
+		background:$color-style1; 
+		color:white;
+		text-shadow:$color-shadow;
+		 &:after{color:white}
+		&:hover{color:white;
+		text-shadow:0 1px #333;
+    	background:$color3-style1}		 
+	 }
+	 
+    .sf-menu{
+		background:#f6f6f6;
+		border-bottom:3px solid #e9e9e9;
+		>li{
+			border-right:1px solid #d6d4d4;
+			>a{border-bottom: 3px solid #e9e9e9;}
+		&.sfHover > a, > a:hover, &.sfHoverForce > a 
+		{color:#fff;background:$color-style1;
+		border-bottom-color:#2aa2a1;}
+		}
+	} 
+	
+
+//-------- columns-container
+
+
+ul.product_list.grid > li .product-container .product-image-container{border-color:$base-border-color}
+
+
+     #home-page-tabs{
+		background:none;
+		>li{border-color:$base-border-color}
+		  > li.active a, 
+		  > li a:hover{
+			background:$color-style1;
+			color:white 
+			 }
+		  }	 
+
+	.new,
+	.sale
+	{background:$color-style1;
+		&:before,
+		&:after{
+				border-color: $color-style1  transparent   transparent transparent ;			
+			}	
+	}
+
+   ul.product_list.grid > li .product-container{
+  	background:none;
+    .product-image-container{
+  	   background:white;
+       .product_img_link{
+        background:#f1e8e3;
+        img{
+          background:#f1e8e3;
+        }
+       }   
+     }
+   }
+  
+  .button.lnk_view {
+	text-shadow:none;
+	padding:0;
+	border:none;
+		span {
+			border:1px solid #9a9a9a;		
+			padding:12px 16px;
+		   background:#f2f2f2;
+		   color:white;	
+		}
+		
+	&:hover {
+		span {
+			background:$color2-style1;
+			}	
+	}
+  }
+  
+    .button.ajax_add_to_cart_button{background:$color-style1}
+	.price-percent-reduction{background:$color-style1;border-color:$color-style1}
+	.price,
+	.price.product-price{color:$color-style1}
+	.old-price{color:#b1b0b0}
+
+	
+	ul.product_list.grid > li .product-container:hover{background:#fff;
+   @include box-shadow( 0 5px 13px rgba(0,0,0,0.17));
+	}
+	
+	.button.lnk_view span{color:$color3-style1}
+	.button.lnk_view:hover span{color:#fff} 
+
+  #cmsinfo_block em{background:$color-style1;text-shadow:$color-shadow}
+  #facebook_block, #cmsinfo_block{background:rgba(230,230,230,0.5)}
+  #cmsinfo_block,
+   #cmsinfo_block > div + div{border-color:#d8d8d8;}  
+   
+   
+   
+   
+   .footer-container #footer #social_block  { background:none;padding-bottom:15px;}  
+  .footer-container {	
+  background:#3f3f3f;
+																		@media (min-width: $screen-sm) { // min 768px
+																			background:url(../img/footer-bg.gif) repeat-x;
+																		}
+}
+ #footer #newsletter_block_left .form-group{ 
+	.form-control{background:#3c3c3c;}
+	 .button-small {color:#fff;
+	 &:hover{color:$color-style1}
+	 } 
+	}
+	
+ .footer-container #footer #social_block ul li a:hover{color:$color-style1;}	
+	
+	
@@ -0,0 +1,223 @@
+@import 'compass';
+@import 'bootstrap_lib/_variables';
+
+$header-background:     #333;
+$color-style1:          #eea200;
+$color1-style1:         #fff;
+$color2-style1:         #b7b7b7;
+$color3-style1:         #333;
+$base-border-color:		#e2dec8;
+$color-shadow:          0 1px #b57b00;
+
+
+body{background:#282828}
+.header-container,
+.columns-container{background:url(../img/bg-theme8.jpg) repeat 50% 0}
+
+  //-------- HEADER
+  #header {
+   background:none;	
+	.header-row {
+	  background:$header-background;	 	   
+	  .shop-phone{
+		  color:#777;
+		i,
+		strong{color:$color-style1} 	
+		  } 
+		  	
+	}	
+     #currencies-block-top, 
+	 #languages-block-top,
+	 .header-row #header_user_info{
+	 border-color:#515151;  
+	 }
+  
+  
+   #currencies-block-top div.current, 
+  #languages-block-top div.current,
+  .header-row #header_user_info a
+  {
+	 color:$color1-style1; 
+	  &:hover, &.active {
+		background:#2b2b2b;
+		color:white
+		}
+
+ }
+    #currencies-block-top div.current, 
+  #languages-block-top div.current{
+	 strong{color:$color-style1;} 
+	  }
+	   
+  #currencies-block-top div.current, 
+ #languages-block-top div.current
+   {&:hover,
+    &.active {
+	    background:#2b2b2b;
+		color:white}
+   
+	 }
+	
+ #header #currencies-block-top ul li.selected,
+ #header #currencies-block-top ul li:hover a,
+ #header #languages-block-top ul li.selected,
+ #header #languages-block-top ul li:hover a{
+	background:$color-style1
+	
+	}
+	
+	
+	
+	#contact-link{ 
+	   border-color:#515151;
+	   a{color:$color1-style1;
+		  &:hover, &.active {
+			background:#2b2b2b;
+			color:white
+			}
+		}	
+	}		
+}
+
+  #header #currencies-block-top div.current:after,
+  #header #languages-block-top div.current:after{color:#fff}
+
+
+
+	#search_block_top{
+		   .btn.button-search{
+			background:$color-style1;
+		    text-shadow:$color-shadow;
+		   &:hover{color:white;
+			background:$color3-style1;
+			text-shadow:0 1px #333;}
+		}
+	
+		 #search_query_top{
+		border-color:#e2dec8;
+		background:rgba(248,248,248,0.63);
+		color:#686666;}
+	}
+
+
+
+     #header_right #header_user #shopping_cart a{
+		background:$color-style1; 
+		color:white;
+		text-shadow:$color-shadow;
+		 &:after{color:white}
+		&:hover{color:white;
+		text-shadow:0 1px #333;
+    	background:$color3-style1}		 
+	 }
+	 
+    .sf-menu{
+		background:#fffef6;
+		border-bottom:3px solid #e2dec8;
+		>li{
+			border-right:1px solid #e2dec8;
+			>a{border-bottom: 3px solid #e2dec8;}
+		&.sfHover > a, > a:hover, &.sfHoverForce > a 
+		{color:#fff;background:$color-style1;
+		border-bottom-color:#da9400;}
+		}
+	} 
+	
+
+//-------- columns-container
+
+
+ul.product_list.grid > li .product-container .product-image-container{border-color:$base-border-color}
+
+
+     #home-page-tabs{
+		background:none;
+		>li{border-color:$base-border-color}
+		  > li.active a, 
+		  > li a:hover{
+			background:$color-style1;
+			color:white 
+			 }
+		  }	 
+
+	.new,
+	.sale
+	{background:$color-style1;
+		&:before,
+		&:after{
+				border-color: $color-style1  transparent   transparent transparent ;			
+			}	
+	}
+
+   ul.product_list.grid > li .product-container{
+  	background:none;
+    .product-image-container{
+  	   background:white;
+       .product_img_link{
+        background:#f1e8e3;
+        img{
+          background:#f1e8e3;
+        }
+       }   
+     }
+   }
+  
+  .button.lnk_view {
+	text-shadow:none;
+	padding:0;
+	border:none;
+		span {
+			border:1px solid #9a9a9a;		
+			padding:12px 16px;
+		   background:#f2f2f2;
+		   color:white;	
+		}
+		
+	&:hover {
+		span {
+			background:$color2-style1;
+			}	
+	}
+  }
+
+    .button.ajax_add_to_cart_button{background:$color-style1}
+
+
+	.price-percent-reduction{background:$color-style1;border-color:$color-style1}
+	.price,
+	.price.product-price{color:$color-style1}
+	.old-price{color:#b1b0b0}
+
+	
+	ul.product_list.grid > li .product-container:hover{background:#fff;
+   @include box-shadow( 0 5px 13px rgba(0,0,0,0.17));
+	}
+	
+	.button.lnk_view span{color:$color3-style1}
+	.button.lnk_view:hover span{color:#fff} 
+
+  #cmsinfo_block em{background:$color-style1;text-shadow:$color-shadow}
+  #facebook_block, #cmsinfo_block{background:rgba(219,213,185,0.5)}
+  #cmsinfo_block,
+   #cmsinfo_block > div + div{border-color:#dbd5b9;}  
+   
+   
+   
+   
+   .footer-container #footer #social_block  { background:none;padding-bottom:15px;}  
+  .footer-container {	
+  background:#3f3f3f;
+																		@media (min-width: $screen-sm) { // min 768px
+																			background:url(../img/footer-bg.gif) repeat-x;
+																		}
+}
+	 #footer #newsletter_block_left .form-group{ 
+	.form-control{background:#3c3c3c;}
+	 .button-small {color:#fff;
+	 &:hover{color:$color-style1}
+	 } 
+	}
+	
+ .footer-container #footer #social_block ul li a:hover{color:$color-style1;}	
+	
+	
@@ -89,6 +89,7 @@ textarea {

 #columns {
  z-index: 1;
+  position: relative;
  padding-bottom: 50px;
 }

@@ -228,37 +229,6 @@ span.exclusive_mini, span.exclusive_small, span.exclusive, span.exclusive_large,
  border: none;
 }

-/* input button */
-input.button_mini, input.button_small, input.button, input.button_large,
-input.button_mini_disabled, input.button_small_disabled, input.button_disabled, input.button_large_disabled,
-input.exclusive_mini, input.exclusive_small, input.exclusive, input.exclusive_large,
-input.exclusive_mini_disabled, input.exclusive_small_disabled, input.exclusive_disabled, input.exclusive_large_disabled {
-  /*padding-bottom: 2px*/
-}
-
-/* disabled button */
-input.button_mini_disabled, input.button_small_disabled, input.button_disabled, input.button_large_disabled,
-input.exclusive_mini_disabled, input.exclusive_small_disabled, input.exclusive_disabled, input.exclusive_large_disabled,
-span.button_mini, span.button_small, span.button, span.button_large,
-span.exclusive_mini, span.exclusive_small, span.exclusive, span.exclusive_large, span.exclusive_large_disabled {
-  /*background-position: left -36px;
-  cursor: default;
-  color: #888!important*/
-}
-
-/* exclusive button */
-input.exclusive_mini, input.exclusive_small, input.exclusive, input.exclusive_large,
-input.exclusive_mini_disabled, input.exclusive_small_disabled, input.exclusive_disabled, input.exclusive_large_disabled,
-a.exclusive_mini, a.exclusive_small, a.exclusive, a.exclusive_large,
-span.exclusive_mini, span.exclusive_small, span.exclusive, span.exclusive_large, span.exclusive_large_disabled {
-  /*color: white!important*/
-}
-
-/* exclusive disabled button */
-input.exclusive_mini_disabled, input.exclusive_small_disabled, input.exclusive_disabled, input.exclusive_large_disabled, span.exclusive_mini, span.exclusive_small, span.exclusive, span.exclusive_large {
-  /*color: #488c40!important*/
-}
-
 /* hover button */
 input.button_mini:hover, input.button_small:hover, input.button:hover, input.button_large:hover,
 input.exclusive_mini:hover, input.exclusive_small:hover, input.exclusive:hover, input.exclusive_large:hover,
@@ -268,11 +238,6 @@ a.exclusive_mini:hover, a.exclusive_small:hover, a.exclusive:hover, a.exclusive_
  background-position: left -50px;
 }

-/* exclusive hover button */
-input.exclusive_mini:hover, input.exclusive_small:hover, input.exclusive:hover, input.exclusive_large:hover, a.exclusive_mini:hover, a.exclusive_small:hover, a.exclusive:hover, a.exclusive_large:hover {
-  /*color: white!important*/
-}
-
 /* active button */
 input.button_mini:active, input.button_small:active, input.button:active, input.button_large:active,
 input.exclusive_mini:active, input.exclusive_small:active, input.exclusive:active, input.exclusive_large:active,
@@ -281,17 +246,6 @@ a.exclusive_mini:active, a.exclusive_small:active, a.exclusive:active, a.exclusi
  background-position: left -100px;
 }

-/* classic buttons */
-input.button_mini, input.button_mini_disabled, input.exclusive_mini, input.exclusive_mini_disabled, a.button_mini, a.exclusive_mini, span.button_mini, span.exclusive_mini {
-  /*width: 30px;
-  background-image: url('../img/button-mini.png')*/
-}
-
-input.button_small, input.button_small_disabled, input.exclusive_small, input.exclusive_small_disabled, a.button_small, a.exclusive_small, span.button_small, span.exclusive_small {
-  /*width: 60px;
-  background-image: url('../img/button-small.png')*/
-}
-
 input.button_disabled, input.exclusive_disabled, span.exclusive {
  border: 1px solid #ccc;
  color: #999;
@@ -299,11 +253,6 @@ input.button_disabled, input.exclusive_disabled, span.exclusive {
  cursor: default;
 }

-input.button_large, input.button_large_disabled, input.exclusive_large, input.exclusive_large_disabled, a.button_large, a.exclusive_large, span.button_large, span.exclusive_large, span.exclusive_large_disabled {
-  /*width: 180px;
-  background-image: url('../img/button-large.png')*/
-}
-
 .btn.disabled, .btn[disabled]:hover {
  opacity: 0.3;
 }
@@ -2972,14 +2921,6 @@ p.cheque-indent {
 #manufacturer .bottom-pagination-content, #manufacturer .top-pagination-content, #supplier .bottom-pagination-content, #supplier .top-pagination-content {
  min-height: 69px;
 }
-#manufacturer .bottom-pagination-content #pagination .showall, #manufacturer .top-pagination-content #pagination .showall, #supplier .bottom-pagination-content #pagination .showall, #supplier .top-pagination-content #pagination .showall {
-  margin-right: 0;
-}
-@media (min-width: 1200px) {
-  #manufacturer .bottom-pagination-content #pagination .showall, #manufacturer .top-pagination-content #pagination .showall, #supplier .bottom-pagination-content #pagination .showall, #supplier .top-pagination-content #pagination .showall {
-    margin-right: 201px;
-  }
-}
 #manufacturer .top-pagination-content.bottom-line, #supplier .top-pagination-content.bottom-line {
  border-bottom: 1px solid #d6d4d4;
 }
@@ -59,3 +59,16 @@
 .footable .footable-row-detail-value {
  display: table-cell;
 }
+.footable .footable-sortable .footable-sort-indicator:after {
+  float: right;
+  margin: 0px 0px 0 0;
+  content: "";
+  font-family: "FontAwesome";
+  display: block;
+}
+.footable .footable-sortable.footable-sorted .footable-sort-indicator:after {
+  content: "";
+}
+.footable .footable-sortable.footable-sorted-desc .footable-sort-indicator:after {
+  content: "";
+}
@@ -20,11 +20,11 @@
    min-width: 100%;
  }
 }
-#htmlcontent_home ul li.htmlcontent-item-4 {
+#htmlcontent_home ul li.htmlcontent-item-5 {
  width: 66.6667%;
 }
@media (max-width: 479px) {
-  #htmlcontent_home ul li.htmlcontent-item-4 {
+  #htmlcontent_home ul li.htmlcontent-item-5 {
    width: 100%;
  }
 }
@@ -1,87 +1,76 @@
 body {
-  background: #232323;
+  background: #282828;
 }

 .header-container,
 .columns-container {
-  background: #333333;
+  background: #f6f6f6;
 }

 #header {
  background: none;
 }
 #header .header-row {
-  background: #545454;
+  background: #dadada;
 }
 #header .header-row .shop-phone {
-  color: white;
-  text-shadow: 0 1px #404040;
+  color: #333333;
 }
 #header .header-row .shop-phone i,
 #header .header-row .shop-phone strong {
-  color: #aaaaaa;
-  text-shadow: 0 1px #404040;
+  color: #f44051;
 }
 #header #currencies-block-top,
 #header #languages-block-top,
 #header .header-row #header_user_info {
-  border-color: #656565;
+  border-color: #c6c6c6;
 }
 #header #currencies-block-top div.current,
 #header #languages-block-top div.current,
 #header .header-row #header_user_info a {
-  color: white;
+  color: #333333;
 }
 #header #currencies-block-top div.current:hover, #header #currencies-block-top div.current.active,
 #header #languages-block-top div.current:hover,
 #header #languages-block-top div.current.active,
 #header .header-row #header_user_info a:hover,
 #header .header-row #header_user_info a.active {
+  background: #b7b7b7;
  color: white;
 }
-#header #currencies-block-top div.current,
-#header #languages-block-top div.current {
-  padding-bottom: 11px;
-}
-#header #currencies-block-top div.current strong, #header #currencies-block-top div.current:after,
-#header #languages-block-top div.current strong,
-#header #languages-block-top div.current:after {
-  color: white;
+#header #currencies-block-top div.current strong,
+#header #languages-block-top div.current strong {
+  color: #333333;
 }
 #header #currencies-block-top div.current:hover strong, #header #currencies-block-top div.current:hover:after, #header #currencies-block-top div.current.active strong, #header #currencies-block-top div.current.active:after,
 #header #languages-block-top div.current:hover strong,
 #header #languages-block-top div.current:hover:after,
 #header #languages-block-top div.current.active strong,
 #header #languages-block-top div.current.active:after {
-  background: #2b2b2b;
+  background: #b7b7b7;
  color: white;
 }
 #header #contact-link {
-  border-color: #656565;
+  border-color: #c6c6c6;
 }
 #header #contact-link a {
-  color: white;
+  color: #333333;
 }
 #header #contact-link a:hover, #header #contact-link a.active {
-  background: #2b2b2b;
+  background: #b7b7b7;
  color: white;
 }

 #search_block_top .btn.button-search {
-  background: #666666;
+  background: #f44051;
 }
 #search_block_top .btn.button-search:hover {
  color: white;
  background: #333333;
 }

-#search_block_top #search_query_top {
-  background: white;
-  color: #333333;
-}
-
 #header_right #header_user #shopping_cart a {
-  background: #666666;
+  background: #f44051;
  color: white;
 }
 #header_right #header_user #shopping_cart a:after {
@@ -94,27 +83,26 @@ body {

 .sf-menu {
  background: white;
-  border: 1px solid #f2f2f2;
-  border-bottom: 3px solid #f2f2f2;
+  border-bottom: 3px solid #e8e8e8;
 }
 .sf-menu > li {
-  border-right: 1px solid #d6d4d4;
+  border-right: 1px solid #e8e8e8;
 }
-.sf-menu > li a {
-  border-bottom: 3px solid #f2f2f2;
+.sf-menu > li > a {
+  border-bottom: 3px solid #e8e8e8;
 }
 .sf-menu > li.sfHover > a, .sf-menu > li > a:hover, .sf-menu > li.sfHoverForce > a {
  color: #fff;
-  background: #666666;
-  border-bottom-color: #666666;
+  background: #f44051;
+  border-bottom-color: #ce2434;
 }

 #home-page-tabs {
-  background: white;
+  background: #f6f6f6;
 }
 #home-page-tabs > li.active a,
 #home-page-tabs > li a:hover {
-  background: #333333;
+  background: #f44051;
  color: white;
 }

@@ -125,54 +113,53 @@ body {
 .new:before, .new:after,
 .sale:before,
 .sale:after {
-  border-color: #f44051  transparent   transparent transparent;
+  border-color: #ad2b34  transparent   transparent transparent;
 }

 ul.product_list.grid > li .product-container {
-  background: white;
+  background: #f6f6f6;
 }
 ul.product_list.grid > li .product-container .product-image-container {
-  background: #474747;
+  background: white;
 }
 ul.product_list.grid > li .product-container .product-image-container .product_img_link {
-  background: #474747;
+  background: #fbfbfb;
 }
 ul.product_list.grid > li .product-container .product-image-container .product_img_link img {
-  background: #474747;
+  background: #fbfbfb;
 }

-ul.product_list.grid > li:hover .product-container {
-  background: #5c5c5c;
+.button.lnk_view {
+  text-shadow: none;
+  padding: 0;
+  border: none;
 }
-ul.product_list.grid > li:hover .product-container .product-name {
-  color: #aaa;
+.button.lnk_view span {
+  border: none;
+  padding: 12px 16px;
+  background: #333333;
+  color: white;
 }
-ul.product_list.grid > li:hover .product-container .functional-buttons div a, ul.product_list.grid > li:hover .product-container ul.product_list.grid > li .product-container .functional-buttons div label {
-  color: #aaa;
-}
-ul.product_list.grid > li:hover .product-container .functional-buttons div a:hover, ul.product_list.grid > li:hover .product-container ul.product_list.grid > li .product-container .functional-buttons div label:hover {
-  color: #fff;
+.button.lnk_view:hover span {
+  background: #f44051;
 }

 #cmsinfo_block em {
-  background: #666666;
+  background: #f44051;
 }

 #facebook_block, #cmsinfo_block {
-  background: #454545;
-}
-#facebook_block h4, #cmsinfo_block h4 {
-  color: white;
-}
-
-#cmsinfo_block h3,
-#cmsinfo_block .dark {
-  color: white;
+  background: #e8e8e8;
 }

 #cmsinfo_block,
 #cmsinfo_block > div + div {
-  border-color: #1b1b1b;
+  border-color: #d0d0d0;
+}
+
+.footer-container #footer #social_block {
+  background: #1b1b1b;
+  padding-bottom: 15px;
 }

 .footer-container {
@@ -184,17 +171,13 @@ ul.product_list.grid > li:hover .product-container .functional-buttons div a:hov
  }
 }

-.footer-container #footer #social_block {
-  background: #1b1b1b;
-}
-
 #footer #newsletter_block_left .form-group .form-control {
  background: #1b1b1b;
 }
 #footer #newsletter_block_left .form-group .button-small {
-  color: #666666;
+  color: #f44051;
 }

 .footer-container #footer #social_block ul li a:hover {
-  color: white;
+  color: #f44051;
 }
@@ -1,154 +1,156 @@
 body {
-  background: #333333;
+  background: #3c281c;
 }

 .header-container,
 .columns-container {
-  background: #fff;
+  background: url(../img/bg-theme2.jpg) repeat 50% 0;
 }

 #header {
  background: none;
 }
 #header .header-row {
-  background: #333333;
+  background: #545454;
 }
 #header .header-row .shop-phone {
-  color: #777;
+  color: #fff;
+  text-shadow: 0 1px #404040;
 }
 #header .header-row .shop-phone i,
 #header .header-row .shop-phone strong {
-  color: #719f41;
+  color: #aaa;
 }
 #header #currencies-block-top,
 #header #languages-block-top,
 #header .header-row #header_user_info {
-  border-color: #515151;
+  border-color: #656565;
 }
 #header #currencies-block-top div.current,
 #header #languages-block-top div.current,
 #header .header-row #header_user_info a {
-  color: white;
+  color: #fff;
 }
 #header #currencies-block-top div.current:hover, #header #currencies-block-top div.current.active,
 #header #languages-block-top div.current:hover,
 #header #languages-block-top div.current.active,
 #header .header-row #header_user_info a:hover,
 #header .header-row #header_user_info a.active {
-  background: #2b2b2b;
+  background: #878872;
  color: white;
 }
 #header #currencies-block-top div.current strong,
 #header #languages-block-top div.current strong {
-  color: #333333;
+  color: #fff;
 }
-#header #currencies-block-top div.current:after,
-#header #currencies-block-top div.current strong,
-#header #languages-block-top div.current:after,
-#header #languages-block-top div.current strong {
+#header #currencies-block-top div.current:hover, #header #currencies-block-top div.current.active,
+#header #languages-block-top div.current:hover,
+#header #languages-block-top div.current.active {
+  background: #878872;
  color: white;
 }
-#header #currencies-block-top div.current:hover strong, #header #currencies-block-top div.current:hover:after, #header #currencies-block-top div.current.active strong, #header #currencies-block-top div.current.active:after,
-#header #languages-block-top div.current:hover strong,
-#header #languages-block-top div.current:hover:after,
-#header #languages-block-top div.current.active strong,
-#header #languages-block-top div.current.active:after {
-  color: white;
+#header #header #currencies-block-top ul li.selected,
+#header #header #currencies-block-top ul li:hover a,
+#header #header #languages-block-top ul li.selected,
+#header #header #languages-block-top ul li:hover a {
+  background: #b7b7b7;
 }
 #header #contact-link {
-  border-color: #515151;
+  border-color: #656565;
 }
 #header #contact-link a {
-  color: white;
+  color: #fff;
 }
 #header #contact-link a:hover, #header #contact-link a.active {
-  background: #2b2b2b;
+  background: #878872;
  color: white;
 }

+#header #currencies-block-top div.current:after,
+#header #languages-block-top div.current:after {
+  color: #fff;
+}
+
 #search_block_top .btn.button-search {
-  background: #719f41;
-  text-shadow: 0 1px  #567931;
+  background: #584336;
 }
 #search_block_top .btn.button-search:hover {
  color: white;
  background: #333333;
-  text-shadow: 0 1px  #333;
 }
-
 #search_block_top #search_query_top {
+  border-color: #d6d4d4;
+  background: rgba(248, 248, 248, 0.63);
  color: #686666;
 }

 #header_right #header_user #shopping_cart a {
-  background: #719f41;
+  background: #878872;
  color: white;
-  text-shadow: 0 1px  #567931;
 }
 #header_right #header_user #shopping_cart a:after {
  color: white;
 }
 #header_right #header_user #shopping_cart a:hover {
  color: white;
-  text-shadow: 0 1px  #333;
+  text-shadow: 0 1px #333;
  background: #333333;
 }

 .sf-menu {
-  background: #f6f6f6;
-  border-bottom: 3px solid #e9e9e9;
+  background: #cbccbe;
+  border-bottom: 3px solid #c1c2b4;
 }
 .sf-menu > li {
-  border-right: 1px solid #d6d4d4;
+  border-right: 1px solid #d8d9ce;
 }
-.sf-menu > li a {
-  border-bottom: 3px solid #e9e9e9;
+.sf-menu > li > a {
+  border-bottom: 3px solid #c1c2b4;
+  color: #515150;
 }
 .sf-menu > li.sfHover > a, .sf-menu > li > a:hover, .sf-menu > li.sfHoverForce > a {
  color: #fff;
-  background: #719f41;
-  border-bottom-color: #598b24;
+  background: #584336;
+  border-bottom-color: #584336;
+}
+
+ul.product_list.grid > li .product-container .product-image-container {
+  border-color: #d6d4d4;
 }

 #home-page-tabs {
-  background: white;
+  background: none;
+}
+#home-page-tabs > li {
+  border-color: #d6d4d4;
 }
 #home-page-tabs > li.active a,
 #home-page-tabs > li a:hover {
-  background: #719f41;
+  background: #584336;
  color: white;
 }

 .new,
 .sale {
-  background: #719f41;
+  background: #584336;
 }
 .new:before, .new:after,
 .sale:before,
 .sale:after {
-  border-color: #719f41  transparent   transparent transparent;
+  border-color: #584336 transparent transparent transparent;
 }

 ul.product_list.grid > li .product-container {
-  background: white;
+  background: none;
 }
 ul.product_list.grid > li .product-container .product-image-container {
  background: white;
 }
 ul.product_list.grid > li .product-container .product-image-container .product_img_link {
-  background: white;
+  background: #f1e8e3;
 }
 ul.product_list.grid > li .product-container .product-image-container .product_img_link img {
-  background: white;
-}
-
-.price.product-price {
-  color: #719f41;
-}
-
-.price-percent-reduction {
-  background: #719f41;
-  border-color: #719f41;
+  background: #f1e8e3;
 }

 .button.lnk_view {
@@ -157,66 +159,135 @@ ul.product_list.grid > li .product-container .product-image-container .product_i
  border: none;
 }
 .button.lnk_view span {
-  border: none;
+  border: 1px solid #9a9a9a;
  padding: 12px 16px;
-  background: #333333;
+  background: #f2f2f2;
  color: white;
 }
 .button.lnk_view:hover span {
-  background: #719f41;
+  background: #b7b7b7;
+}
+
+.product-name {
+  color: #878872;
+}
+
+.button.ajax_add_to_cart_button {
+  background: #584336;
+}
+
+.price-percent-reduction {
+  background: #584336;
+  border-color: #584336;
+}
+
+.price,
+.price.product-price {
+  color: #584336;
+}
+
+.old-price {
+  color: #b1b0b0;
+}
+
+ul.product_list.grid > li .product-container:hover {
+  background: #fff;
+  -webkit-box-shadow: 0 5px 13px rgba(0, 0, 0, 0.17);
+  -moz-box-shadow: 0 5px 13px rgba(0, 0, 0, 0.17);
+  box-shadow: 0 5px 13px rgba(0, 0, 0, 0.17);
+}
+
+.button.lnk_view span {
+  color: #fff;
+  background: #878872;
+  border-color: #878872;
+}
+
+.button.lnk_view:hover span {
+  color: #fff;
+  background: #584336;
+  border-color: #584336;
 }

 #cmsinfo_block em {
-  background: #333333;
+  background: #584336;
+  text-shadow: 0 1px #4e3c30;
 }

 #facebook_block, #cmsinfo_block {
-  background: #e8e8e8;
+  background: #adae9d;
 }

 #cmsinfo_block,
 #cmsinfo_block > div + div {
-  border-color: #d0d0d0;
+  border-color: #c6c7bb;
 }

 .footer-container #footer #social_block {
-  background: #3f3f3f;
+  background: none;
  padding-bottom: 15px;
 }

 .footer-container {
-  background: #3f3f3f;
+  background: #584336;
 }
@media (min-width: 768px) {
  .footer-container {
-    background: url(../img/footer-bg.gif) repeat-x;
+    background: url(../img/footer-bg2.gif) repeat-x;
  }
 }

-.footer-container #footer #social_block ul li a:hover {
-  color: #719f41;
+#facebook_block h4, #cmsinfo_block h4,
+#cmsinfo_block h3,
+#cmsinfo_block p strong {
+  color: #fff;
+}
+
+#facebook_block p, #cmsinfo_block p {
+  color: #e7e7e2;
 }

 #footer #newsletter_block_left .form-group .form-control {
-  background: #3f3f3f;
+  background: #534034;
+  color: #fff;
+  border-color: #79695e;
+}
+#footer #newsletter_block_left .form-group .button-small {
+  color: #fff;
+  text-shadow: 0 1px #47362c;
+}
+#footer #newsletter_block_left .form-group .button-small:hover {
+  color: #e4dfb9;
 }

-#footer #newsletter_block_left h4,
-.footer-container #footer #social_block h4 {
+#footer #newsletter_block_left h4 {
+  text-shadow: 0 1px #47362c;
+}
+
+.footer-container #footer #social_block ul li a {
+  color: #fff;
+  text-shadow: 0 1px #47362c;
+}
+.footer-container #footer #social_block ul li a:hover {
+  color: #e4dfb9;
+}
+
+.footer-container #footer a {
+  color: #fff;
+}
+.footer-container #footer a:hover {
+  color: #e4dfb9;
+}
+
+.footer-container #footer #block_contact_infos > div ul li {
  color: #fff;
 }

-.footer-container #footer h4,
-.footer-container #footer h4 a {
-  color: #719f41;
-}
-
-.footer-container #footer .bottom-footer {
-  color: #719f41;
-}
-.footer-container #footer .bottom-footer a {
-  color: #719f41;
-}
-.footer-container #footer .bottom-footer a:hover {
+.footer-container #footer .bottom-footer div {
  color: #fff;
 }
+
+.footer-container #footer #block_contact_infos,
+.footer-container #footer .bottom-footer div {
+  border-color: #503e33;
+}
@@ -0,0 +1,278 @@
+body {
+  background: #1b1b1b;
+}
+
+.header-container,
+.columns-container {
+  background: url(../img/bg-theme3.jpg) repeat 50% 0;
+}
+
+#header {
+  background: none;
+}
+#header .header-row {
+  background: #545454;
+}
+#header .header-row .shop-phone {
+  color: #fff;
+  text-shadow: 0 1px #404040;
+}
+#header .header-row .shop-phone i,
+#header .header-row .shop-phone strong {
+  color: #eac12d;
+}
+#header #currencies-block-top,
+#header #languages-block-top,
+#header .header-row #header_user_info {
+  border-color: #656565;
+}
+#header #currencies-block-top div.current,
+#header #languages-block-top div.current,
+#header .header-row #header_user_info a {
+  color: white;
+}
+#header #currencies-block-top div.current:hover, #header #currencies-block-top div.current.active,
+#header #languages-block-top div.current:hover,
+#header #languages-block-top div.current.active,
+#header .header-row #header_user_info a:hover,
+#header .header-row #header_user_info a.active {
+  background: #eac12d;
+  color: white;
+}
+#header #currencies-block-top div.current strong,
+#header #languages-block-top div.current strong {
+  color: #eac12d;
+}
+#header #currencies-block-top div.current:hover, #header #currencies-block-top div.current.active,
+#header #languages-block-top div.current:hover,
+#header #languages-block-top div.current.active {
+  background: #333333;
+  color: white;
+}
+#header #currencies-block-top div.current:hover strong, #header #currencies-block-top div.current.active strong,
+#header #languages-block-top div.current:hover strong,
+#header #languages-block-top div.current.active strong {
+  color: #fff;
+}
+#header #header #currencies-block-top ul li.selected,
+#header #header #currencies-block-top ul li:hover a,
+#header #header #languages-block-top ul li.selected,
+#header #header #languages-block-top ul li:hover a {
+  background: #eac12d;
+}
+#header #contact-link {
+  border-color: #656565;
+}
+#header #contact-link a {
+  color: white;
+}
+#header #contact-link a:hover, #header #contact-link a.active {
+  background: #333333;
+  color: white;
+}
+
+#header #currencies-block-top div.current:after,
+#header #languages-block-top div.current:after {
+  color: #fff;
+}
+
+#search_block_top .btn.button-search {
+  background: #eac12d;
+}
+#search_block_top .btn.button-search:hover {
+  color: white;
+  background: #333333;
+}
+#search_block_top #search_query_top {
+  border-color: #dfd8ca;
+  background: #fff;
+  color: #686666;
+}
+
+#header_right #header_user #shopping_cart a {
+  background: #eac12d;
+  color: white;
+}
+#header_right #header_user #shopping_cart a:after {
+  color: white;
+}
+#header_right #header_user #shopping_cart a:hover {
+  color: white;
+  background: #333;
+}
+
+.sf-menu {
+  background: #404040;
+  border-bottom: 3px solid #404040;
+}
+.sf-menu > li {
+  border-right: 1px solid #565656;
+}
+.sf-menu > li > a {
+  border-bottom: 3px solid #404040;
+  color: #fff;
+}
+.sf-menu > li.sfHover > a, .sf-menu > li > a:hover, .sf-menu > li.sfHoverForce > a {
+  color: #fff;
+  background: #eac12d;
+  border-bottom-color: #eac12d;
+}
+
+ul.product_list.grid > li .product-container .product-image-container {
+  border-color: #dfd8ca;
+}
+
+#home-page-tabs {
+  background: none;
+}
+#home-page-tabs > li {
+  border-color: #dfd8ca;
+}
+#home-page-tabs > li.active a,
+#home-page-tabs > li a:hover {
+  background: #eac12d;
+  color: white;
+}
+
+.new,
+.sale {
+  background: #eac12d;
+}
+.new:before, .new:after,
+.sale:before,
+.sale:after {
+  border-color: #eac12d transparent transparent transparent;
+}
+
+ul.product_list.grid > li .product-container {
+  background: none;
+}
+ul.product_list.grid > li .product-container .product-image-container {
+  background: white;
+}
+ul.product_list.grid > li .product-container .product-image-container .product_img_link {
+  background: #f1e8e3;
+}
+ul.product_list.grid > li .product-container .product-image-container .product_img_link img {
+  background: #f1e8e3;
+}
+
+.button.lnk_view {
+  text-shadow: none;
+  padding: 0;
+  border: none;
+}
+.button.lnk_view span {
+  border: 1px solid #9a9a9a;
+  padding: 12px 16px;
+  background: #f2f2f2;
+  color: white;
+}
+.button.lnk_view:hover span {
+  background: #b7b7b7;
+}
+
+.button.ajax_add_to_cart_button {
+  background: #eac12d;
+}
+
+.price-percent-reduction {
+  background: #eac12d;
+  border-color: #eac12d;
+}
+
+.price,
+.price.product-price {
+  color: #eac12d;
+}
+
+.old-price {
+  color: #b1b0b0;
+}
+
+ul.product_list.grid > li .product-container:hover {
+  background: #fff;
+  -webkit-box-shadow: 0 5px 13px rgba(0, 0, 0, 0.17);
+  -moz-box-shadow: 0 5px 13px rgba(0, 0, 0, 0.17);
+  box-shadow: 0 5px 13px rgba(0, 0, 0, 0.17);
+}
+
+.button.lnk_view span {
+  color: #333333;
+}
+
+.button.lnk_view:hover span {
+  color: #fff;
+}
+
+#cmsinfo_block em {
+  background: #eac12d;
+  text-shadow: 0 1px #b29322;
+}
+
+#facebook_block, #cmsinfo_block {
+  background: #e2e2e2;
+}
+
+#cmsinfo_block,
+#cmsinfo_block > div + div {
+  border-color: #d6d6d6;
+}
+
+.footer-container #footer #block_contact_infos > div ul li {
+  color: #777;
+}
+
+.footer-container #footer #block_contact_infos > div ul li i {
+  color: #908f8f;
+}
+
+#facebook_block h4, #cmsinfo_block h4,
+#cmsinfo_block h3 {
+  color: #191919;
+}
+
+#facebook_block p, #cmsinfo_block p {
+  color: #757575;
+}
+
+.footer-container #footer #social_block {
+  background: none;
+  padding-bottom: 15px;
+}
+
+.footer-container {
+  background: #191919;
+}
+@media (min-width: 768px) {
+  .footer-container {
+    background: url(../img/footer-bg3.gif) repeat-x;
+  }
+}
+
+.footer-container #footer a {
+  color: #777777;
+}
+
+.footer-container #footer #block_contact_infos,
+.footer-container #footer .bottom-footer div {
+  border-color: #515151;
+}
+
+#footer #newsletter_block_left .form-group .form-control {
+  background: none;
+  border-color: #515151;
+}
+#footer #newsletter_block_left .form-group .button-small {
+  color: #908f8f;
+}
+#footer #newsletter_block_left .form-group .button-small:hover {
+  color: #eac12d;
+}
+
+.footer-container #footer #social_block ul li a {
+  color: #908f8f;
+}
+.footer-container #footer #social_block ul li a:hover {
+  color: #eac12d;
+}
@@ -0,0 +1,280 @@
+body {
+  background: #181212;
+}
+
+.header-container,
+.columns-container {
+  background: url(../img/bg-theme5.jpg) repeat 50% 0;
+}
+
+#header {
+  background: none;
+}
+#header .header-row {
+  background: #181212;
+}
+#header .header-row .shop-phone {
+  color: #777;
+}
+#header .header-row .shop-phone i,
+#header .header-row .shop-phone strong {
+  color: #fff;
+}
+#header #currencies-block-top,
+#header #languages-block-top,
+#header .header-row #header_user_info {
+  border-color: #515151;
+}
+#header #currencies-block-top div.current,
+#header #languages-block-top div.current,
+#header .header-row #header_user_info a {
+  color: white;
+}
+#header #currencies-block-top div.current:hover, #header #currencies-block-top div.current.active,
+#header #languages-block-top div.current:hover,
+#header #languages-block-top div.current.active,
+#header .header-row #header_user_info a:hover,
+#header .header-row #header_user_info a.active {
+  background: #b04445;
+  color: white;
+}
+#header #currencies-block-top div.current strong,
+#header #languages-block-top div.current strong {
+  color: #b04445;
+}
+#header #currencies-block-top div.current:hover, #header #currencies-block-top div.current.active,
+#header #languages-block-top div.current:hover,
+#header #languages-block-top div.current.active {
+  background: #b04445;
+  color: white;
+}
+#header #currencies-block-top div.current:hover strong, #header #currencies-block-top div.current.active strong,
+#header #languages-block-top div.current:hover strong,
+#header #languages-block-top div.current.active strong {
+  color: #fff;
+}
+#header #header #currencies-block-top ul li.selected,
+#header #header #currencies-block-top ul li:hover a,
+#header #header #languages-block-top ul li.selected,
+#header #header #languages-block-top ul li:hover a {
+  background: #b04445;
+}
+#header #contact-link {
+  border-color: #515151;
+}
+#header #contact-link a {
+  color: white;
+}
+#header #contact-link a:hover, #header #contact-link a.active {
+  background: #b04445;
+  color: white;
+}
+
+#header #currencies-block-top div.current:after,
+#header #languages-block-top div.current:after {
+  color: #fff;
+}
+
+#search_block_top .btn.button-search {
+  background: #b04445;
+  text-shadow: 0 1px #8b3637;
+}
+#search_block_top .btn.button-search:hover {
+  color: white;
+  background: #333333;
+  text-shadow: 0 1px #333;
+}
+#search_block_top #search_query_top {
+  border-color: #dfd8ca;
+  background: rgba(248, 248, 248, 0.63);
+  color: #686666;
+}
+
+#header_right #header_user #shopping_cart a {
+  background: #b04445;
+  color: white;
+  text-shadow: 0 1px #8b3637;
+}
+#header_right #header_user #shopping_cart a:after {
+  color: white;
+}
+#header_right #header_user #shopping_cart a:hover {
+  color: white;
+  text-shadow: 0 1px #333;
+  background: #333333;
+}
+
+.sf-menu {
+  background: #faf8f4;
+  border-bottom: 3px solid #dfd8ca;
+}
+.sf-menu > li {
+  border-right: 1px solid #dfd8ca;
+}
+.sf-menu > li > a {
+  border-bottom: 3px solid #dfd8ca;
+}
+.sf-menu > li.sfHover > a, .sf-menu > li > a:hover, .sf-menu > li.sfHoverForce > a {
+  color: #fff;
+  background: #b04445;
+  border-bottom-color: #983334;
+}
+
+ul.product_list.grid > li .product-container .product-image-container {
+  border-color: #dfd8ca;
+}
+
+#home-page-tabs {
+  background: none;
+}
+#home-page-tabs > li {
+  border-color: #dfd8ca;
+}
+#home-page-tabs > li.active a,
+#home-page-tabs > li a:hover {
+  background: #b04445;
+  color: white;
+}
+
+.new,
+.sale {
+  background: #b04445;
+}
+.new:before, .new:after,
+.sale:before,
+.sale:after {
+  border-color: #b04445 transparent transparent transparent;
+}
+
+ul.product_list.grid > li .product-container {
+  background: none;
+}
+ul.product_list.grid > li .product-container .product-image-container {
+  background: white;
+}
+ul.product_list.grid > li .product-container .product-image-container .product_img_link {
+  background: #f1e8e3;
+}
+ul.product_list.grid > li .product-container .product-image-container .product_img_link img {
+  background: #f1e8e3;
+}
+
+.button.lnk_view {
+  text-shadow: none;
+  padding: 0;
+  border: none;
+}
+.button.lnk_view span {
+  border: 1px solid #9a9a9a;
+  padding: 12px 16px;
+  background: #f2f2f2;
+  color: white;
+}
+.button.lnk_view:hover span {
+  background: #b7b7b7;
+}
+
+.button.ajax_add_to_cart_button {
+  background: #b04445;
+}
+
+.price-percent-reduction {
+  background: #b04445;
+  border-color: #b04445;
+}
+
+.price,
+.price.product-price {
+  color: #b04445;
+}
+
+.old-price {
+  color: #b1b0b0;
+}
+
+ul.product_list.grid > li .product-container:hover {
+  background: #fff;
+  -webkit-box-shadow: 0 5px 13px rgba(0, 0, 0, 0.17);
+  -moz-box-shadow: 0 5px 13px rgba(0, 0, 0, 0.17);
+  box-shadow: 0 5px 13px rgba(0, 0, 0, 0.17);
+}
+
+.button.lnk_view span {
+  color: #333333;
+}
+
+.button.lnk_view:hover span {
+  color: #fff;
+}
+
+#cmsinfo_block em {
+  background: #b04445;
+  text-shadow: 0 1px #8b3637;
+}
+
+#facebook_block, #cmsinfo_block {
+  background: #e5ded1;
+}
+
+#cmsinfo_block,
+#cmsinfo_block > div + div {
+  border-color: #cec7bc;
+}
+
+.footer-container #footer #block_contact_infos > div ul li {
+  color: #b5a78d;
+}
+
+.footer-container #footer #block_contact_infos > div ul li i {
+  color: #b04445;
+}
+
+#facebook_block h4, #cmsinfo_block h4,
+#cmsinfo_block h3 {
+  color: #181212;
+}
+
+#facebook_block p, #cmsinfo_block p {
+  color: #3d211f;
+}
+
+.footer-container #footer #social_block {
+  background: none;
+  padding-bottom: 15px;
+}
+
+.footer-container {
+  background: #1f1818;
+}
+@media (min-width: 768px) {
+  .footer-container {
+    background: url(../img/footer-bg5.gif) repeat-x;
+  }
+}
+
+.footer-container #footer a {
+  color: #b5a78d;
+}
+
+.footer-container #footer #block_contact_infos,
+.footer-container #footer .bottom-footer div {
+  border-color: #2e2828;
+}
+
+#footer #newsletter_block_left .form-group .form-control {
+  background: #1f1919;
+  border-color: #89837f;
+}
+#footer #newsletter_block_left .form-group .button-small {
+  color: #fff;
+}
+#footer #newsletter_block_left .form-group .button-small:hover {
+  color: #b04445;
+}
+
+.footer-container #footer #social_block ul li a {
+  color: #f3eee6;
+}
+.footer-container #footer #social_block ul li a:hover {
+  color: #b04445;
+}
@@ -1,132 +1,152 @@
 body {
-  background: #282828;
+  background: #333333;
 }

 .header-container,
 .columns-container {
-  background: #f6f6f6;
+  background: white;
 }

 #header {
  background: none;
 }
 #header .header-row {
-  background: #dadada;
+  background: #333333;
 }
 #header .header-row .shop-phone {
-  color: #333333;
+  color: #777;
 }
 #header .header-row .shop-phone i,
 #header .header-row .shop-phone strong {
-  color: #f44051;
+  color: #719f41;
 }
 #header #currencies-block-top,
 #header #languages-block-top,
 #header .header-row #header_user_info {
-  border-color: #c6c6c6;
+  border-color: #515151;
 }
 #header #currencies-block-top div.current,
 #header #languages-block-top div.current,
 #header .header-row #header_user_info a {
-  color: #333333;
+  color: white;
 }
 #header #currencies-block-top div.current:hover, #header #currencies-block-top div.current.active,
 #header #languages-block-top div.current:hover,
 #header #languages-block-top div.current.active,
 #header .header-row #header_user_info a:hover,
 #header .header-row #header_user_info a.active {
-  background: #b7b7b7;
+  background: #2b2b2b;
  color: white;
 }
 #header #currencies-block-top div.current strong,
 #header #languages-block-top div.current strong {
-  color: #333333;
+  color: #719f41;
+}
+#header #currencies-block-top div.current:after,
+#header #languages-block-top div.current:after {
+  color: white;
 }
 #header #currencies-block-top div.current:hover strong, #header #currencies-block-top div.current:hover:after, #header #currencies-block-top div.current.active strong, #header #currencies-block-top div.current.active:after,
 #header #languages-block-top div.current:hover strong,
 #header #languages-block-top div.current:hover:after,
 #header #languages-block-top div.current.active strong,
 #header #languages-block-top div.current.active:after {
-  background: #b7b7b7;
  color: white;
 }
 #header #contact-link {
-  border-color: #c6c6c6;
+  border-color: #515151;
 }
 #header #contact-link a {
-  color: #333333;
+  color: white;
 }
 #header #contact-link a:hover, #header #contact-link a.active {
-  background: #b7b7b7;
+  background: #2b2b2b;
  color: white;
 }

 #search_block_top .btn.button-search {
-  background: #f44051;
+  background: #719f41;
+  text-shadow: 0 1px #567931;
 }
 #search_block_top .btn.button-search:hover {
  color: white;
  background: #333333;
+  text-shadow: 0 1px  #333;
+}
+
+#search_block_top #search_query_top {
+  color: #686666;
 }

 #header_right #header_user #shopping_cart a {
-  background: #f44051;
+  background: #719f41;
  color: white;
+  text-shadow: 0 1px #567931;
 }
 #header_right #header_user #shopping_cart a:after {
  color: white;
 }
 #header_right #header_user #shopping_cart a:hover {
  color: white;
+  text-shadow: 0 1px  #333;
  background: #333333;
 }

 .sf-menu {
-  background: white;
-  border-bottom: 3px solid #e8e8e8;
+  background: #f6f6f6;
+  border-bottom: 3px solid #e9e9e9;
 }
 .sf-menu > li {
-  border-right: 1px solid #e8e8e8;
+  border-right: 1px solid #d6d4d4;
 }
-.sf-menu > li a {
-  border-bottom: 3px solid #e8e8e8;
+.sf-menu > li > a {
+  border-bottom: 3px solid #e9e9e9;
 }
 .sf-menu > li.sfHover > a, .sf-menu > li > a:hover, .sf-menu > li.sfHoverForce > a {
  color: #fff;
-  background: #f44051;
-  border-bottom-color: #ce2434;
+  background: #719f41;
+  border-bottom-color: #598b24;
 }

 #home-page-tabs {
-  background: #f6f6f6;
+  background: white;
 }
 #home-page-tabs > li.active a,
 #home-page-tabs > li a:hover {
-  background: #f44051;
+  background: #719f41;
  color: white;
 }

 .new,
 .sale {
-  background: #f44051;
+  background: #719f41;
 }
 .new:before, .new:after,
 .sale:before,
 .sale:after {
-  border-color: #ad2b34  transparent   transparent transparent;
+  border-color: #719f41  transparent   transparent transparent;
 }

 ul.product_list.grid > li .product-container {
-  background: #f6f6f6;
+  background: white;
 }
 ul.product_list.grid > li .product-container .product-image-container {
  background: white;
 }
 ul.product_list.grid > li .product-container .product-image-container .product_img_link {
-  background: #fbfbfb;
+  background: white;
 }
 ul.product_list.grid > li .product-container .product-image-container .product_img_link img {
-  background: #fbfbfb;
+  background: white;
+}
+
+.price.product-price {
+  color: #719f41;
+}
+
+.price-percent-reduction {
+  background: #719f41;
+  border-color: #719f41;
 }

 .button.lnk_view {
@@ -141,11 +161,12 @@ ul.product_list.grid > li .product-container .product-image-container .product_i
  color: white;
 }
 .button.lnk_view:hover span {
-  background: #f44051;
+  background: #719f41;
 }

 #cmsinfo_block em {
-  background: #f44051;
+  background: #719f41;
+  text-shadow: 0 1px #567931;
 }

 #facebook_block, #cmsinfo_block {
@@ -158,26 +179,43 @@ ul.product_list.grid > li .product-container .product-image-container .product_i
 }

 .footer-container #footer #social_block {
-  background: #1b1b1b;
+  background: #3f3f3f;
  padding-bottom: 15px;
 }

 .footer-container {
-  background: #1b1b1b;
+  background: #3f3f3f;
 }
@media (min-width: 768px) {
  .footer-container {
-    background: url(../img/footer-bg1.gif) repeat-x;
+    background: url(../img/footer-bg.gif) repeat-x;
  }
 }

-#footer #newsletter_block_left .form-group .form-control {
-  background: #1b1b1b;
-}
-#footer #newsletter_block_left .form-group .button-small {
-  color: #f44051;
+.footer-container #footer #social_block ul li a:hover {
+  color: #719f41;
 }

-.footer-container #footer #social_block ul li a:hover {
-  color: #f44051;
+#footer #newsletter_block_left .form-group .form-control {
+  background: #3f3f3f;
+}
+
+#footer #newsletter_block_left h4,
+.footer-container #footer #social_block h4 {
+  color: #fff;
+}
+
+.footer-container #footer h4,
+.footer-container #footer h4 a {
+  color: #719f41;
+}
+
+.footer-container #footer .bottom-footer {
+  color: #719f41;
+}
+.footer-container #footer .bottom-footer a {
+  color: #719f41;
+}
+.footer-container #footer .bottom-footer a:hover {
+  color: #fff;
 }
@@ -0,0 +1,245 @@
+body {
+  background: #282828;
+}
+
+.header-container,
+.columns-container {
+  background: url(../img/bg-theme6.jpg) repeat 50% 0;
+}
+
+#header {
+  background: none;
+}
+#header .header-row {
+  background: #333333;
+}
+#header .header-row .shop-phone {
+  color: #777;
+}
+#header .header-row .shop-phone i,
+#header .header-row .shop-phone strong {
+  color: #fff;
+}
+#header #currencies-block-top,
+#header #languages-block-top,
+#header .header-row #header_user_info {
+  border-color: #515151;
+}
+#header #currencies-block-top div.current,
+#header #languages-block-top div.current,
+#header .header-row #header_user_info a {
+  color: white;
+}
+#header #currencies-block-top div.current:hover, #header #currencies-block-top div.current.active,
+#header #languages-block-top div.current:hover,
+#header #languages-block-top div.current.active,
+#header .header-row #header_user_info a:hover,
+#header .header-row #header_user_info a.active {
+  background: #327082;
+  color: white;
+}
+#header #currencies-block-top div.current strong,
+#header #languages-block-top div.current strong {
+  color: #e4dfb9;
+}
+#header #currencies-block-top div.current:hover, #header #currencies-block-top div.current.active,
+#header #languages-block-top div.current:hover,
+#header #languages-block-top div.current.active {
+  background: #327082;
+  color: white;
+}
+#header #header #currencies-block-top ul li.selected,
+#header #header #currencies-block-top ul li:hover a,
+#header #header #languages-block-top ul li.selected,
+#header #header #languages-block-top ul li:hover a {
+  background: #327082;
+}
+#header #contact-link {
+  border-color: #515151;
+}
+#header #contact-link a {
+  color: white;
+}
+#header #contact-link a:hover, #header #contact-link a.active {
+  background: #327082;
+  color: white;
+}
+
+#header #currencies-block-top div.current:after,
+#header #languages-block-top div.current:after {
+  color: #fff;
+}
+
+#search_block_top .btn.button-search {
+  background: #327082;
+  text-shadow: 0 1px #265563;
+}
+#search_block_top .btn.button-search:hover {
+  color: white;
+  background: #333333;
+  text-shadow: 0 1px #333;
+}
+#search_block_top #search_query_top {
+  border-color: #d6d4d4;
+  background: rgba(248, 248, 248, 0.63);
+  color: #686666;
+}
+
+#header_right #header_user #shopping_cart a {
+  background: #327082;
+  color: white;
+  text-shadow: 0 1px #265563;
+}
+#header_right #header_user #shopping_cart a:after {
+  color: white;
+}
+#header_right #header_user #shopping_cart a:hover {
+  color: white;
+  text-shadow: 0 1px #333;
+  background: #333333;
+}
+
+.sf-menu {
+  background: #f6f6f6;
+  border-bottom: 3px solid #e9e9e9;
+}
+.sf-menu > li {
+  border-right: 1px solid #d6d4d4;
+}
+.sf-menu > li > a {
+  border-bottom: 3px solid #e9e9e9;
+}
+.sf-menu > li.sfHover > a, .sf-menu > li > a:hover, .sf-menu > li.sfHoverForce > a {
+  color: #fff;
+  background: #327082;
+  border-bottom-color: #1f6276;
+}
+
+ul.product_list.grid > li .product-container .product-image-container {
+  border-color: #d6d4d4;
+}
+
+#home-page-tabs {
+  background: none;
+}
+#home-page-tabs > li {
+  border-color: #d6d4d4;
+}
+#home-page-tabs > li.active a,
+#home-page-tabs > li a:hover {
+  background: #327082;
+  color: white;
+}
+
+.new,
+.sale {
+  background: #327082;
+}
+.new:before, .new:after,
+.sale:before,
+.sale:after {
+  border-color: #327082 transparent transparent transparent;
+}
+
+ul.product_list.grid > li .product-container {
+  background: none;
+}
+ul.product_list.grid > li .product-container .product-image-container {
+  background: white;
+}
+ul.product_list.grid > li .product-container .product-image-container .product_img_link {
+  background: #f1e8e3;
+}
+ul.product_list.grid > li .product-container .product-image-container .product_img_link img {
+  background: #f1e8e3;
+}
+
+.button.lnk_view {
+  text-shadow: none;
+  padding: 0;
+  border: none;
+}
+.button.lnk_view span {
+  border: 1px solid #9a9a9a;
+  padding: 12px 16px;
+  background: #f2f2f2;
+  color: white;
+}
+.button.lnk_view:hover span {
+  background: #b7b7b7;
+}
+
+.button.ajax_add_to_cart_button {
+  background: #327082;
+}
+
+.price-percent-reduction {
+  background: #327082;
+  border-color: #327082;
+}
+
+.price,
+.price.product-price {
+  color: #327082;
+}
+
+.old-price {
+  color: #b1b0b0;
+}
+
+ul.product_list.grid > li .product-container:hover {
+  background: #fff;
+  -webkit-box-shadow: 0 5px 13px rgba(0, 0, 0, 0.17);
+  -moz-box-shadow: 0 5px 13px rgba(0, 0, 0, 0.17);
+  box-shadow: 0 5px 13px rgba(0, 0, 0, 0.17);
+}
+
+.button.lnk_view span {
+  color: #333333;
+}
+
+.button.lnk_view:hover span {
+  color: #fff;
+}
+
+#cmsinfo_block em {
+  background: #327082;
+  text-shadow: 0 1px #265563;
+}
+
+#facebook_block, #cmsinfo_block {
+  background: rgba(230, 230, 230, 0.5);
+}
+
+#cmsinfo_block,
+#cmsinfo_block > div + div {
+  border-color: #d8d8d8;
+}
+
+.footer-container #footer #social_block {
+  background: none;
+  padding-bottom: 15px;
+}
+
+.footer-container {
+  background: #3f3f3f;
+}
+@media (min-width: 768px) {
+  .footer-container {
+    background: url(../img/footer-bg.gif) repeat-x;
+  }
+}
+
+#footer #newsletter_block_left .form-group .form-control {
+  background: #3c3c3c;
+}
+#footer #newsletter_block_left .form-group .button-small {
+  color: #fff;
+}
+#footer #newsletter_block_left .form-group .button-small:hover {
+  color: #e4dfb9;
+}
+
+.footer-container #footer #social_block ul li a:hover {
+  color: #e4dfb9;
+}
@@ -4,7 +4,7 @@ body {

 .header-container,
 .columns-container {
-  background: #f7f5eb;
+  background: url(../img/bg-theme7.jpg) repeat 50% 0;
 }

 #header {
@@ -14,11 +14,11 @@ body {
  background: #333333;
 }
 #header .header-row .shop-phone {
-  color: white;
+  color: #777;
 }
 #header .header-row .shop-phone i,
 #header .header-row .shop-phone strong {
-  color: #eea200;
+  color: #fff;
 }
 #header #currencies-block-top,
 #header #languages-block-top,
@@ -35,20 +35,24 @@ body {
 #header #languages-block-top div.current.active,
 #header .header-row #header_user_info a:hover,
 #header .header-row #header_user_info a.active {
-  background: #b7b7b7;
+  background: #2b2b2b;
  color: white;
 }
 #header #currencies-block-top div.current strong,
 #header #languages-block-top div.current strong {
+  color: #43bebd;
+}
+#header #currencies-block-top div.current:hover, #header #currencies-block-top div.current.active,
+#header #languages-block-top div.current:hover,
+#header #languages-block-top div.current.active {
+  background: #2b2b2b;
  color: white;
 }
-#header #currencies-block-top div.current:hover strong, #header #currencies-block-top div.current:hover:after, #header #currencies-block-top div.current.active strong, #header #currencies-block-top div.current.active:after,
-#header #languages-block-top div.current:hover strong,
-#header #languages-block-top div.current:hover:after,
-#header #languages-block-top div.current.active strong,
-#header #languages-block-top div.current.active:after {
-  background: #b7b7b7;
-  color: white;
+#header #header #currencies-block-top ul li.selected,
+#header #header #currencies-block-top ul li:hover a,
+#header #header #languages-block-top ul li.selected,
+#header #header #languages-block-top ul li:hover a {
+  background: #43bebd;
 }
 #header #contact-link {
  border-color: #515151;
@@ -57,63 +61,84 @@ body {
  color: white;
 }
 #header #contact-link a:hover, #header #contact-link a.active {
-  background: #b7b7b7;
+  background: #2b2b2b;
  color: white;
 }

+#header #currencies-block-top div.current:after,
+#header #languages-block-top div.current:after {
+  color: #fff;
+}
+
 #search_block_top .btn.button-search {
-  background: #eea200;
+  background: #43bebd;
+  text-shadow: 0 1px #379c9c;
 }
 #search_block_top .btn.button-search:hover {
  color: white;
-  background: #b7b7b7;
+  background: #333333;
+  text-shadow: 0 1px #333;
+}
+#search_block_top #search_query_top {
+  border-color: #d6d4d4;
+  background: rgba(248, 248, 248, 0.63);
+  color: #686666;
 }

 #header_right #header_user #shopping_cart a {
-  background: #eea200;
+  background: #43bebd;
  color: white;
+  text-shadow: 0 1px #379c9c;
 }
 #header_right #header_user #shopping_cart a:after {
  color: white;
 }
 #header_right #header_user #shopping_cart a:hover {
  color: white;
-  background: #b7b7b7;
+  text-shadow: 0 1px #333;
+  background: #333333;
 }

 .sf-menu {
-  background: #fffef6;
-  border-bottom: 3px solid #e2dec8;
+  background: #f6f6f6;
+  border-bottom: 3px solid #e9e9e9;
 }
 .sf-menu > li {
-  border-right: 1px solid #e2dec8;
+  border-right: 1px solid #d6d4d4;
 }
-.sf-menu > li a {
-  border-bottom: 3px solid #e2dec8;
+.sf-menu > li > a {
+  border-bottom: 3px solid #e9e9e9;
 }
 .sf-menu > li.sfHover > a, .sf-menu > li > a:hover, .sf-menu > li.sfHoverForce > a {
  color: #fff;
-  background: #eea200;
-  border-bottom-color: #da9400;
+  background: #43bebd;
+  border-bottom-color: #2aa2a1;
+}
+
+ul.product_list.grid > li .product-container .product-image-container {
+  border-color: #d6d4d4;
 }

 #home-page-tabs {
  background: none;
 }
+#home-page-tabs > li {
+  border-color: #d6d4d4;
+}
 #home-page-tabs > li.active a,
 #home-page-tabs > li a:hover {
-  background: #eea200;
+  background: #43bebd;
  color: white;
 }

 .new,
 .sale {
-  background: #eea200;
+  background: #43bebd;
 }
 .new:before, .new:after,
 .sale:before,
 .sale:after {
-  border-color: #eea200 transparent transparent transparent;
+  border-color: #43bebd transparent transparent transparent;
 }

 ul.product_list.grid > li .product-container {
@@ -144,17 +169,51 @@ ul.product_list.grid > li .product-container .product-image-container .product_i
  background: #b7b7b7;
 }

+.button.ajax_add_to_cart_button {
+  background: #43bebd;
+}
+
+.price-percent-reduction {
+  background: #43bebd;
+  border-color: #43bebd;
+}
+
+.price,
+.price.product-price {
+  color: #43bebd;
+}
+
+.old-price {
+  color: #b1b0b0;
+}
+
+ul.product_list.grid > li .product-container:hover {
+  background: #fff;
+  -webkit-box-shadow: 0 5px 13px rgba(0, 0, 0, 0.17);
+  -moz-box-shadow: 0 5px 13px rgba(0, 0, 0, 0.17);
+  box-shadow: 0 5px 13px rgba(0, 0, 0, 0.17);
+}
+
+.button.lnk_view span {
+  color: #333333;
+}
+
+.button.lnk_view:hover span {
+  color: #fff;
+}
+
 #cmsinfo_block em {
-  background: #eea200;
+  background: #43bebd;
+  text-shadow: 0 1px #379c9c;
 }

 #facebook_block, #cmsinfo_block {
-  background: #f0eee1;
+  background: rgba(230, 230, 230, 0.5);
 }

 #cmsinfo_block,
 #cmsinfo_block > div + div {
-  border-color: #e9e6d6;
+  border-color: #d8d8d8;
 }

 .footer-container #footer #social_block {
@@ -175,9 +234,12 @@ ul.product_list.grid > li .product-container .product-image-container .product_i
  background: #3c3c3c;
 }
 #footer #newsletter_block_left .form-group .button-small {
-  color: #eea200;
+  color: #fff;
+}
+#footer #newsletter_block_left .form-group .button-small:hover {
+  color: #43bebd;
 }

 .footer-container #footer #social_block ul li a:hover {
-  color: #eea200;
+  color: #43bebd;
 }
@@ -0,0 +1,245 @@
+body {
+  background: #282828;
+}
+
+.header-container,
+.columns-container {
+  background: url(../img/bg-theme8.jpg) repeat 50% 0;
+}
+
+#header {
+  background: none;
+}
+#header .header-row {
+  background: #333333;
+}
+#header .header-row .shop-phone {
+  color: #777;
+}
+#header .header-row .shop-phone i,
+#header .header-row .shop-phone strong {
+  color: #eea200;
+}
+#header #currencies-block-top,
+#header #languages-block-top,
+#header .header-row #header_user_info {
+  border-color: #515151;
+}
+#header #currencies-block-top div.current,
+#header #languages-block-top div.current,
+#header .header-row #header_user_info a {
+  color: white;
+}
+#header #currencies-block-top div.current:hover, #header #currencies-block-top div.current.active,
+#header #languages-block-top div.current:hover,
+#header #languages-block-top div.current.active,
+#header .header-row #header_user_info a:hover,
+#header .header-row #header_user_info a.active {
+  background: #2b2b2b;
+  color: white;
+}
+#header #currencies-block-top div.current strong,
+#header #languages-block-top div.current strong {
+  color: #eea200;
+}
+#header #currencies-block-top div.current:hover, #header #currencies-block-top div.current.active,
+#header #languages-block-top div.current:hover,
+#header #languages-block-top div.current.active {
+  background: #2b2b2b;
+  color: white;
+}
+#header #header #currencies-block-top ul li.selected,
+#header #header #currencies-block-top ul li:hover a,
+#header #header #languages-block-top ul li.selected,
+#header #header #languages-block-top ul li:hover a {
+  background: #eea200;
+}
+#header #contact-link {
+  border-color: #515151;
+}
+#header #contact-link a {
+  color: white;
+}
+#header #contact-link a:hover, #header #contact-link a.active {
+  background: #2b2b2b;
+  color: white;
+}
+
+#header #currencies-block-top div.current:after,
+#header #languages-block-top div.current:after {
+  color: #fff;
+}
+
+#search_block_top .btn.button-search {
+  background: #eea200;
+  text-shadow: 0 1px #b57b00;
+}
+#search_block_top .btn.button-search:hover {
+  color: white;
+  background: #333333;
+  text-shadow: 0 1px #333;
+}
+#search_block_top #search_query_top {
+  border-color: #e2dec8;
+  background: rgba(248, 248, 248, 0.63);
+  color: #686666;
+}
+
+#header_right #header_user #shopping_cart a {
+  background: #eea200;
+  color: white;
+  text-shadow: 0 1px #b57b00;
+}
+#header_right #header_user #shopping_cart a:after {
+  color: white;
+}
+#header_right #header_user #shopping_cart a:hover {
+  color: white;
+  text-shadow: 0 1px #333;
+  background: #333333;
+}
+
+.sf-menu {
+  background: #fffef6;
+  border-bottom: 3px solid #e2dec8;
+}
+.sf-menu > li {
+  border-right: 1px solid #e2dec8;
+}
+.sf-menu > li > a {
+  border-bottom: 3px solid #e2dec8;
+}
+.sf-menu > li.sfHover > a, .sf-menu > li > a:hover, .sf-menu > li.sfHoverForce > a {
+  color: #fff;
+  background: #eea200;
+  border-bottom-color: #da9400;
+}
+
+ul.product_list.grid > li .product-container .product-image-container {
+  border-color: #e2dec8;
+}
+
+#home-page-tabs {
+  background: none;
+}
+#home-page-tabs > li {
+  border-color: #e2dec8;
+}
+#home-page-tabs > li.active a,
+#home-page-tabs > li a:hover {
+  background: #eea200;
+  color: white;
+}
+
+.new,
+.sale {
+  background: #eea200;
+}
+.new:before, .new:after,
+.sale:before,
+.sale:after {
+  border-color: #eea200 transparent transparent transparent;
+}
+
+ul.product_list.grid > li .product-container {
+  background: none;
+}
+ul.product_list.grid > li .product-container .product-image-container {
+  background: white;
+}
+ul.product_list.grid > li .product-container .product-image-container .product_img_link {
+  background: #f1e8e3;
+}
+ul.product_list.grid > li .product-container .product-image-container .product_img_link img {
+  background: #f1e8e3;
+}
+
+.button.lnk_view {
+  text-shadow: none;
+  padding: 0;
+  border: none;
+}
+.button.lnk_view span {
+  border: 1px solid #9a9a9a;
+  padding: 12px 16px;
+  background: #f2f2f2;
+  color: white;
+}
+.button.lnk_view:hover span {
+  background: #b7b7b7;
+}
+
+.button.ajax_add_to_cart_button {
+  background: #eea200;
+}
+
+.price-percent-reduction {
+  background: #eea200;
+  border-color: #eea200;
+}
+
+.price,
+.price.product-price {
+  color: #eea200;
+}
+
+.old-price {
+  color: #b1b0b0;
+}
+
+ul.product_list.grid > li .product-container:hover {
+  background: #fff;
+  -webkit-box-shadow: 0 5px 13px rgba(0, 0, 0, 0.17);
+  -moz-box-shadow: 0 5px 13px rgba(0, 0, 0, 0.17);
+  box-shadow: 0 5px 13px rgba(0, 0, 0, 0.17);
+}
+
+.button.lnk_view span {
+  color: #333333;
+}
+
+.button.lnk_view:hover span {
+  color: #fff;
+}
+
+#cmsinfo_block em {
+  background: #eea200;
+  text-shadow: 0 1px #b57b00;
+}
+
+#facebook_block, #cmsinfo_block {
+  background: rgba(219, 213, 185, 0.5);
+}
+
+#cmsinfo_block,
+#cmsinfo_block > div + div {
+  border-color: #dbd5b9;
+}
+
+.footer-container #footer #social_block {
+  background: none;
+  padding-bottom: 15px;
+}
+
+.footer-container {
+  background: #3f3f3f;
+}
+@media (min-width: 768px) {
+  .footer-container {
+    background: url(../img/footer-bg.gif) repeat-x;
+  }
+}
+
+#footer #newsletter_block_left .form-group .form-control {
+  background: #3c3c3c;
+}
+#footer #newsletter_block_left .form-group .button-small {
+  color: #fff;
+}
+#footer #newsletter_block_left .form-group .button-small:hover {
+  color: #eea200;
+}
+
+.footer-container #footer #social_block ul li a:hover {
+  color: #eea200;
+}
@@ -30,12 +30,12 @@
 <table class="discount table table-bordered footab">
 	<thead>
 		<tr>
-			<th class="discount_code first_item">{l s='Code'}</th>
-			<th class="discount_description item">{l s='Description'}</th>
+			<th data-sort-ignore="true" class="discount_code first_item">{l s='Code'}</th>
+			<th data-sort-ignore="true" class="discount_description item">{l s='Description'}</th>
 			<th class="discount_quantity item">{l s='Quantity'}</th>
-			<th data-hide="phone,tablet" class="discount_value item">{l s='Value'}*</th>
+			<th data-sort-ignore="true" data-hide="phone,tablet" class="discount_value item">{l s='Value'}*</th>
 			<th data-hide="phone,tablet" class="discount_minimum item">{l s='Minimum'}</th>
-			<th data-hide="phone,tablet" class="discount_cumulative item">{l s='Cumulative'}</th>
+			<th data-sort-ignore="true" data-hide="phone,tablet" class="discount_cumulative item">{l s='Cumulative'}</th>
 			<th data-hide="phone" class="discount_expiration_date last_item">{l s='Expiration date'}</th>
 		</tr>
 	</thead>
@@ -44,7 +44,7 @@
 		<tr class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{else}item{/if} {if $smarty.foreach.myLoop.index % 2}alternate_item{/if}">
 			<td class="discount_code">{$discountDetail.code}</td>
 			<td class="discount_description">{$discountDetail.name}</td>
-			<td class="discount_quantity">{$discountDetail.quantity_for_user}</td>
+			<td date-value="{$discountDetail.quantity_for_user}" class="discount_quantity">{$discountDetail.quantity_for_user}</td>
 			<td class="discount_value">
 				{if $discountDetail.id_discount_type == 1}
 					{$discountDetail.value|escape:'htmlall':'UTF-8'}%
@@ -56,7 +56,7 @@
 					-
 				{/if}
 			</td>
-			<td class="discount_minimum">
+			<td class="discount_minimum" date-value="{if $discountDetail.minimal == 0}0{else}{$discountDetail.minimal}{/if}">
 				{if $discountDetail.minimal == 0}
 					{l s='None'}
 				{else}
@@ -70,7 +70,7 @@
 					<i class="icon-remove icon"></i> {l s='No'}
 				{/if}
 			</td>
-			<td class="discount_expiration_date">{dateFormat date=$discountDetail.date_to}</td>
+			<td class="discount_expiration_date" date-value="{$discountDetail.date_to|regex_replace:"/[\-\:\ ]/":""}">{dateFormat date=$discountDetail.date_to}</td>
 		</tr>
 	{/foreach}
 	</tbody>
@@ -29,7 +29,7 @@
 <!--[if gt IE 8]> <html class="no-js ie9" lang="{$lang_iso}"> <![endif]-->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{$lang_iso}">
 	<head>
-		<title>{$meta_title|escape:'htmlall':'UTF-8'}</title>
+		<title>{$meta_title|escape:'html':'UTF-8'}</title>
 {if isset($meta_description) AND $meta_description}
 		<meta name="description" content="{$meta_description|escape:html:'UTF-8'}" />
 {/if}
@@ -88,6 +88,7 @@
 <script src="{$js_dir}/jquery/highdpi.js"></script>
 <script src="{$js_dir}/jquery/jquery.bxslider.js"></script>
 <script src="{$js_dir}/jquery/footable.js"></script>
+<script src="{$js_dir}/jquery/footable.sort.js"></script>
 <script src="{$js_dir}/jquery/resonsive_utilites.js"></script>
 		{$HOOK_HEADER}
 	</head>
@@ -36,13 +36,13 @@
 	<table id="order-list" class="table table-bordered footab">
 		<thead>
 			<tr>
-				<th class="first_item">{l s='Order reference'}</th>
+				<th class="first_item" data-sort-ignore="true">{l s='Order reference'}</th>
 				<th class="item">{l s='Date'}</th>
 				<th data-hide="phone" class="item">{l s='Total price'}</th>
-				<th data-hide="phone,tablet" class="item">{l s='Payment'}</th>
+				<th data-sort-ignore="true" data-hide="phone,tablet" class="item">{l s='Payment'}</th>
 				<th class="item">{l s='Status'}</th>
-				<th data-hide="phone,tablet" class="item">{l s='Invoice'}</th>
-				<th data-hide="phone,tablet" class="last_item">&nbsp;</th>
+				<th data-sort-ignore="true" data-hide="phone,tablet" class="item">{l s='Invoice'}</th>
+				<th data-sort-ignore="true" data-hide="phone,tablet" class="last_item">&nbsp;</th>
 			</tr>
 		</thead>
 		<tbody>
@@ -52,10 +52,10 @@
 					{if isset($order.invoice) && $order.invoice && isset($order.virtual) && $order.virtual}<img src="{$img_dir}icon/download_product.gif" class="icon" alt="{l s='Products to download'}" title="{l s='Products to download'}" />{/if}
 					<a class="color-myaccount" href="javascript:showOrder(1, {$order.id_order|intval}, '{$link->getPageLink('order-detail', true)|escape:'html'}');">{Order::getUniqReferenceOf($order.id_order)}</a>
 				</td>
-				<td class="history_date bold">{dateFormat date=$order.date_add full=0}</td>
-				<td class="history_price"><span class="price">{displayPrice price=$order.total_paid currency=$order.id_currency no_utf8=false convert=false}</span></td>
+				<td data-value="{$order.date_add|regex_replace:"/[\-\:\ ]/":""}" class="history_date bold">{dateFormat date=$order.date_add full=0}</td>
+				<td class="history_price" data-value="{$order.total_paid}"><span class="price">{displayPrice price=$order.total_paid currency=$order.id_currency no_utf8=false convert=false}</span></td>
 				<td class="history_method">{$order.payment|escape:'htmlall':'UTF-8'}</td>
-				<td class="history_state">{if isset($order.order_state)}<span class="label{if $order.id_order_state == 1 || $order.id_order_state == 10 || $order.id_order_state == 11} label-info{elseif $order.id_order_state == 5 || $order.id_order_state == 2 || $order.id_order_state == 12} label-success{elseif $order.id_order_state == 6 || $order.id_order_state == 7 || $order.id_order_state == 8} label-danger{elseif $order.id_order_state == 3 || $order.id_order_state == 9 || $order.id_order_state == 4} label-warning{/if}">{$order.order_state|escape:'htmlall':'UTF-8'}</span>{/if}</td>
+				<td data-value="{$order.id_order_state}" class="history_state">{if isset($order.order_state)}<span class="label{if $order.id_order_state == 1 || $order.id_order_state == 10 || $order.id_order_state == 11} label-info{elseif $order.id_order_state == 5 || $order.id_order_state == 2 || $order.id_order_state == 12} label-success{elseif $order.id_order_state == 6 || $order.id_order_state == 7 || $order.id_order_state == 8} label-danger{elseif $order.id_order_state == 3 || $order.id_order_state == 9 || $order.id_order_state == 4} label-warning{/if}">{$order.order_state|escape:'htmlall':'UTF-8'}</span>{/if}</td>
 				<td class="history_invoice">
 				{if (isset($order.invoice) && $order.invoice && isset($order.invoice_number) && $order.invoice_number) && isset($invoiceAllowed) && $invoiceAllowed == true}
 					<a class="link-button" href="{$link->getPageLink('pdf-invoice', true, NULL, "id_order={$order.id_order}")|escape:'html'}" title="{l s='Invoice'}" class="_blank"><i class="icon-file-text large"></i>{l s='PDF'}</a>
@@ -75,6 +75,21 @@
 		{/foreach}
 		</tbody>
 	</table>
+    <script type="text/javascript">
+		$(function () {
+            $('.sort-column').click(function (e) {
+                e.preventDefault();
+
+                //get the footable sort object
+                var footableSort = $('table').data('footable-sort');
+
+                //get the index we are wanting to sort by
+                var index = $(this).data('index');
+
+                footableSort.doSort(index, 'toggle');
+            });
+        });
+	</script>
 	<div id="block-order-detail" class="unvisible">&nbsp;</div>
 	{else}
 		<p class="alert alert-warning">{l s='You have not placed any orders.'}</p>
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`#content.nobootstrap { background-color: white; width: 1200px; padding: 80px 40px; }`