--- a/src/ztfy/myams/resources/less/widgets.less	Mon Apr 20 15:55:33 2015 +0200
+++ b/src/ztfy/myams/resources/less/widgets.less	Wed Jun 10 17:29:16 2015 +0200
@@ -265,6 +265,10 @@
 				padding: 3px 5px 4px;
 			}
 		}
+		>.btn-group {
+			margin-top: -13px;
+			margin-left: 5px;
+		}
 	}
 	>header {
 		height: 30px;
@@ -299,6 +303,11 @@
 		>h2 {
 			margin-left: 10px;
 			float: left;
+
+			& + .btn,
+			& + .btn-group {
+				margin-left: 20px;
+			}
 		}
 		.rtl & {
 			padding: 0 7px 0 0;
@@ -344,12 +353,12 @@
 		margin: 0;
 		padding: 13px 13px 0;
 		background-color: #fff !important;
-		border-width: 1px 1px 2px;
+		border-width: 1px;
 		border-style: solid;
+		border-color: #ccc!important;
+	}
+	>header+div {
 		border-top: 0;
-		border-right-color: #CCC !important;
-		border-bottom-color: #CCC !important;
-		border-left-color: #CCC !important;
 	}
 	.widget-body {
 		position: relative;
@@ -1294,13 +1303,25 @@
 					}
 					&.ui-sortable-handle {
 						cursor: move;
+
+						.with-icons & {
+							margin-right: 1px;
+						}
 					}
 				}
 			}
-			&.nofloat {
+			&.ordered {
 				.select2-choices {
 					li {
 						float: none;
+						cursor: move;
+
+						&.ui-state-highlight {
+							margin: 2px 0 2px 2px;
+							height: 20px;
+							background-color: #ddd;
+							border: 1px solid #ddd;
+						}
 					}
 				}
 			}
@@ -1318,11 +1339,11 @@
 				background-color: #f4f4f4;
 				background-image: none;
 				border: 1px solid transparent;
-				border-bottom: 1px solid #bdbdbd;
+				border-bottom: 1px solid #ccc;
 				cursor: default;
 
 				.select2-search-choice {
-					padding: 3px 5px;
+					padding: 1px 5px;
 					border: 1px solid #4a90cc;
 					background-image: none;
 					background-color: #86b4dd;
@@ -2124,136 +2145,15 @@
 	_overflow: hidden;
 }
 
+
 /*
  * Colorpicker
  */
 
 .colorpicker {
-	zoom: 1;
-	top: 0;
-	left: 0;
-	padding: 4px;
-	min-width: 120px;
-	margin-top: 1px;
-	border-top-right-radius: 4px;
-	border-top-left-radius: 4px;
-	border-bottom-right-radius: 4px;
-	border-bottom-left-radius: 4px;
-
-	&:after {
-		clear: both;
-	}
-	&:before {
-		content: '';
-		display: inline-block;
-		border-left: 7px solid transparent;
-		border-right: 7px solid transparent;
-		border-bottom: 7px solid #ccc;
-		border-bottom-color: rgba(0, 0, 0, .2);
-		position: absolute;
-		top: -7px;
-		left: 6px;
-	}
-	&:after {
-		content: '';
-		display: inline-block;
-		border-left: 6px solid transparent;
-		border-right: 6px solid transparent;
-		border-bottom: 6px solid #fff;
-		position: absolute;
-		top: -6px;
-		left: 7px;
-	}
-	&.alpha {
-		min-width: 140px;
-
-		.colorpicker-alpha {
-			display: block;
-		}
-	}
-	div {
-		position: relative;
-	}
+	padding-left: 30px!important;
 }
 
-.colorpicker-saturation {
-	width: 100px;
-	height: 100px;
-	background-image: url(../img/saturation.png);
-	cursor: crosshair;
-	float: left;
-
-	i {
-		display: block;
-		height: 5px;
-		width: 5px;
-		border: 1px solid #000;
-		position: absolute;
-		top: 0;
-		left: 0;
-		margin: -4px 0 0 -4px;
-
-		b {
-			display: block;
-			height: 5px;
-			width: 5px;
-			border: 1px solid #fff;
-		}
-	}
-}
-
-.colorpicker-color {
-	height: 10px;
-	margin-top: 5px;
-	clear: both;
-	background-image: url(../img/alpha.png);
-	background-position: 0 100%;
-
-	div {
-		height: 10px;
-	}
-}
-
-.colorpicker-alpha,
-.colorpicker-hue {
-	width: 15px;
-	height: 100px;
-	float: left;
-	cursor: row-resize;
-	margin-left: 4px;
-	margin-bottom: 4px;
-
-	& i {
-		display: block;
-		height: 1px;
-		background: #000;
-		border-top: 1px solid #fff;
-		position: absolute;
-		top: 0;
-		left: 0;
-		width: 100%;
-		margin-top: -1px;
-	}
-}
-
-.colorpicker-hue {
-	background-image: url(../img/hue.png);
-}
-
-.colorpicker-alpha {
-	background-image: url(../img/alpha.png);
-	display: none;
-}
-
-.input-append.color,
-.input-prepend.color {
-	.add-on i {
-		display: block;
-		cursor: pointer;
-		width: 16px;
-		height: 16px;
-	}
-}
 
 /*
  * Timepicker