diff --git a/package.json b/package.json
index fde5ed9..fddf84f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "castlecss-forms",
-  "version": "1.0.7",
+  "version": "2.0.0",
   "description": "Easy to use forms for CastleCSS",
   "main": "index.js",
   "scripts": {
@@ -15,7 +15,8 @@
   ],
   "author": "Maarten van der Haar <maarten@denieuwezaak.nl> (http://www.castlecss.com)",
   "contributors": [
-    "Darius Rosendahl <maarten@denieuwezaak.nl> (http://www.castlecss.com)",
+    "Darius Rosendahl <darius@denieuwezaak.nl> (http://www.castlecss.com)",
+    "Paul Stegeman <paul@denieuwezaak.nl> (http://www.castlecss.com)",
     "Björn Borneman <bjorn@denieuwezaak.nl> (http://www.castlecss.com)",
     "Amber Brookhuis <darius@denieuwezaak.nl> (http://www.castlecss.com)"
   ],
@@ -25,7 +26,7 @@
   },
   "homepage": "https://github.com/CastleCSS/castlecss-forms#readme",
   "dependencies": {
-    "castlecss-core": "^2.3.0",
+    "castlecss-core": "^2.4.0",
     "jquery": "^3.1.1"
   },
   "devDependencies": {
diff --git a/sass/component/label.scss b/sass/component/label.scss
index f2d32f0..e6ea996 100644
--- a/sass/component/label.scss
+++ b/sass/component/label.scss
@@ -2,36 +2,28 @@
 
 [class^="label-"],
 [class*=" label-"] {
+	.input-icon {
+		label[for] {
+			left: $margin-default*4.5;
+		}
+	}
 
 	.form-field {
 
-		&.has-focus label[for],
-		&.has-value label[for] {
+		&.has-focus .placeholder,
+		&.has-value .placeholder {
 			transform: translateY(-100%);
 			top: 0;
 			color: $input-label-color-focus;
 			font-size: 70%;
 			line-height: 15px;
 		}
-	} 
-
-	
 
-	.input-textarea label[for] {
-		top: $margin-default/2;
-		transform: translateY(0);
-	}
-
-	.input-icon {
-		label[for] {
-			left: $margin-default*4.5;
-		}
-	}
+	} 
 }
 
 .form-field {
-	
-	label[for]:not(.input-control) {
+	.placeholder {
 		transition: $input-transition;
 		position: absolute;
 		color: $input-label-color;
@@ -43,6 +35,16 @@
 		z-index: 2;
 	}
 
+	&.has-focus, &.has-value {
+		.placeholder {
+			display: none;
+
+			[class*="label-"] &
+ 			{
+				display: block;
+			}
+		}
+	}
 }
 
 .label-bottom, .label-top {
@@ -75,7 +77,7 @@
 		&.has-focus,
 		&.has-value {
 
-			label[for] {
+			.placeholder {
 				color: $input-label-color-focus;
 				font-size: 65%;
 				line-height: 22px;
@@ -85,7 +87,6 @@
 	}
 
 	.input-combined {
-
 		~ label[for] {
 			margin-left: $margin-default*3;
 		}
@@ -108,14 +109,14 @@
 
 .label-top {
 	.form-field {
-
 		&.has-focus,
 		&.has-value {
-
-			label[for] {
+			
+			.placeholder {
 				top: 0;
 				transform: translateY(0);
 			}
+
 		}
 	}
 
@@ -129,7 +130,6 @@
 }
 
 .label-left {
-
 	.input-indicator {
 		left: inherit;
 		right: 0;