diff --git a/Resources/Public/Css/Aimeos/aimeos.css b/Resources/Public/Css/Aimeos/aimeos.css
index 2356adc..2ba8028 100644
--- a/Resources/Public/Css/Aimeos/aimeos.css
+++ b/Resources/Public/Css/Aimeos/aimeos.css
@@ -2,7 +2,7 @@
  * Aimeos elegance template CSS
  *
  * @license LGPLv3, http://opensource.org/licenses/LGPL-3.0
- * @copyright Aimeos (aimeos.org), 2014-2017
+ * @copyright Aimeos (aimeos.org), 2014-2018
  */
 
 @font-face {
@@ -16,10 +16,6 @@
 }
 
 
-.aimeos .product .col-xs-12 {
-	padding-left: 0px;
-	padding-right: 0px;
-}
 
 .aimeos .btn {
 	vertical-align: top;
@@ -35,8 +31,8 @@
 }
 
 .aimeos .btn-primary:hover {
-    background-color: #003c1b;
-	border: solid 1px #003c1b;
+    background-color: #003C1B;
+	border: solid 1px #003C1B;
 }
 
 .aimeos .btn:focus,
@@ -51,9 +47,8 @@
 	vertical-align: top;
 }
 
-.aimeos .form-inline .btn,
 .aimeos .input-group .btn {
-	width: auto;
+	width: calc(100% - 4em);
 }
 
 .aimeos .addbasket input {
@@ -62,6 +57,10 @@
 	width: 4em;
 }
 
+.aimeos .input-group {
+	width: 100%;
+}
+
 .aimeos .input-lg {
 	height: auto;
 }
@@ -81,11 +80,11 @@
 }
 
 .aimeos h1 {
-	font-size: 150%;
+	font-size: 125%;
 }
 
 .aimeos h2 {
-	font-size: 125%;
+	font-size: 110%;
 }
 
 .aimeos a:link:not(.btn),
@@ -122,6 +121,10 @@
 	padding: 1em 0;
 }
 
+.aimeos .button-group .btn {
+	margin: 0.25em;
+}
+
 .aimeos .error-list {
 	background-color: #ffeeee;
 	border: solid 1px #FF3300;
@@ -382,16 +385,19 @@
 .catalog-filter-tree .disabled > .cat-item,
 .catalog-filter-tree .disabled > .cat-item:link,
 .catalog-filter-tree .disabled > .cat-item:visited,
+.catalog-filter-supplier .disabled .attr-name,
 .catalog-filter-attribute .disabled .attr-name {
 	color: #B0B0B0;
 }
 
 .catalog-filter-tree .cat-count:before,
+.catalog-filter-supplier .attr-count:before,
 .catalog-filter-attribute .attr-count:before {
 	content: "(";
 }
 
 .catalog-filter-tree .cat-count:after,
+.catalog-filter-supplier .attr-count:after,
 .catalog-filter-attribute .attr-count:after {
 	content: ")";
 }
@@ -424,6 +430,7 @@
 .catalog-filter-search .value {
 	border-color: #00883E;
 	border-right: none;
+	margin: 0;
 }
 
 .catalog-filter-search .reset {
@@ -432,6 +439,7 @@
 	border-right: none;
 	border-left: none;
 	width: 10% !important;
+	margin: 0;
 }
 
 .catalog-filter-search .reset .symbol {
@@ -450,6 +458,7 @@
 
 .catalog-filter-search .btn-primary {
 	width: 20% !important;
+	margin: 0;
 }
 
 .catalog-filter-search .ui-helper-hidden-accessible {
@@ -463,11 +472,11 @@
 
 .catalog-filter-tree > h2 {
 	border-bottom: solid 1px #00883E;
-	display: inline-block;
-	font-size: 150%;
+	font-size: 100%;
 	cursor: pointer;
+	display: block;
 	float: left;
-	width: 49.99%;
+	width: 33.33%;
 	padding: 0.5em;
 	margin: 0 0 1em 0;
 }
@@ -530,30 +539,33 @@ html.no-js .catalog-filter-tree:hover > ul {
 	content: " ×";
 }
 
-/* Catalog filter, attribute section */
+/* Catalog filter, attribute and supplier section */
 .catalog-filter-attribute {
 	margin: 1em 0;
 }
 
-.catalog-filter-attribute > h2 {
+.catalog-filter-attribute > h2,
+.catalog-filter-supplier > h2 {
 	border-bottom: solid 1px #00883E;
-	display: inline-block;
 	text-align: center;
-	font-size: 150%;
+	font-size: 100%;
 	cursor: pointer;
-	width: 49.99%;
-	float: right;
+	width: 33.33%;
+	float: left;
+	display: block;
 	padding: 0.5em;
 	margin: 0 0 1em 0;
 }
 
-.catalog-filter-attribute .attribute-lists {
+.catalog-filter-attribute .attribute-lists,
+.catalog-filter-supplier .supplier-lists {
 	text-align: left;
 	display: none;
 	clear: both;
 }
 
-html.no-js .catalog-filter-attribute:hover .attribute-lists {
+html.no-js .catalog-filter-attribute:hover .attribute-lists,
+html.no-js .catalog-filter-supplier:hover .supplier-lists {
 	display: block;
 }
 
@@ -587,15 +599,16 @@ html.no-js .catalog-filter-attribute:hover .attribute-lists {
 	content: " ×";
 }
 
-.catalog-filter-attribute fieldset {
+.catalog-filter-attribute fieldset,
+.catalog-filter-supplier fieldset {
 	border-left: 1px solid #D0D0D0;
 	background-color: #FFF;
 	display: inline-block;
 	vertical-align: top;
 	font-weight: normal;
 	text-align: left;
-	min-width: 280px;
-	width: 24.9%;
+	min-width: 160px;
+	width: 29.9%;
 	color: #555;
 	line-height: 1;
 	margin: 0.5em 0;
@@ -618,31 +631,37 @@ html.no-js .catalog-filter-attribute:hover .attribute-lists {
 	content: "▼ ";
 }
 
-.catalog-filter-attribute .attribute-lists .attr-list {
+.catalog-filter-attribute .attribute-lists .attr-list,
+.catalog-filter-supplier .supplier-lists .attr-list {
 	overflow: auto;
 	padding: 0 0.5em;
 	height: 12em;
 }
 
-.catalog-filter-attribute .attribute-lists li.attr-item {
+.catalog-filter-attribute .attribute-lists li.attr-item,
+.catalog-filter-supplier .supplier-lists li.attr-item {
 	display: block;
 	padding: 0.4em 0;
 	margin: 0;
 }
 
-.catalog-filter-attribute input.attr-item {
+.catalog-filter-attribute input.attr-item,
+.catalog-filter-supplier input.attr-item {
 	border: 1px solid #D0D0D0;
 }
 
-.catalog-filter-attribute input.attr-item[type=checkbox] {
+.catalog-filter-attribute input.attr-item[type=checkbox],
+.catalog-filter-supplier input.attr-item[type=checkbox] {
 	display: none;
 }
 
-.catalog-filter-attribute input.attr-item[type=checkbox]:checked + label:before {
+.catalog-filter-attribute input.attr-item[type=checkbox]:checked + label:before,
+.catalog-filter-supplier input.attr-item[type=checkbox]:checked + label:before {
 	content: "\2713";
 }
 
-.catalog-filter-attribute label:before {
+.catalog-filter-attribute label:before,
+.catalog-filter-supplier label:before {
 	border: solid 1px #555;
 	display: inline-block;
 	vertical-align: top;
@@ -653,24 +672,29 @@ html.no-js .catalog-filter-attribute:hover .attribute-lists {
 	margin-right: 0.25em;
 }
 
-.catalog-filter-attribute .media-list {
+.catalog-filter-attribute .media-list,
+.catalog-filter-supplier .media-list {
 	display: inline-block;
 }
 
-.catalog-filter-attribute .media-item img {
-	vertical-align: top;
+.catalog-filter-attribute .media-item img,
+.catalog-filter-supplier .media-item img {
 	height: 1em;
 	width: 1em;
 }
 
 .catalog-filter-attribute .attr-name,
-.catalog-filter-attribute .attr-count {
+.catalog-filter-attribute .attr-count,
+.catalog-filter-supplier .attr-name,
+.catalog-filter-supplier .attr-count {
 	font-weight: normal;
 	cursor: pointer;
 }
 
 .catalog-filter-attribute .attr-length li.attr-item,
-.catalog-filter-attribute .attr-width li.attr-item {
+.catalog-filter-attribute .attr-width li.attr-item,
+.catalog-filter-supplier .attr-length li.attr-item,
+.catalog-filter-supplier .attr-width li.attr-item {
 	display: inline-block;
 	min-width: 7.5em;
 	width: 50%;
@@ -801,7 +825,7 @@ html.no-js .catalog-filter-attribute:hover .attribute-lists {
 	outline: none;
 }
 
-.aimeos .product .list-items {
+.aimeos .list-items {
 	text-align: center;
 	font-size: 90%;
 	padding: 0;
@@ -838,9 +862,6 @@ html.no-js .catalog-filter-attribute:hover .attribute-lists {
 	width: 240px;
 }
 
-.catalog-list a .media-list:hover {
-}
-
 .catalog-list a .media-item {
 	background-color: #FFFFFF;
 	background-image: url(media/progress.gif);
@@ -867,8 +888,8 @@ html.no-js .catalog-filter-attribute:hover .attribute-lists {
 
 .aimeos .product .text-list h2 {
 	text-transform: uppercase;
-	font-weight: 800;
-	font-size: large;
+	font-weight: normal;
+	font-size: 100%;
 	overflow: hidden;
 	height: 2em;
 	margin: 0;
@@ -941,7 +962,7 @@ html.no-js .catalog-filter-attribute:hover .attribute-lists {
 }
 
 .catalog-list-head h1 {
-	font-size: 2em;
+	font-size: 1.5em;
 	font-weight: bold;
 	padding: 0.5em 0;
 	margin: 0;
@@ -1005,7 +1026,7 @@ html.no-js .catalog-filter-attribute:hover .attribute-lists {
 }
 
 .catalog-list-items .addbasket .input-group {
-	padding: 0.5em 0;
+	padding: 2.25em 0;
 	margin: auto;
 }
 
@@ -1025,7 +1046,7 @@ html.no-js .catalog-filter-attribute:hover .attribute-lists {
 .catalog-list-items .list .basket,
 .catalog-list-items .list .offer,
 .catalog-list-items .list .addbasket {
-	display: inline-block;
+	display: block;
 	width: 240px;
 	float: right;
 }
@@ -1073,6 +1094,7 @@ html.no-js .catalog-filter-attribute:hover .attribute-lists {
 /* Product images */
 .catalog-detail-image {
 	background-color: #ffffff;
+	margin-bottom: 2em;
 }
 
 .catalog-detail-image .image-single {
@@ -1084,8 +1106,9 @@ html.no-js .catalog-filter-attribute:hover .attribute-lists {
 	display: inline-block;
 	position: relative;
 	overflow: hidden;
-	width: 400px;
+	max-width: 400px;
 	height: 533px;
+	width: 100%;
 }
 
 .catalog-detail-image .image-single figcaption {
@@ -1094,15 +1117,16 @@ html.no-js .catalog-filter-attribute:hover .attribute-lists {
 
 .catalog-detail-image .item {
 	background-repeat: no-repeat;
-	background-position: center top;
+	background-position: center;
 	background-color: #FFFFFF;
 	background-size: contain;
 }
 
 .catalog-detail-image .image-single .item {
 	display: inline-block;
-	width: 400px;
+	max-width: 400px;
 	height: 533px;
+	width: 100%;
 }
 
 .catalog-detail-image .thumbs .item {
@@ -1144,8 +1168,9 @@ html.no-js .catalog-filter-attribute:hover .attribute-lists {
 
 .catalog-detail-image .thumbs-horizontal {
 	overflow: hidden;
+	max-width: 400px;
+	width: 100%;
 	height: 105px;
-	width: 400px;
 }
 
 .catalog-detail-image .thumbs-horizontal button {
@@ -1157,7 +1182,7 @@ html.no-js .catalog-filter-attribute:hover .attribute-lists {
 
 .catalog-detail-image .thumbs-horizontal .thumbs {
 	display: inline-block !important;
-	width: 320px;
+	width: calc(100% - 80px);
 }
 
 .catalog-detail-image .thumbs-horizontal .item {
@@ -1178,10 +1203,6 @@ html.no-js .catalog-filter-attribute:hover .attribute-lists {
 }
 
 /* Product detail, basic section */
-.catalog-detail-basic {
-	margin: 1% 0;
-}
-
 .catalog-detail-basic h1.name {
 	text-transform: uppercase;
 	font-size: 110%;
@@ -1193,7 +1214,6 @@ html.no-js .catalog-filter-attribute:hover .attribute-lists {
 
 .catalog-detail-basic .code {
 	font-size: 80%;
-	display: none;
 }
 
 .catalog-detail-basic .short {
@@ -1316,7 +1336,6 @@ html.no-js .catalog-filter-attribute:hover .attribute-lists {
 .catalog-detail-basket .price-item:first-of-type .taxrate {
 	display: inline-block;
 	padding: 0 1em;
-	display: none;
 }
 
 .catalog-detail-basket .price-item:first-of-type .quantity,
@@ -1434,8 +1453,7 @@ html.no-js .catalog-filter-attribute:hover .attribute-lists {
 
 .catalog-list-items .selection .select-label,
 .catalog-detail-basket .selection .select-label {
-	width: 100%;
-	padding-left: 0px;
+	width: calc(100% - 4em);
 	font-weight: normal;
 }
 
@@ -1451,9 +1469,26 @@ html.no-js .catalog-filter-attribute:hover .attribute-lists {
 	min-width: 1.5em;
 }
 
+.catalog-list-items .selection .radio .select-label > span,
+.catalog-detail-basket .selection .radio .select-label > span {
+	text-align: center;
+	min-width: 2.5em;
+	display: block;
+	padding: 0;
+}
+
+.catalog-list-items .selection .radio .select-label,
+.catalog-detail-basket .selection .radio .select-label {
+	border: solid 1px #ccc;
+	padding: 0.5em;
+	width: auto;
+}
+
 .catalog-list-items .selection .select-option:checked + .select-label,
 .catalog-detail-basket .selection .select-option:checked + .select-label {
 	border: solid 1px #00883E;
+	background-color: #00883E;
+	color: #fff;
 }
 
 .catalog-list-items .selection .select-option:disabled + .select-label,
@@ -1471,7 +1506,7 @@ html.no-js .catalog-filter-attribute:hover .attribute-lists {
 	border: solid 1px #00883E;
 	text-align: center;
 	padding: 0;
-	width: 3em;
+	width: 4em;
 }
 
 .catalog-list-items .selection .custom input[type=number],
@@ -1491,7 +1526,7 @@ html.no-js .catalog-filter-attribute:hover .attribute-lists {
 .catalog-detail-basket .selection .media-item > img {
 	border: none;
 	height: 1.33em;
-	width: auto;
+	width: 1.33em;
 }
 
 .catalog-list-items .selection .media-item + span,
@@ -1645,6 +1680,7 @@ html.no-js .catalog-filter-attribute:hover .attribute-lists {
 	padding: 0;
 }
 
+.account-subscription .header,
 .account-history .header,
 .account-watch .header,
 .account-favorite .header,
@@ -1731,8 +1767,8 @@ html.no-js .catalog-filter-attribute:hover .attribute-lists {
 	margin: 0;
 	padding: 0;
 	height: 3em;
-	font-size: large;
-	font-weight: 800;
+	font-size: 100%;
+	font-weight: normal;
 	text-align: center;
 	overflow: hidden;
 	text-transform: uppercase;
@@ -1981,8 +2017,13 @@ html.no-js .catalog-filter-attribute:hover .attribute-lists {
 	padding: 0.5em;
 }
 
+.basket-standard-coupon .coupon-new .btn {
+	width: 3em;
+}
+
 .basket-standard-coupon .coupon-new .coupon-code {
 	border: 1px solid #00883E;
+	width: calc(100% - 3em);
 }
 
 .basket-standard-coupon .minibutton.delete:after {
@@ -2238,10 +2279,6 @@ html.no-js .catalog-filter-attribute:hover .attribute-lists {
 	margin: 1em 0.5em;
 }
 
-.checkout-standard-delivery .item-service  input,
-.checkout-standard-payment .item-service  input {
-}
-
 .checkout-standard-delivery .item-service .price-value,
 .checkout-standard-payment .item-service .price-value {
 	margin: 1.25em;
@@ -2448,8 +2485,8 @@ html.no-js .catalog-filter-attribute:hover .attribute-lists {
 }
 
 .aimeos .common-summary-detail td.quantity input {
+	display: inline-block;
 	text-align: center;
-	display: inline;
 	width: 3em;
 }
 
@@ -2507,9 +2544,9 @@ html.no-js .catalog-filter-attribute:hover .attribute-lists {
 
 
 /* Checkout summary option terms */
-.checkout-standard-summary-option-account,
-.checkout-standard-summary-option-terms {
-	margin: 1em;
+.checkout-standard-summary-option {
+	padding-top: 0.5em;
+	padding-bottom: 1em;
 }
 
 .checkout-standard-summary-option h3 {
@@ -2536,6 +2573,7 @@ html.no-js .catalog-filter-attribute:hover .attribute-lists {
 	margin-left: 0.5em;
 }
 
+
 /* Checkout order */
 .checkout-standard-order {
 	padding: 0 0 0 1em;
@@ -2575,7 +2613,6 @@ html.no-js .catalog-filter-attribute:hover .attribute-lists {
 
 /* Account history */
 .account-history {
-	min-width: 240px;
 	margin: 0 auto;
 }
 
@@ -2593,24 +2630,18 @@ html.no-js .catalog-filter-attribute:hover .attribute-lists {
 	padding: 0.25em 0;
 }
 
-.account-history-list li.attr-item {
-	display: inline-block;
+.account-history-list .attr-item {
 	padding: 0.25em 1em;
-	margin: 0;
-	width: 50%;
-}
-
-.account-history-list li.attr-item .name,
-.account-history-list li.attr-item .value {
-	display: inline-block;
-	vertical-align: top;
-	min-width: 208px;
 }
 
 .account-history-list li.attr-item .name:after {
 	content: ": ";
 }
 
+.account-history-order {
+	padding-top: 1em;
+}
+
 .account-history-order a:hover {
 	text-decoration: underline;
 }
@@ -2636,6 +2667,82 @@ html.no-js .catalog-filter-attribute:hover .attribute-lists {
 	min-width: 0;
 }
 
+/* Account subscription */
+.account-subscription {
+	margin: 0 auto;
+}
+
+.account-subscription-list .subscription-list {
+	padding: 0;
+}
+
+.account-subscription-list .subscription-item {
+	border: solid 1px #D0D0D0;
+	display: block;
+	margin: 1em;
+}
+
+.account-subscription-list .attr-list {
+	padding: 0.25em 0;
+}
+
+.account-subscription-list .attr-item {
+	padding: 0.25em 1em;
+}
+
+.account-subscription-list .attr-item .name:after {
+	content: ": ";
+}
+
+.account-subscription-list .subscription-cancel {
+	text-align: center;
+}
+
+.account-subscription-list .subscription-cancel .delete {
+	display: block;
+	margin: 0.5em 0;
+}
+
+.account-subscription-list .subscription-cancel .delete:after {
+	font: normal normal normal 14px/1 FontAwesome;
+	content: "\f014";
+}
+
+.account-subscription-list .subscription-item {
+	display: -webkit-flex;
+	display: flex;
+	flex-wrap: wrap;
+}
+
+.account-subscription-detail {
+	padding-top: 1em;
+}
+
+.account-subscription-detail a:hover {
+	text-decoration: underline;
+}
+
+.account-subscription-detail .modify {
+	float: right;
+	margin: 0 1em;
+}
+
+.account-subscription-detail h2 {
+	margin: 0.5em 0;
+}
+
+.account-subscription-detail h3 {
+	display: inline-block;
+	font-size: 1em;
+	margin: 0;
+}
+
+
+.account-subscription-detail .attr-item .name,
+.account-subscription-detail .attr-item .value {
+	min-width: 0;
+}
+
 
 /*! jQuery UI - v1.10.0 - 2013-01-17
 * http://jqueryui.com
@@ -2882,11 +2989,14 @@ html.no-js .catalog-filter-attribute:hover .attribute-lists {
   -webkit-text-size-adjust: 100%;
   /* create separate layer, to avoid paint on window.onscroll in webkit/blink */
   -webkit-backface-visibility: hidden;
+  backface-visibility: hidden;
   outline: none; }
-  .pswp * {
+
+.pswp * {
 	-webkit-box-sizing: border-box;
-		box-sizing: border-box; }
-  .pswp img {
+	box-sizing: border-box; }
+
+.pswp img {
 	max-width: none; }
 
 /* style is added when JS option showHideOpacity is set to true */
@@ -2933,6 +3043,7 @@ html.no-js .catalog-filter-attribute:hover .attribute-lists {
   opacity: 0;
   transform: translateZ(0);
   -webkit-backface-visibility: hidden;
+  backface-visibility: hidden;
   will-change: opacity; }
 
 .pswp__scroll-wrap {
@@ -2986,7 +3097,8 @@ html.no-js .catalog-filter-attribute:hover .attribute-lists {
 
 .pswp__container,
 .pswp__zoom-wrap {
-  -webkit-backface-visibility: hidden; }
+	backface-visibility: hidden;
+	-webkit-backface-visibility: hidden; }
 
 .pswp__item {
   position: absolute;
@@ -3008,7 +3120,8 @@ html.no-js .catalog-filter-attribute:hover .attribute-lists {
 	style is added to avoid flickering in webkit/blink when layers overlap
 */
 .pswp__img--placeholder {
-  -webkit-backface-visibility: hidden; }
+	backface-visibility: hidden;
+	-webkit-backface-visibility: hidden; }
 
 /*
 	div element that matches size of large image
@@ -3183,6 +3296,7 @@ html.no-js .catalog-filter-attribute:hover .attribute-lists {
   -webkit-transition: opacity 0.25s ease-out;
 	  transition: opacity 0.25s ease-out;
   -webkit-backface-visibility: hidden;
+  backface-visibility: hidden;
   will-change: opacity; }
 
 .pswp__share-modal--hidden {
@@ -3205,6 +3319,7 @@ html.no-js .catalog-filter-attribute:hover .attribute-lists {
   -webkit-transition: -webkit-transform 0.25s;
 	  transition: transform 0.25s;
   -webkit-backface-visibility: hidden;
+  backface-visibility: hidden;
   will-change: transform; }
   .pswp__share-tooltip a {
 	display: block;
@@ -3450,6 +3565,7 @@ a.pswp__share--download:hover {
 .pswp--has_mouse .pswp__button--arrow--left,
 .pswp--has_mouse .pswp__button--arrow--right {
   -webkit-backface-visibility: hidden;
+  backface-visibility: hidden;
   will-change: opacity;
   -webkit-transition: opacity 333ms cubic-bezier(0.4, 0, 0.22, 1);
 	  transition: opacity 333ms cubic-bezier(0.4, 0, 0.22, 1); }