diff --git a/public/themes/cerulean/cerulean.less b/public/themes/cerulean/cerulean.less
index 16ffbdb38a..fb5fbddfbd 100644
--- a/public/themes/cerulean/cerulean.less
+++ b/public/themes/cerulean/cerulean.less
@@ -1,4 +1,5 @@
 @import "../vanilla/mixins";
+
 @import "style";
 @import "topic";
 @import "category";
@@ -10,4 +11,6 @@
 @import "unread";
 @import "admin";
 @import "users";
-@import "footer";
\ No newline at end of file
+@import "footer";
+
+@import "../vanilla/modules.less";
\ No newline at end of file
diff --git a/public/themes/cerulean/style.less b/public/themes/cerulean/style.less
index b93b0ebd5e..8f256782f6 100644
--- a/public/themes/cerulean/style.less
+++ b/public/themes/cerulean/style.less
@@ -8,4 +8,28 @@ body {
 	background: #56BCDA;
 	color: white;
 	padding: 30px;
+}
+
+.alt-logins {
+	li {
+		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;
+			}
+		}
+	}
 }
\ No newline at end of file
diff --git a/public/themes/vanilla/modules.less b/public/themes/vanilla/modules.less
new file mode 100644
index 0000000000..be38de91f0
--- /dev/null
+++ b/public/themes/vanilla/modules.less
@@ -0,0 +1 @@
+@import "modules/postWindow";
\ No newline at end of file
diff --git a/public/themes/vanilla/modules/postWindow.less b/public/themes/vanilla/modules/postWindow.less
new file mode 100644
index 0000000000..5f97d9cbe7
--- /dev/null
+++ b/public/themes/vanilla/modules/postWindow.less
@@ -0,0 +1,107 @@
+.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 {
+				.no-select;
+
+				width: 90%;
+				margin: 0 auto 8px auto;
+
+				span {
+					color: white;
+
+					&:hover {
+						text-decoration: none;
+					}
+				}
+
+				span:focus {
+					outline: 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) {
+		position: relative;
+		bottom: 0px !important;
+
+		> div {
+			position: static;
+			width: 100% !important;
+		}
+	}
+}
\ No newline at end of file
diff --git a/public/themes/vanilla/style.less b/public/themes/vanilla/style.less
index c66ef788b2..4116c285f8 100644
--- a/public/themes/vanilla/style.less
+++ b/public/themes/vanilla/style.less
@@ -1,20 +1,8 @@
-@import "mixins";
-
 html {
 	overflow-y: scroll;
 }
 
 body {
-	-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;
@@ -57,12 +45,14 @@ a:hover, .btn-link:hover, .btn-link:active, .btn-link:focus {
 	top: 60px;
 	width: 300px;
 	height: 0px;
-}
 
-.toaster-alert {
-	.pointer;
+	.toaster-alert {
+		.pointer;
+	}
 }
 
+
+
 footer.footer {
 	color: #555;
 	text-align: center;
@@ -86,26 +76,6 @@ footer.footer {
 		&.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;
-			}
-		}
 	}
 }
 
@@ -113,14 +83,6 @@ footer.footer {
 	word-wrap: break-word;
 }
 
-.formatting-bar {
-	.no-select;
-
-	span:focus {
-		outline: none;
-	}
-}
-
 
 .breadcrumb {
 	li {
@@ -141,113 +103,6 @@ footer.footer {
 }
 
 
-/* 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;
diff --git a/public/themes/vanilla/vanilla.less b/public/themes/vanilla/vanilla.less
index 15df19df6e..429b1c9ae2 100644
--- a/public/themes/vanilla/vanilla.less
+++ b/public/themes/vanilla/vanilla.less
@@ -9,4 +9,6 @@
 @import "unread";
 @import "admin";
 @import "users";
-@import "footer";
\ No newline at end of file
+@import "footer";
+
+@import "modules";
\ No newline at end of file