diff --git a/.gitignore b/.gitignore
index db134f0231..e83f2413b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-#################  
+#################
 ## npm
 #################
 
@@ -9,6 +9,7 @@ config.json
 public/config.json
 public/css/*.css
 public/themes/*
+!/public/themes/vanilla
 *.sublime-project
 *.sublime-workspace
 plugins/*
diff --git a/public/css/nodebb.less b/public/css/nodebb.less
index 5320222a10..2b29bad852 100644
--- a/public/css/nodebb.less
+++ b/public/css/nodebb.less
@@ -1,13 +1 @@
-@import "style";
-
-@import "topic";
-@import "category";
-@import "noscript";
-@import "home";
-@import "header";
-@import "account";
-@import "search";
-@import "unread";
-@import "admin";
-@import "users";
-@import "footer";
\ No newline at end of file
+@import "../themes/vanilla/vanilla.less";
\ No newline at end of file
diff --git a/public/themes/.gitignore b/public/themes/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/public/css/account.less b/public/themes/vanilla/account.less
similarity index 100%
rename from public/css/account.less
rename to public/themes/vanilla/account.less
diff --git a/public/css/admin.less b/public/themes/vanilla/admin.less
similarity index 100%
rename from public/css/admin.less
rename to public/themes/vanilla/admin.less
diff --git a/public/css/category.less b/public/themes/vanilla/category.less
similarity index 100%
rename from public/css/category.less
rename to public/themes/vanilla/category.less
diff --git a/public/css/footer.less b/public/themes/vanilla/footer.less
similarity index 100%
rename from public/css/footer.less
rename to public/themes/vanilla/footer.less
diff --git a/public/css/header.less b/public/themes/vanilla/header.less
similarity index 100%
rename from public/css/header.less
rename to public/themes/vanilla/header.less
diff --git a/public/css/home.less b/public/themes/vanilla/home.less
similarity index 100%
rename from public/css/home.less
rename to public/themes/vanilla/home.less
diff --git a/public/css/mixins.less b/public/themes/vanilla/mixins.less
similarity index 100%
rename from public/css/mixins.less
rename to public/themes/vanilla/mixins.less
diff --git a/public/css/noscript.less b/public/themes/vanilla/noscript.less
similarity index 100%
rename from public/css/noscript.less
rename to public/themes/vanilla/noscript.less
diff --git a/public/css/search.less b/public/themes/vanilla/search.less
similarity index 100%
rename from public/css/search.less
rename to public/themes/vanilla/search.less
diff --git a/public/css/style.less b/public/themes/vanilla/style.less
similarity index 93%
rename from public/css/style.less
rename to public/themes/vanilla/style.less
index 63d77b030a..ba2adbcaaa 100644
--- a/public/css/style.less
+++ b/public/themes/vanilla/style.less
@@ -1,285 +1,285 @@
-@import "mixins";
-
-html {
-	overflow-y: scroll;
-}
-
-body {
-	/*background: #fdfdfd;*/  // port to default theme when it is implemented.
-	-webkit-transition: margin-bottom 250ms ease;
-	   -moz-transition: margin-bottom 250ms ease;
-	    -ms-transition: margin-bottom 250ms ease;
-	     -o-transition: margin-bottom 250ms ease;
-	        transition: margin-bottom 250ms ease;
-
-	&.composing {
-		margin-bottom: 350px;
-	}
-
-	@media (min-width: 979px)
-	{
-		padding-top: 70px;
-	}
-
-	@media (max-width: 979px)
-	{
-		padding-top: 70px;
-		padding-bottom: 50px;
-	}
-}
-
-button, a {
-	-webkit-tap-highlight-color: rgba(0,0,0,0);
-}
-
-.none {
-	display: none !important;
-}
-
-.block, .show {
-	display: block;
-}
-
-.bold {
-	font-weight: bold;
-}
-
-a:hover, .btn-link:hover, .btn-link:active, .btn-link:focus {
-	text-decoration:none;
-}
-
-
-
-
-
-#alert_window {
-	position: fixed;
-	right: 20px;
-	top: 60px;
-	width: 300px;
-	height: 0px;
-}
-
-.toaster-alert {
-	.pointer;
-}
-
-footer.footer {
-	color: #555;
-	text-align: center;
-
-	a {
-		color: #222;
-	}
-}
-
-.alt-logins {
-	margin: 0 0 0 1em;
-	padding: 0;
-
-	li {
-		vertical-align: top;
-		background: transparent;
-		display: none;
-		margin: 0.25em;
-		.pointer;
-
-		&.active {
-			.inline-block;
-		}
-
-		i {
-			-webkit-transition: color 100ms linear;
-			   -moz-transition: color 100ms linear;
-			    -ms-transition: color 100ms linear;
-			     -o-transition: color 100ms linear;
-			        transition: color 100ms linear;
-
-			&.icon-twitter-sign:hover {
-				color: #4099FF;
-			}
-
-			&.icon-facebook-sign:hover {
-				color: #3b5999;
-			}
-
-			&.icon-google-plus-sign:hover {
-				color: #d34836;
-			}
-		}
-	}
-}
-
-.jumbotron {
-	// goes into theme
-	background: #56BCDA;
-	color: white;
-	padding: 30px;
-	word-wrap: break-word;
-}
-
-.formatting-bar {
-	.no-select;
-
-	span:focus {
-		outline: none;
-	}
-}
-
-
-.breadcrumb {
-	li {
-		max-width: 35%;
-		white-space: nowrap;
-		text-overflow:ellipsis;
-		overflow: hidden;
-	}
-}
-
-#chat-content {
-	height:200px;
-	resize:none;
-}
-
-#content{
-	padding-bottom:20px;
-}
-
-
-/* START: post-window needs to go in its own plugin area */
-.post-window {
-	position: fixed;
-	display: none;
-	height: 350px;
-	visibility: hidden;
-	width: 100%;
-
-	> div {
-		position: absolute;
-		height: 100%;
-		background: rgba(64, 64, 64, 0.6);
-		visibility: visible;
-
-		.btn-toolbar {
-			&.formatting-bar {
-				width: 90%;
-				margin: 0 auto 8px auto;
-
-				span {
-					color: white;
-
-					&:hover {
-						text-decoration: none;
-					}
-				}
-			}
-
-			&.action-bar {
-				width: 90%;
-				margin: 8px auto 0 auto;
-			}
-		}
-
-		input {
-			width: 98%;
-			text-align: center;
-			border: none;
-			padding: 0.5em 0;
-			-webkit-border-radius: 0px;
-			-moz-border-radius: 0px;
-			border-radius: 0px;
-			margin: 5px auto 10px auto;
-			display: block;
-		}
-
-		textarea {
-			background: rgba(64, 64, 64, 0.95);
-			border: none;
-			padding: 0.5em;
-			display: block;
-			width: 90%;
-			margin: 0em auto;
-			resize: none;
-			color: white;
-			height: 200px;
-		}
-
-		.imagedrop {
-			text-align: center;
-			color: white;
-			position: absolute;
-			top: 0px;
-			left: 0px;
-			width: 100%;
-			height: 214px;
-			line-height: 214px;
-			font-size: 20px;
-			vertical-align: middle;
-			display: none;
-		}
-
-		.imagelist {
-			position: absolute;
-			bottom: 50px;
-			left: 5%;
-
-			div {
-				margin-right:5px;
-			}
-
-			span {
-				line-height:20px;
-				float:left;
-			}
-
-			button {
-				padding-left:5px;
-			}
-		}
-	}
-}
-
-@media (max-width: 979px) {
-	.post-window {
-		position: relative;
-		bottom: 0px !important;
-
-		> div {
-			position: static;
-			width: 100% !important;
-		}
-	}
-}
-/* END: post-window needs to go in its own plugin area */
-
-
-//theme
-#search-form .btn-link {
-	color: white;
-}
-
-
-//START: FIXES FOR BS3, may need to remove these when we get out of the RC releases
-@media (max-width: 979px) {
-	.hidden-mobile {
-		// BS2/3's hidden-xs does not support inline-block, so here it is for now.
-		display: none !important;
-	}
-}
-
-@media (min-width: 760px) {
-	.container > .navbar-header, .container > .navbar-collapse {
-		padding-right: 0;
-		margin-right: -11px;
-	}
-}
-
-.badge {
-	vertical-align: 17%;
-}
-
-.modal {
-	overflow-y: hidden;
-}
-
+@import "mixins";
+
+html {
+	overflow-y: scroll;
+}
+
+body {
+	/*background: #fdfdfd;*/  // port to default theme when it is implemented.
+	-webkit-transition: margin-bottom 250ms ease;
+	   -moz-transition: margin-bottom 250ms ease;
+	    -ms-transition: margin-bottom 250ms ease;
+	     -o-transition: margin-bottom 250ms ease;
+	        transition: margin-bottom 250ms ease;
+
+	&.composing {
+		margin-bottom: 350px;
+	}
+
+	@media (min-width: 979px)
+	{
+		padding-top: 70px;
+	}
+
+	@media (max-width: 979px)
+	{
+		padding-top: 70px;
+		padding-bottom: 50px;
+	}
+}
+
+button, a {
+	-webkit-tap-highlight-color: rgba(0,0,0,0);
+}
+
+.none {
+	display: none !important;
+}
+
+.block, .show {
+	display: block;
+}
+
+.bold {
+	font-weight: bold;
+}
+
+a:hover, .btn-link:hover, .btn-link:active, .btn-link:focus {
+	text-decoration:none;
+}
+
+
+
+
+
+#alert_window {
+	position: fixed;
+	right: 20px;
+	top: 60px;
+	width: 300px;
+	height: 0px;
+}
+
+.toaster-alert {
+	.pointer;
+}
+
+footer.footer {
+	color: #555;
+	text-align: center;
+
+	a {
+		color: #222;
+	}
+}
+
+.alt-logins {
+	margin: 0 0 0 1em;
+	padding: 0;
+
+	li {
+		vertical-align: top;
+		background: transparent;
+		display: none;
+		margin: 0.25em;
+		.pointer;
+
+		&.active {
+			.inline-block;
+		}
+
+		i {
+			-webkit-transition: color 100ms linear;
+			   -moz-transition: color 100ms linear;
+			    -ms-transition: color 100ms linear;
+			     -o-transition: color 100ms linear;
+			        transition: color 100ms linear;
+
+			&.icon-twitter-sign:hover {
+				color: #4099FF;
+			}
+
+			&.icon-facebook-sign:hover {
+				color: #3b5999;
+			}
+
+			&.icon-google-plus-sign:hover {
+				color: #d34836;
+			}
+		}
+	}
+}
+
+.jumbotron {
+	// goes into theme
+	background: #56BCDA;
+	color: white;
+	padding: 30px;
+	word-wrap: break-word;
+}
+
+.formatting-bar {
+	.no-select;
+
+	span:focus {
+		outline: none;
+	}
+}
+
+
+.breadcrumb {
+	li {
+		max-width: 35%;
+		white-space: nowrap;
+		text-overflow:ellipsis;
+		overflow: hidden;
+	}
+}
+
+#chat-content {
+	height:200px;
+	resize:none;
+}
+
+#content{
+	padding-bottom:20px;
+}
+
+
+/* START: post-window needs to go in its own plugin area */
+.post-window {
+	position: fixed;
+	display: none;
+	height: 350px;
+	visibility: hidden;
+	width: 100%;
+
+	> div {
+		position: absolute;
+		height: 100%;
+		background: rgba(64, 64, 64, 0.6);
+		visibility: visible;
+
+		.btn-toolbar {
+			&.formatting-bar {
+				width: 90%;
+				margin: 0 auto 8px auto;
+
+				span {
+					color: white;
+
+					&:hover {
+						text-decoration: none;
+					}
+				}
+			}
+
+			&.action-bar {
+				width: 90%;
+				margin: 8px auto 0 auto;
+			}
+		}
+
+		input {
+			width: 98%;
+			text-align: center;
+			border: none;
+			padding: 0.5em 0;
+			-webkit-border-radius: 0px;
+			-moz-border-radius: 0px;
+			border-radius: 0px;
+			margin: 5px auto 10px auto;
+			display: block;
+		}
+
+		textarea {
+			background: rgba(64, 64, 64, 0.95);
+			border: none;
+			padding: 0.5em;
+			display: block;
+			width: 90%;
+			margin: 0em auto;
+			resize: none;
+			color: white;
+			height: 200px;
+		}
+
+		.imagedrop {
+			text-align: center;
+			color: white;
+			position: absolute;
+			top: 0px;
+			left: 0px;
+			width: 100%;
+			height: 214px;
+			line-height: 214px;
+			font-size: 20px;
+			vertical-align: middle;
+			display: none;
+		}
+
+		.imagelist {
+			position: absolute;
+			bottom: 50px;
+			left: 5%;
+
+			div {
+				margin-right:5px;
+			}
+
+			span {
+				line-height:20px;
+				float:left;
+			}
+
+			button {
+				padding-left:5px;
+			}
+		}
+	}
+}
+
+@media (max-width: 979px) {
+	.post-window {
+		position: relative;
+		bottom: 0px !important;
+
+		> div {
+			position: static;
+			width: 100% !important;
+		}
+	}
+}
+/* END: post-window needs to go in its own plugin area */
+
+
+//theme
+#search-form .btn-link {
+	color: white;
+}
+
+
+//START: FIXES FOR BS3, may need to remove these when we get out of the RC releases
+@media (max-width: 979px) {
+	.hidden-mobile {
+		// BS2/3's hidden-xs does not support inline-block, so here it is for now.
+		display: none !important;
+	}
+}
+
+@media (min-width: 760px) {
+	.container > .navbar-header, .container > .navbar-collapse {
+		padding-right: 0;
+		margin-right: -11px;
+	}
+}
+
+.badge {
+	vertical-align: 17%;
+}
+
+.modal {
+	overflow-y: hidden;
+}
+
 //END: FIXES FOR BS3, may need to remove these when we get out of the RC releases
\ No newline at end of file
diff --git a/public/css/topic.less b/public/themes/vanilla/topic.less
similarity index 100%
rename from public/css/topic.less
rename to public/themes/vanilla/topic.less
diff --git a/public/css/unread.less b/public/themes/vanilla/unread.less
similarity index 100%
rename from public/css/unread.less
rename to public/themes/vanilla/unread.less
diff --git a/public/css/users.less b/public/themes/vanilla/users.less
similarity index 100%
rename from public/css/users.less
rename to public/themes/vanilla/users.less
diff --git a/public/themes/vanilla/vanilla.less b/public/themes/vanilla/vanilla.less
new file mode 100644
index 0000000000..15df19df6e
--- /dev/null
+++ b/public/themes/vanilla/vanilla.less
@@ -0,0 +1,12 @@
+@import "style";
+@import "topic";
+@import "category";
+@import "noscript";
+@import "home";
+@import "header";
+@import "account";
+@import "search";
+@import "unread";
+@import "admin";
+@import "users";
+@import "footer";
\ No newline at end of file