diff --git a/action.php b/action.php
index b26dd32..f5e8f77 100644
--- a/action.php
+++ b/action.php
@@ -17,6 +17,7 @@ require_once "include/functions.php";
 $srv = $user_settings['instance'];
 
 if (isset($_GET['action']) && $_GET['action'] == "settings"){
+	//file_put_contents("settings.txt",var_export($_GET,true));
 	
 	foreach($_GET as $key => $value){
 		switch($key){
@@ -272,6 +273,11 @@ foreach($_GET as $key => $value){
 			echo themes("get",$value);
 			die();
 			break;
+			
+	case "emoji":
+		echo emoji_list(sanitize($value));
+		//die();
+		break;
 	}
 }
 
diff --git a/css/mobile.css b/css/mobile.css
deleted file mode 100644
index 6d08ded..0000000
--- a/css/mobile.css
+++ /dev/null
@@ -1,791 +0,0 @@
-/* overall */
-
-* {
-	font-family: arial, helvetica, sans-serif;
-	font-size: 12pt;
-}
-
-a {
-	text-decoration:none;
-}
-
-h1 {
-	font-size:20px;
-}
-
-p {
-	margin: 0px !important;
-}
-
-body {
-	background: #203960;
-	margin: 0;
-}
-
-ul{
-	padding:0px;
-	margin:0px;
-}
-
-select{
-	padding:5px;
-	margin-top:5px;
-	border:0px;
-	color:darkgray;
-	font-weight:bold;
-	font-family:fontello, sans-serif;
-	background-color:white;
-	}
-	
-option{
-	font-family:fontello, sans-serif;
-	}
-
-label {
-	color: gray;
-	margin-left: 5px;
-	margin-right: 5px;
-	cursor: pointer;
-}
-
-input[type="radio"]:checked+label {
-	color: black;
-}
-
-input[type="checkbox"]:checked+label {
-	color: red;
-}
-
-input[type="file"], .nloadmore {
-	cursor:pointer;
-}
-
-textarea {
-	resize: none;
-}
-
-/* omnipresent */
-
-.desktop{
-	display:none !important;
-}
-
-.link {
-	color: steelblue;
-	text-decoration: none;
-}
-
-.external:after{
-		font-family:fontello;
-		font-weight:normal;
-		content: ' ';
-		}
-
-/* basic structure */
-
-.topbar {
-	background-color: #14243D;
-	width: 100vw;
-	height: 45px;
-	margin: 0;
-	position: relative;
-}
-
-.wrapper {
-	width: 100vw;
-	clear: both;
-	display: inline-block;
-	text-align: center;
-}
-
-.container {
-	width: 100% !important;
-	display: inline-block;
-	text-align: center;
-}
-
-#posts {
-	width: 100% !important;
-}
-
-.content {
-	width: 100%;
-	display: inline-block;
-	margin:0px !important;
-	text-align: left;
-	word-break: break-all;
-}
-
-aside {
-	display:none !important;
-	margin-top: 5px;
-	width: 280px;
-	float: left;
-	background-color: rgba(255, 255, 255, 0.2);
-	display: inline-block;
-	border-radius: 3px;
-	box-shadow: 1px 1px 1px black;
-}
-
-.gotop {
-	background-color: rgba(32, 57, 96, 0.5);
-	width: 30px;
-	height: 30px;
-	padding: 5px;
-	position: fixed;
-	display: table;
-	text-align: center;
-	right: 20px;
-	bottom: 20px;
-	border-radius: 10px;
-	z-index:50;
-}
-
-.gotop a {
-	text-align: center;
-	display: table-cell;
-	vertical-align: middle;
-	color: white;
-	opacity: 0.7;
-	font-size: 20px;
-}
-
-#hiddenside {
-	background-color: rgba(255, 255, 255, 0);
-	position: fixed;
-	left: 0px;
-	bottom: 0px;
-	width: 100vw;
-	height: auto;
-	z-index: 99;
-}
-
-/* topbar elements */
-
-.mid {
-	display:none;
-}
-
-.topbutton {
-	vertical-align: middle;
-	display: table-cell;
-	line-height: 45px;
-	height: 100%;
-	width: 50px;
-	position: relative;
-}
-
-.topicon {
-	color: white;
-	text-decoration: none;
-	display: inline;
-	font-size: 20px;
-}
-
-.badge {
-	color: white;
-	text-decoration: none;
-}
-
-.alert {
-	border-radius: 90px;
-	width: 10px;
-	height: 10px;
-	background-color: red;
-	position: absolute;
-	right: 15px;
-	top: 15px;
-	display: none;
-}
-
-#notifications {
-	background-color:white;
-	position: fixed;
-	left: 0px;
-	top: 45px;
-	width: 100vw;
-	max-height: 400px;
-	display: none;
-	line-height:12px;
-	overflow-y:scroll;
-	border-radius:3px;
-	box-shadow: 1px 1px 1px black;
-}
-
-.notif{
-	width:100%;
-	height:80px;
-	display:inline-block;
-	border-bottom:1px solid lightgray;
-	text-align:left;
-	position:relative;
-	background-color:white;
-	color:black;
-	-webkit-box-shadow: inset -6px 73px 100px -117px rgba(209,209,209,1);-moz-box-shadow: inset -6px 73px 100px -117px rgba(209,209,209,1);box-shadow: inset -6px 73px 100px -117px rgba(209,209,209,1);
-}
-
-#quicksend {
-	background-color: #305792;
-	border-radius: 3px;
-	border: 1px solid darkgray;
-	color: white;
-	font-weight: bold;
-}	
-
-.notifContents{
-	margin:10px; 
-	display:flex;
-	height:60px; 
-	max-width:325px;
-}
-
-.new {
-	background-color:white;
-}
-
-/* sidebar */
-
-.side_element {
-	display:none;
-	width: 92%;
-	margin: 10px;
-	display: inline-block;
-	text-align: center;
-	color: lightgray;
-}
-
-.side_element a {
-	color: lightgray;
-}
-
-/* posts area elements */
-
-.uploadedImage {
-	width: 60px;
-	margin: 10px 0px 10px 10px;
-	height: 60px;
-	border: 1px solid #ccc;
-	display: inline-block;
-	box-shadow: 3px 3px 3px grey;
-	float: left;
-	background-size: cover;
-}
-
-.uploadBox {
-	width: 100%;
-	display: inline-block;
-	border-bottom: 1px solid #ddd;
-	box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.3), 0 1px rgba(255, 255, 255, 0.1);
-}
-
-.delpic {
-	border-radius:90px;
-	color:red;
-	background-color:white;
-	display:inline-block;
-	cursor:pointer;
-}
-
-.toolbar {
-	width:100%;
-	height:30px;
-	display:block;
-	border-bottom: 1px solid #ddd;
-	background-color:#eee;
-	box-shadow: -1px -1px 1px gray inset;
-}
-
-.toolbarButton{
-	width:30px; 
-	height:100%; 
-	border-right: 1px solid #ccc; 
-	display:inline-block; 
-	overflow:hidden; 
-	line-height:30px; 
-	text-align:center; 
-	position:relative;
-}
-
-#send {
-	padding:5px; 
-	background-color:#305792; 
-	border-radius:3px; 
-	border: 1px solid darkgray; 
-	color:white; 
-	font-weight:bold; 
-	margin-top:5px;
-	}
-	
-.formbtn {
-	background-color:transparent; 
-	border: 0px; 
-	color:#305792; 
-	margin-top:11px;
-	margin-left:15px;
-	float:left;
-	width:20px;
-	height:20px;
-	line-height:20px;
-	text-align:center;
-	overflow:hidden; 
-	font-size:20px;
-}
-
-.formbtn label{
-	margin:-5px;
-	color:#305792; 
-	font-size:20px;
-}
-
-.element {
-	width: 90% !important;
-	clear: both;
-	display: inline-block;
-	margin-top: 3px;
-}
-
-.profile {
-	float:left; 
-	background-color:white; 
-	border-radius:5px; 
-	//width:650px;
-	width:100%;
-}
-
-.profileButton{
-	padding: 5px;
-	border-radius: 5px;
-	font-family: fontello, sans-serif;
-}
-
-#usermenu .menu {
-	display: none;
-	width: 150px;
-	height: 100px;
-	background-color: #6B91B6;
-	position: absolute;
-	top: 45px;
-	left: -80px;
-	transition: 0.4s;
-}
-
-#usermenu:hover>.menu,
-#usermenu:active>.menu {
-	display: block;
-	transition: 0.4s;
-}
-
-.postMenu,.listmenu {
-	cursor: pointer;
-	position:relative;
-}
-
-.postMenu div{
-	border-radius: 3px;
-	box-shadow: 1px 1px 2px black;
-}
-
-.postMenu li {
-	margin:0px;
-	width:100%;
-	height:35px;
-	display:block;
-	text-align:center;
-	line-height:35px;
-}
-
-.postMenu:hover > div{
-	display:block !important;
-}
-
-.postMenu li:hover {
-	background-color:#203960 !important;
-}
-
-.postMenu li a{
-	color:#203960;
-}
-
-.postMenu li:hover a{
-	color:white;
-}
-
-.postMenu ul {
-	margin:0px;
-	width:100%;
-	padding:0px;
-}
-
-.profileMenu:hover > div, .listmenu:hover > div{
-	display:block !important;
-}
-
-.listmenu li {
-	font-family: fontello, sans-serif;
-	height:30px;
-	line-height:30px;
-	text-align:left;
-	padding-left:12px;
-	list-style-type: none;
-	background-color:black;
-	color:white;
-}
-
-.listmenu li:hover {
-	background-color:white;
-	color:black;
-}
-
-.unblock,.unmute,.block,.mute,.follow,
-.unfollow,
-.nsfw,
-.unnsfw,
-.profileMenu,
-.listmenu {
-	background-color: black;
-	color: white;
-	cursor: pointer;
-}
-
-.mute:hover,.block:hover,.follow:hover,
-.nsfw:hover {
-	background-color: lime;
-}
-
-.unmute:hover,.unblock:hover,.unfollow:hover,
-.unnsfw:hover{
-	background-color: crimson !important;
-}
-
-.unbookmark{
-	color: crimson !important;
-}
-
-.felem {
-	margin-left: 10px;
-	float: left;
-}
-
-.unfav {
-	color: red !important;
-}
-
-.unreblog {
-	color: red !important;
-}
-
-.avatar {
-	display:none;
-	width: 50px;
-	background-size: cover;
-	height: 50px;
-	float: left;
-	margin: 15px;
-	border-radius: 10px;
-}
-
-.post,
-.loader,
-.loadmore,
-.rb,
-.textonly,
-.profile {
-	width: 100% !important;
-	background-color: white;
-	float: left;
-	text-align: center;
-	position: relative;
-	border-radius: 3px;
-	box-shadow: 1px 1px 2px black;
-}
-
-.postform {
-	display:none;
-	position:fixed;
-	width: 100vw !important;
-	left:0px;
-	top:45px;
-	background-color: white;
-	text-align: center;
-	border-radius: 3px;
-	box-shadow: 1px 1px 2px black;
-	z-index: 99;
-}
-
-#postform {
-	display:none;
-}
-
-.postHeader {
-	width: 100%;
-	display: inline-block;
-	height: 40px;
-	text-align: left;
-}
-
-.postHeader *,.post_footer *{
-	font-size:small;
-}
-
-.previewpost {
-	display: none;
-	position: absolute;
-	margin-top: -100px;
-	width: 400px;
-	background-color: white;
-	border: 1px solid darkgray;
-	box-shadow: 1px 1px 1px rgba(0,0,0,0.5);
-	border-radius:3px;
-}
-
-.user {
-	position:relative;
-}
-
-.userinfo {
-	display: none;
-	position: absolute;
-	left:0px;
-	top:-198px;
-	width: 300px;
-	height: 200px;
-	background-color: white;
-	border: 1px solid darkgray;
-	box-shadow: 1px 1px 1px rgba(0,0,0,0.5);
-	border-radius:3px;
-}
-
-
-
-.userinfo_co {
-	width: 280px;
-	margin: 10px;
-}
-
-.userinfo_he {
-	width: 300px;
-	height: 100px;
-}
-
-.media {
-	width: 100%;
-	display: inline-block;
-}
-
-.img {
-	width: 600px;
-	text-align: center;
-}
-
-.blur {
-	-webkit-filter: blur(25px) brightness(70%) grayscale(100%);
-	/* Safari 6.0 - 9.0 */
-	filter: blur(25px) brightness(70%) grayscale(100%);
-	opacity: 0.5;
-	transition: 0.4s;
-}
-
-.small {
-	width: 48% !important;
-	height: 321px;
-	line-height: 321px;
-	background-color: black;
-	float:left;
-	margin:2px !important;
-}
-
-.smaller {
-	width: 31% !important;
-	height: 212px;
-	line-height: 212px;
-	background-color: black;
-	float:left;
-	margin:2px !important;
-}
-
-.icon {
-	width: 80px !important;
-	height: 80px !important;
-	line-height: 80px;
-	background-color: black;
-	float:left;
-	text-align:center;
-	margin:2px !important;
-}
-
-.postbody {
-	margin: 15px;
-}
-
-.post_footer {
-	width: 630px;
-	display: table-cell;
-	clear: both;
-	padding: 10px;
-	height: 20px;
-	text-align: left;
-	background-color: #eee;
-	border-radius: 3px;
-}
-
-.post_buttons {
-	font-family: fontello;
-	float: right;
-	display: inline-block;
-	text-align: right;
-	font-size: 15pt;
-	color: #404040;
-}
-
-.post_buttons a,
-.post_buttons span {
-	font-family: inherit;
-	text-decoration: none;
-	color: inherit;
-	font-size: inherit;
-}
-
-.reply {
-	width: 100%;
-	background-color: #ddd;
-	clear: both;
-	text-align: left;
-	border-bottom: 1px solid #666;
-	display: block;
-}
-
-.note {
-	width: 640px;
-	background-color: #ccc;
-	float: left;
-	text-align: left;
-	border-radius: 5px;
-	padding: 5px;
-}
-
-.button {
-	padding: 15px;
-	background-color: white;
-	float: left;
-	text-align: center;
-	border-radius: 5px;
-	font-size: 20pt;
-}
-
-/* pages */
-
-.setting label {
-	display: block;
-	width: 40px;
-	height: 20px;
-	padding: 5px;
-	background-color: lightgray;
-	float: left;
-	margin: 0px;
-	text-align: center;
-	box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.3), 0 1px rgba(255, 255, 255, 0.1);
-	transition: all 0.3s ease-in-out;
-}
-
-.setting input[type="radio"]:checked+label {
-	color: black;
-	background-color: #305792;
-	box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
-	font-weight: bold;
-	color: white;
-}
-
-
-/* other stuff */
-
-/* <lightbox> */
-.lightbox-opened {
-	/* background-color: #333; */
-	background-color: rgba(50, 50, 50, 0.85);
-	cursor: pointer;
-	height: 100%;
-	/* left: 0; */
-	overflow-y: scroll;
-	position: fixed;
-	text-align: center;
-	top: 0;
-	width: 100%;
-	z-index:105;
-	&:before {
-		background-color: #333;
-		background-color: rgba(#333, 0.9);
-		color: #eee;
-		content: "x";
-		font-family: sans-serif;
-		padding: 6px 12px;
-		position: fixed;
-		text-transform: uppercase;
-	}
-	img {
-		box-shadow: 0 0 6px 3px #333;
-	}
-}
-/*
-.lightbox-opened {
-	//background-color: #333;
-	background-color: rgba(50, 50, 50, 0.85);
-	cursor: pointer;
-	height: 100%;
-	left: 0;
-	overflow-y: scroll;
-	padding: 24px;
-	position: fixed;
-	text-align: center;
-	top: 0;
-	width: 100%;
-	&:before {
-		background-color: #333;
-		background-color: rgba(#333, 0.9);
-		color: #eee;
-		content: "x";
-		font-family: sans-serif;
-		padding: 6px 12px;
-		position: fixed;
-		text-transform: uppercase;
-	}
-	img {
-		box-shadow: 0 0 6px 3px #333;
-	}
-}
-*/
-.no-scroll {
-	overflow: hidden;
-}
-
-/* </lightbox> */
-
-.fontello {
-	font-family: fontello, sans-serif;
-}
-
-.loading {
-	font-family: fontello;
-	color: black;
-	content: "\E822";
-	animation-name: spin;
-	animation-duration: 5000ms;
-	animation-iteration-count: infinite;
-	animation-timing-function: linear;
-	/* transform: rotate(3deg); */
-	/* transform: rotate(0.3rad);/ */
-	/* transform: rotate(3grad); */
-	/* transform: rotate(.03turn);  */
-}
-
-@keyframes spin {
-	from {
-		transform: rotate(0deg);
-	}
-	to {
-		transform: rotate(360deg);
-	}
-}
-
-.disabled {
-	background-color: black;
-}
diff --git a/css/style.css b/css/style.css
deleted file mode 100644
index 66a5ce7..0000000
--- a/css/style.css
+++ /dev/null
@@ -1,797 +0,0 @@
-/* overall */
-html {
-	scroll-behavior: smooth;
-}
-
-* {
-	font-family: arial, helvetica, sans-serif;
-	font-size: 11pt;
-}
-
-a {
-	color: steelblue;
-	text-decoration: none;
-}
-
-h1 { 
-	font-size:30px;
-}
-
-p {
-	margin: 0px !important;
-}
-
-body {
-	background: #2b475d;
-	margin: 0;
-}
-
-ul{
-	padding:0px;
-	margin:0px;
-}
-
-select{
-	padding:5px;
-	margin-top:5px;
-	border:0px;
-	color:darkgray;
-	font-weight:bold;
-	font-family:fontello, sans-serif;
-	background-color:white;
-	}
-	
-option{
-	font-family:fontello, sans-serif;
-	}
-
-label {
-	color: gray;
-	margin-left: 5px;
-	margin-right: 5px;
-	cursor: pointer;
-}
-
-input[type="radio"]:checked+label {
-	color: black;
-}
-
-input[type="checkbox"]:checked+label {
-	color: red;
-}
-
-input[type="file"], .nloadmore {
-	cursor:pointer;
-}
-
-textarea {
-	resize: none;
-}
-
-/* omnipresent */
-
-.mobile {
-	display:none !important;
-}
-
-.link {
-	color: steelblue;
-	text-decoration: none;
-}
-
-.external:after{
-		font-family:fontello;
-		font-weight:normal;
-		content: ' ';
-		}
-
-/* basic structure */
-
-.topbar {
-	background-color: #14243D;
-	width: 100%;
-	height: 45px;
-	margin: 0;
-	position: relative;
-}
-
-.wrapper {
-	width: 100%;
-	clear: both;
-	display: inline-block;
-	text-align: center;
-}
-
-.container {
-	display: inline-block;
-	text-align: center;
-}
-
-#posts {
-	width: 800px;
-	float: left;
-}
-
-aside {
-	margin-top: 5px;
-	width: 280px;
-	float: left;
-	display: inline-block;
-}
-
-.gotop {
-	background-color: rgba(255, 255, 255, 0.5);
-	width: 30px;
-	height: 30px;
-	padding: 5px;
-	position: fixed;
-	display: table;
-	text-align: center;
-	right: 20px;
-	bottom: 20px;
-	border-radius: 10px;
-}
-
-.gotop a {
-	text-align: center;
-	display: table-cell;
-	vertical-align: middle;
-	color: black;
-	opacity: 0.7;
-	font-size: 20px;
-}
-
-#hiddenside {
-	background-color: rgba(255, 255, 255, 0);
-	position: fixed;
-	right: 10px;
-	bottom: 115px;
-	width: 350px;
-	height: auto;
-}
-
-/* topbar elements */
-
-.topbutton {
-	vertical-align: middle;
-	display: table-cell;
-	line-height: 45px;
-	height: 100%;
-	width: 50px;
-	position: relative;
-}
-
-.topicon {
-	color: white;
-	text-decoration: none;
-	display: inline;
-	font-size: 20px;
-}
-
-.tiselected {
-	border-bottom: 2px solid white;
-}
-
-.ntbutton {
-	position:relative;
-}
-.badge {
-	color: white;
-	text-decoration: none;
-}
-
-.alert {
-	border-radius: 90px;
-	width: 10px;
-	height: 10px;
-	background-color: red;
-	position: absolute;
-	right: 15px;
-	top: 15px;
-	display: none;
-}
-
-#notifications {
-	background-color:white;
-	position: absolute;
-	right: -20px;
-	top: 45px;
-	width: 350px;
-	max-height: 500px;
-	display: none;
-	line-height:12px;
-	overflow-y:scroll;
-	border-radius:3px;
-	box-shadow: 1px 1px 1px black;
-}
-
-.notif{
-	width:330px;
-	height:80px;
-	display:inline-block;
-	border-bottom:1px solid lightgray;
-	text-align:left;
-	position:relative;
-	background-color:white;
-	color:black;
-	-webkit-box-shadow: inset -6px 73px 100px -117px rgba(209,209,209,1);-moz-box-shadow: inset -6px 73px 100px -117px rgba(209,209,209,1);box-shadow: inset -6px 73px 100px -117px rgba(209,209,209,1);
-}
-
-#quicksend {
-	background-color: #305792;
-	border-radius: 3px;
-	border: 1px solid darkgray;
-	color: white;
-	font-weight: bold;
-}	
-
-.notifContents{
-	margin:10px; 
-	display:flex;
-	height:60px; 
-	max-width:325px;
-}
-
-.nloadmore {
-	display:inline-block; 
-	height:20px; 
-	padding-top:10px;
-	color:black
-}
-
-.new {
-	background-color:white;
-}
-
-/* sidebar */
-
-.side_element {
-	background-color: #455f78;
-	border-radius: 3px;
-	box-shadow: 1px 1px 1px black;
-	width: 92%;
-	margin: 10px;
-	display: inline-block;
-	text-align: center;
-	color: lightgray;
-}
-
-.side_element li {
-	font-family: fontello, sans-serif;
-	height:30px;
-	line-height:30px;
-	text-align:left;
-	padding-left:12px;
-	list-style-type: none;
-}
-
-.side_element li:hover {
-	background-color: rgba(255, 255, 255, 0.25);
-}
-
-.side_element li:active {
-	background-color: rgba(255, 255, 255, 0.25);
-}
-
-.side_element a {
-	color: lightgray;
-}
-
-/* posts area elements */
-
-.uploadedImage {
-	width: 60px;
-	margin: 10px 0px 10px 10px;
-	height: 60px;
-	border: 1px solid #ccc;
-	display: inline-block;
-	box-shadow: 3px 3px 3px grey;
-	float: left;
-	background-size: cover;
-}
-
-.uploadBox {
-	width: 100%;
-	display: inline-block;
-	border-bottom: 1px solid #ddd;
-	box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.3), 0 1px rgba(255, 255, 255, 0.1);
-}
-
-.delpic {
-	border-radius:90px;
-	color:red;
-	background-color:white;
-	display:inline-block;
-	cursor:pointer;
-}
-
-.toolbar {
-	width:100%;
-	height:30px;
-	display:block;
-	border-bottom: 1px solid #ddd;
-	background-color:#eee;
-	box-shadow: -1px -1px 1px gray inset;
-}
-
-.toolbarButton{
-	width:30px; 
-	height:100%; 
-	border-right: 1px solid #ccc; 
-	display:inline-block; 
-	
-	line-height:30px; 
-	text-align:center; 
-	position:relative;
-}
-
-#send {
-	padding:5px; 
-	background-color:#305792; 
-	border-radius:3px; 
-	border: 1px solid #305792; 
-	color:white; 
-	font-weight:bold; 
-	margin-top:5px;
-	float:left;
-	}
-	
-.formbtn {
-	background-color:transparent; 
-	border: 0px; 
-	color:#305792; 
-	margin-top:11px;
-	margin-left:15px;
-	float:left;
-	width:20px;
-	height:20px;
-	line-height:20px;
-	text-align:center;
-	overflow:hidden; 
-	font-size:20px;
-}
-
-.formbtn label{
-	margin:-5px;
-	color:#305792; 
-	font-size:20px;
-}
-
-.element {
-	width: 800px;
-	clear: both;
-	display: inline-block;
-	margin-top: 5px;
-}
-
-.profile,.loader {
-	float:left; 
-	background-color:white; 
-	border-radius:5px;
-	width:650px;
-}
-
-.profileButton{
-	padding: 5px;
-	border-radius: 5px;
-	font-family: fontello, sans-serif;
-}
-
-#usermenu .menu {
-	display: none;
-	width: 150px;
-	height: 100px;
-	background-color: #6B91B6;
-	position: absolute;
-	top: 45px;
-	left: -80px;
-	transition: 0.4s;
-}
-
-#usermenu:hover>.menu,
-#usermenu:active>.menu {
-	display: block;
-	transition: 0.4s;
-}
-
-.postMenu {
-	cursor: pointer;
-	position:relative;
-}
-
-.postMenu div{
-	border-radius: 3px;
-	box-shadow: 1px 1px 2px black;
-}
-
-.postMenu li {
-	margin:0px;
-	width:100%;
-	height:35px;
-	display:block;
-	text-align:center;
-	line-height:35px;
-}
-
-.postMenu:hover > div{
-	display:block !important;
-}
-
-.postMenu li:hover {
-	background-color:#203960 !important;
-}
-
-.postMenu li a{
-	color:#203960;
-}
-
-.postMenu li:hover a{
-	color:white;
-}
-
-.postMenu ul {
-	margin:0px;
-	width:100%;
-	padding:0px;
-}
-
-.profileMenu:hover > div, .listmenu:hover > div{
-	display:block !important;
-}
-
-.listmenu li {
-	font-family: fontello, sans-serif;
-	height:30px;
-	line-height:30px;
-	text-align:left;
-	padding-left:12px;
-	list-style-type: none;
-	background-color:black;
-	color:white;
-}
-
-.listmenu li:hover {
-	background-color:white;
-	color:black;
-}
-
-.autl:hover li{
-	background-color:lightgreen !important;
-}
-
-.rutl:hover li{
-	background-color:crimson !important;
-}
-
-.unblock,.unmute,.block,.mute,.follow,
-.unfollow,
-.nsfw,
-.unnsfw,
-.profileMenu,
-.listmenu {
-	background-color: black;
-	color: white;
-	cursor: pointer;
-}
-
-.mute:hover,.block:hover,.follow:hover,
-.nsfw:hover {
-	background-color: lime;
-}
-
-.unmute:hover,.unblock:hover,.unfollow:hover,
-.unnsfw:hover{
-	background-color: crimson !important;
-}
-
-.unbookmark{
-	color: crimson !important;
-}
-
-.felem {
-	margin-left: 10px;
-	float: left;
-}
-
-.unfav {
-	color: red !important;
-}
-
-.unreblog {
-	color: red !important;
-}
-
-.avatar {
-	width: 80px;
-	background-size: 80px;
-	height: 80px;
-	float: left;
-	margin: 15px;
-	border-radius: 10px;
-}
-
-.post,
-.rb,
-.textonly,
-.loadmore {
-	width: 650px;
-	background-color: white;
-	float: left;
-	text-align: center;
-	position: relative;
-	border-radius: 3px;
-	box-shadow: 1px 1px 2px black;
-}
-
-.postform {
-	width:650px;
-	background-color: white;
-	float: left;
-	text-align: center;
-	position: relative;
-	border-radius: 3px;
-	box-shadow: 1px 1px 2px black;
-	display:block !important;
-}
-
-.postHeader {
-	width: 100%;
-	display: inline-block;
-	height: 40px;
-	text-align: left;
-}
-
-.previewpost {
-	display: none;
-	position: absolute;
-	margin-top: -100px;
-	width: 400px;
-	background-color: white;
-	border: 1px solid darkgray;
-	box-shadow: 1px 1px 1px rgba(0,0,0,0.5);
-	border-radius:3px;
-}
-
-.user {
-	position:relative;
-}
-
-.userinfo {
-	display: none;
-	position: absolute;
-	left:0px;
-	top:15px;
-	width: 300px;
-	height: auto;
-	background-color: white;
-	border: 1px solid darkgray;
-	box-shadow: 1px 1px 1px rgba(0,0,0,0.5);
-	border-radius:3px;
-	line-height:initial;
-	z-index:99;
-}
-
-.userinfo_upper{
-	top:-100px;
-}
-
-.userinfo_co {
-	width: 280px;
-	margin: 10px;
-	text-align: center; 
-	position:relative;
-}
-
-.userinfo_he {
-	width: 300px;
-	height: 150px;
-}
-
-.media {
-	width: 100%;
-	display: inline-block;
-}
-
-.img {
-	width: 600px;
-	text-align: center;
-}
-
-.blur {
-	-webkit-filter: blur(25px) brightness(70%) grayscale(100%);
-	/* Safari 6.0 - 9.0 */
-	filter: blur(25px) brightness(70%) grayscale(100%);
-	opacity: 0.5;
-	transition: 0.4s;
-}
-
-.toggleblur {
-	display:none;
-	cursor: pointer;
-	font-family: sans, fontello;
-}
-
-.small {
-	width: 321px !important;
-	height: 321px;
-	line-height: 321px;
-	/* background-color: black; */
-	float:left;
-	margin:2px !important;
-}
-
-.smaller {
-	width: 212px !important;
-	height: 212px;
-	line-height: 212px;
-	/* background-color: black; */
-	float:left;
-	margin:2px !important;
-}
-
-.icon {
-	width: 80px !important;
-	height: 80px !important;
-	line-height: 80px;
-	background-color: black;
-	float:left;
-	text-align:center;
-	margin:2px !important;
-}
-
-.postbody {
-	margin: 15px;
-}
-
-.content {
-	width: 600px;
-	display: inline-block;
-	margin:0px !important;
-	text-align: left;
-}
-
-.post_footer {
-	width: 630px;
-	display: table-cell;
-	clear: both;
-	padding: 10px;
-	height: 20px;
-	text-align: left;
-	background-color: #eee;
-	border-radius: 3px;
-}
-
-.post_buttons {
-	font-family: fontello;
-	float: right;
-	display: inline-block;
-	text-align: right;
-	font-size: 15pt;
-	color: #404040;
-}
-
-.post_buttons a,
-.post_buttons span {
-	font-family: inherit;
-	text-decoration: none;
-	color: inherit;
-	font-size: inherit;
-}
-
-.reply {
-	width: 100%;
-	background-color: #ddd;
-	clear: both;
-	text-align: left;
-	border-bottom: 1px solid #666;
-	display: block;
-}
-
-.note {
-	width: 640px;
-	background-color: #ccc;
-	float: left;
-	text-align: left;
-	border-radius: 5px;
-	padding: 5px;
-}
-
-.button {
-	padding: 15px;
-	background-color: white;
-	float: left;
-	text-align: center;
-	border-radius: 5px;
-	font-size: 20pt;
-}
-
-/* pages */
-
-.setting label {
-	display: block;
-	width: 40px;
-	height: 20px;
-	padding: 5px;
-	background-color: lightgray;
-	float: left;
-	margin: 0px;
-	text-align: center;
-	box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.3), 0 1px rgba(255, 255, 255, 0.1);
-	transition: all 0.3s ease-in-out;
-}
-
-.setting input[type="radio"]:checked+label {
-	color: black;
-	background-color: #305792;
-	box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
-	font-weight: bold;
-	color: white;
-}
-
-
-/* other stuff */
-
-/* <lightbox> */
-.lightbox-opened {
-	/* background-color: #333; */
-	background-color: rgba(50, 50, 50, 0.85);
-	cursor: pointer;
-	height: 100%;
-	/* left: 0; */
-	overflow-y: scroll;
-	position: fixed;
-	text-align: center;
-	top: 0;
-	width: 100%;
-	z-index:105;
-	&:before {
-		background-color: #333;
-		background-color: rgba(#333, 0.9);
-		color: #eee;
-		content: "x";
-		font-family: sans-serif;
-		padding: 6px 12px;
-		position: fixed;
-		text-transform: uppercase;
-	}
-	img {
-		box-shadow: 0 0 6px 3px #333;
-	}
-}
-
-.no-scroll {
-	overflow: hidden;
-}
-
-/* </lightbox> */
-
-.fontello {
-	font-family: fontello;
-}
-
-.loading {
-	font-family: fontello;
-	color: black;
-	content: "\E822";
-	animation-name: spin;
-	animation-duration: 5000ms;
-	animation-iteration-count: infinite;
-	animation-timing-function: linear;
-	/* transform: rotate(3deg); */
-	/* transform: rotate(0.3rad);/ */
-	/* transform: rotate(3grad); */
-	/* transform: rotate(.03turn);  */
-}
-
-@keyframes spin {
-	from {
-		transform: rotate(0deg);
-	}
-	to {
-		transform: rotate(360deg);
-	}
-}
-
-.disabled {
-	background-color: black;
-}
diff --git a/include/functions.php b/include/functions.php
index 49c21c2..281a560 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -64,6 +64,41 @@ function emojify($string, $emojis, $size = 40) {
 }
 
 
+function emoji_list($val){
+	$emojilist = api_get("/custom_emojis");
+	$c = 0;
+	foreach ($emojilist as $emoji){
+		if (starts_with($emoji['shortcode'],$val) && $c < 50){
+			$return .= "<img style='margin:1px;' src='".$emoji['static_url']."' class='emoji' title='".$emoji['shortcode']."' height=40>";
+			$c++;
+		}
+	}
+	if ($c < 50){
+		foreach ($emojilist as $emoji){
+			if ((contains($emoji['shortcode'],$val) && !starts_with($emoji['shortcode'],$val)) && $c < 50){
+				$return .= "<img style='margin:1px;' src='".$emoji['static_url']."' class='emoji' title='".$emoji['shortcode']."' height=40>";
+				$c++;
+			}
+		}
+	}
+	
+	return $return;
+}
+	
+function starts_with($string,$search){
+	if (substr($string,0,strlen($search)) == $search){
+		return true;
+	}
+	return false;
+}
+
+function contains($string,$search){
+	if (is_numeric(strpos($string,$search))){
+		return true;
+	}
+	return false;
+}
+
 /* this function fetches the context (the previous posts and replies) of a specified post 
    $post = ID of the post.
 */
diff --git a/js/scripts.js b/js/scripts.js
index 2271073..7b4cbdd 100644
--- a/js/scripts.js
+++ b/js/scripts.js
@@ -17,6 +17,32 @@ $('body').on('click', '.toggleblur', function(e) {
 	$(this).next('a').toggle();
 });
 
+$('body').on('click', '#emoji', function(e) {
+	$(this).closest(".element").find('.picker').css("display","none");
+	$(this).closest(".element").find('.picker').css("display","block");
+});
+
+$('body').on('click', '.emoji', function(e) {
+	var code = $(this).attr("title");
+	console.log(code);
+	boxtxt = $(this).closest(".element").find("#status").val();
+	$(this).closest(".element").find("#status").val(boxtxt + ":"+code+":");
+});
+
+$('body').on('click', '.close', function(e) {
+	$(this).closest('.element').find('.emojilist').html("");
+	$(this).closest(".element").find('.picker').css("display","none");
+});
+
+$(document).on("change paste keyup","#emojisearch",function () {
+   var val = $(this).val();
+   var list = $(this).closest('.element').find('.emojilist');
+   console.log(val); 
+	$.get("action.php?a=true&emoji=" + val, function(data) {
+		list.html(data);
+	});
+});
+
 // Open Lightbox
 $('body').on('click', '.open-lightbox', function(e) {
 	e.preventDefault();
diff --git a/layout/footer.php b/layout/footer.php
index a8a166c..f7a55e3 100644
--- a/layout/footer.php
+++ b/layout/footer.php
@@ -98,6 +98,7 @@ $query = http_build_query(array_filter(array(
 				sensitive: sensitive
 	        },
 	        function(data) {
+				$(form).closest('.element').find(".picker").css("display","none");
 				if($(form).closest('.element').attr('id') == 'postform'){
 					$(form).find('textarea').val('');
 					$(form).find('.uploadBox').remove();
diff --git a/layout/header.php b/layout/header.php
index 98edf3d..f904664 100644
--- a/layout/header.php
+++ b/layout/header.php
@@ -57,6 +57,10 @@
 		margin-top:4px;
 		display:block;
 	}
+	
+	#emojisearch {
+		border:0;
+	}
 	</style>
 </head>
 <body>
@@ -190,6 +194,8 @@ if ($logedin) {
 						</div>
 						<textarea name='status' id="status" style='width:98.85%; height:100px; border:none;'></textarea>
 					</div>
+					<div style='display:none; clear:both; width:100%; text-align:left;' class='picker'><input type='text' id='emojisearch' placeholder="Type to Search"><span class='close' style='cursor:pointer;'> X </span><div class='emojilist' style='max-height:100px; overflow:auto;'></div></div>
+				<div class="buttons">
 					<span style='float:left;'>
 						<input type='submit' value='Send' id='send' onClick='return false'>
 						<div class='formbtn fontello' style='position:relative;'>
@@ -200,11 +206,14 @@ if ($logedin) {
 							<input type='checkbox' name='sensitive' id='sensitive' style='display:none;'>
 							<label for='sensitive' class='fontello'>&#xe81b;</label>
 						</div>
+						<div class='formbtn fontello' id="emoji" style='position:relative; cursor:pointer;'>
+							&#128540;
+						</div>
 					</span>
 					<span style='float:left;' class='status'>
 
 					</span>						
-					<span style='float:right;'>
+					<span style='float:right;' class="scope">
 						<select name='scope' id='scope'>
 							<option value="1">&#xe83c; Public</option>	
 							<option value="2">&#xe816; Unlisted</option>
@@ -212,6 +221,7 @@ if ($logedin) {
 							<option value="4">&#xf0e0; Direct</option>
 						</select>
 					</span>
+				</div>
 				</form>
 				<div style="clear: both;"></div> 
 				</div>
diff --git a/themes/1994/css/color.css b/themes/1994/css/color.css
index 82c31a5..e3974c9 100644
--- a/themes/1994/css/color.css
+++ b/themes/1994/css/color.css
@@ -2,6 +2,18 @@ a, .link {
 	color: blue;
 }
 
+.content a {
+	padding:1px;
+	color:#62fbff;
+	font-weight:bold;
+	text-shadow: 2px 0px #6a1f21;
+}
+
+.content {
+	color:black;
+	text-shadow: 1px 0px white;
+}
+
 body {
 	background-color: #008282;
 	background-image: url("../vp.jpg");
@@ -138,7 +150,7 @@ input[type="checkbox"]:checked+label {
 	border-left:2px solid #ffffff;
 	border-bottom:2px solid #828282;
 	border-right:2px solid #828282;
-	color:black; 
+	color:white; 
 }
 
 .formbtn {
@@ -277,7 +289,12 @@ input[type="checkbox"]:checked+label {
 	border-bottom:2px solid #828282;
 	border-right:2px solid #828282;
 	box-shadow: 1px 1px 1px rgba(0,0,0,0.8);
-	color:black;
+	color:black !important;
+}
+
+.previewpost a,.userinfo a {
+	color:black !important;
+	text-shadow: 0px 0px black;
 }
 
 .userinfo_he a{
@@ -300,6 +317,7 @@ input[type="checkbox"]:checked+label {
 
 .postHeader a, .postHeader .link {
 	color: white;
+	text-shadow: 1px 0px magenta;
 }
 
 .toggleblur{
diff --git a/themes/1994/templates/replyform.txt b/themes/1994/templates/replyform.txt
index 4b43b5c..32216a5 100644
--- a/themes/1994/templates/replyform.txt
+++ b/themes/1994/templates/replyform.txt
@@ -9,28 +9,34 @@
 			</div>
 			<textarea name='status' id="status" style='width:100%; height:100px; border:none;'>:content:</textarea>
 		</div>
-		<span style='float:left;'>
-			<input type='submit' value='Send' id='send' onClick='return false'>
-			<div class='formbtn fontello' style='position:relative;'>
-				&#xe818;
-				<input style='opacity:0; position:absolute; left:0px; top:5px; background-color:yellow;' type='file' id="files_input_field" name='file[]' multiple onchange="upload_files_reply();">
-			</div>
-			<div class='formbtn fontello' style='position:relative;'>
-				<input type='checkbox' name='sensitive' id='rsensitive' style='display:none;'>
-				<label for='rsensitive' class='fontello'>&#xe81b;</label>
-			</div>
-		</span>
-		<span style='float:left; margin-left:10px;' class='status'>
-			
-		</span>
-		<span style='float:right;'>
-			<select name='scope' id='scope'>
-				<option id="public" value="1">&#xe83c; Public</option>	
-				<option id="unlisted" value="2">&#xe816; Unlisted</option>
-				<option id="private" value="3">&#xe819; Private</option>
-				<option id="direct" value="4">&#xf0e0; Direct</option>
-			</select>
-		</span>
+		<div style='display:none; clear:both; width:100%; text-align:left;' class='picker'><span class='close'> X </span> <input type='text' id='emojisearch'><div class='emojilist' style='max-height:100px; overflow:auto;'></div></div>
+		<div class="buttons">
+			<span style='float:left;'>
+				<input type='submit' value='Send' id='send' onClick='return false'>
+				<div class='formbtn fontello' style='position:relative;'>
+					&#xe818;
+					<input style='opacity:0; position:absolute; left:0px; top:5px; background-color:yellow;' type='file' id="files_input_field" name='file[]' multiple onchange="upload_files_reply();">
+				</div>
+				<div class='formbtn fontello' style='position:relative;'>
+					<input type='checkbox' name='sensitive' id='rsensitive' style='display:none;'>
+					<label for='rsensitive' class='fontello'>&#xe81b;</label>
+				</div>
+				<div class='formbtn fontello' id="emoji" style='position:relative; cursor:pointer;'>
+					&#128540;
+				</div>
+			</span>
+			<span style='float:left; margin-left:10px;' class='status'>
+				
+			</span>
+			<span style='float:right;'>
+				<select name='scope' id='scope'>
+					<option id="public" value="1">&#xe83c; Public</option>	
+					<option id="unlisted" value="2">&#xe816; Unlisted</option>
+					<option id="private" value="3">&#xe819; Private</option>
+					<option id="direct" value="4">&#xf0e0; Direct</option>
+				</select>
+			</span>
+		</div>
 	</form>
 	</div>
 	<div style="clear: both;"></div> 
diff --git a/themes/amplifier/templates/replyform.txt b/themes/amplifier/templates/replyform.txt
index 4b43b5c..32216a5 100644
--- a/themes/amplifier/templates/replyform.txt
+++ b/themes/amplifier/templates/replyform.txt
@@ -9,28 +9,34 @@
 			</div>
 			<textarea name='status' id="status" style='width:100%; height:100px; border:none;'>:content:</textarea>
 		</div>
-		<span style='float:left;'>
-			<input type='submit' value='Send' id='send' onClick='return false'>
-			<div class='formbtn fontello' style='position:relative;'>
-				&#xe818;
-				<input style='opacity:0; position:absolute; left:0px; top:5px; background-color:yellow;' type='file' id="files_input_field" name='file[]' multiple onchange="upload_files_reply();">
-			</div>
-			<div class='formbtn fontello' style='position:relative;'>
-				<input type='checkbox' name='sensitive' id='rsensitive' style='display:none;'>
-				<label for='rsensitive' class='fontello'>&#xe81b;</label>
-			</div>
-		</span>
-		<span style='float:left; margin-left:10px;' class='status'>
-			
-		</span>
-		<span style='float:right;'>
-			<select name='scope' id='scope'>
-				<option id="public" value="1">&#xe83c; Public</option>	
-				<option id="unlisted" value="2">&#xe816; Unlisted</option>
-				<option id="private" value="3">&#xe819; Private</option>
-				<option id="direct" value="4">&#xf0e0; Direct</option>
-			</select>
-		</span>
+		<div style='display:none; clear:both; width:100%; text-align:left;' class='picker'><span class='close'> X </span> <input type='text' id='emojisearch'><div class='emojilist' style='max-height:100px; overflow:auto;'></div></div>
+		<div class="buttons">
+			<span style='float:left;'>
+				<input type='submit' value='Send' id='send' onClick='return false'>
+				<div class='formbtn fontello' style='position:relative;'>
+					&#xe818;
+					<input style='opacity:0; position:absolute; left:0px; top:5px; background-color:yellow;' type='file' id="files_input_field" name='file[]' multiple onchange="upload_files_reply();">
+				</div>
+				<div class='formbtn fontello' style='position:relative;'>
+					<input type='checkbox' name='sensitive' id='rsensitive' style='display:none;'>
+					<label for='rsensitive' class='fontello'>&#xe81b;</label>
+				</div>
+				<div class='formbtn fontello' id="emoji" style='position:relative; cursor:pointer;'>
+					&#128540;
+				</div>
+			</span>
+			<span style='float:left; margin-left:10px;' class='status'>
+				
+			</span>
+			<span style='float:right;'>
+				<select name='scope' id='scope'>
+					<option id="public" value="1">&#xe83c; Public</option>	
+					<option id="unlisted" value="2">&#xe816; Unlisted</option>
+					<option id="private" value="3">&#xe819; Private</option>
+					<option id="direct" value="4">&#xf0e0; Direct</option>
+				</select>
+			</span>
+		</div>
 	</form>
 	</div>
 	<div style="clear: both;"></div> 
diff --git a/themes/ancientbird/templates/replyform.txt b/themes/ancientbird/templates/replyform.txt
index 4b43b5c..32216a5 100644
--- a/themes/ancientbird/templates/replyform.txt
+++ b/themes/ancientbird/templates/replyform.txt
@@ -9,28 +9,34 @@
 			</div>
 			<textarea name='status' id="status" style='width:100%; height:100px; border:none;'>:content:</textarea>
 		</div>
-		<span style='float:left;'>
-			<input type='submit' value='Send' id='send' onClick='return false'>
-			<div class='formbtn fontello' style='position:relative;'>
-				&#xe818;
-				<input style='opacity:0; position:absolute; left:0px; top:5px; background-color:yellow;' type='file' id="files_input_field" name='file[]' multiple onchange="upload_files_reply();">
-			</div>
-			<div class='formbtn fontello' style='position:relative;'>
-				<input type='checkbox' name='sensitive' id='rsensitive' style='display:none;'>
-				<label for='rsensitive' class='fontello'>&#xe81b;</label>
-			</div>
-		</span>
-		<span style='float:left; margin-left:10px;' class='status'>
-			
-		</span>
-		<span style='float:right;'>
-			<select name='scope' id='scope'>
-				<option id="public" value="1">&#xe83c; Public</option>	
-				<option id="unlisted" value="2">&#xe816; Unlisted</option>
-				<option id="private" value="3">&#xe819; Private</option>
-				<option id="direct" value="4">&#xf0e0; Direct</option>
-			</select>
-		</span>
+		<div style='display:none; clear:both; width:100%; text-align:left;' class='picker'><span class='close'> X </span> <input type='text' id='emojisearch'><div class='emojilist' style='max-height:100px; overflow:auto;'></div></div>
+		<div class="buttons">
+			<span style='float:left;'>
+				<input type='submit' value='Send' id='send' onClick='return false'>
+				<div class='formbtn fontello' style='position:relative;'>
+					&#xe818;
+					<input style='opacity:0; position:absolute; left:0px; top:5px; background-color:yellow;' type='file' id="files_input_field" name='file[]' multiple onchange="upload_files_reply();">
+				</div>
+				<div class='formbtn fontello' style='position:relative;'>
+					<input type='checkbox' name='sensitive' id='rsensitive' style='display:none;'>
+					<label for='rsensitive' class='fontello'>&#xe81b;</label>
+				</div>
+				<div class='formbtn fontello' id="emoji" style='position:relative; cursor:pointer;'>
+					&#128540;
+				</div>
+			</span>
+			<span style='float:left; margin-left:10px;' class='status'>
+				
+			</span>
+			<span style='float:right;'>
+				<select name='scope' id='scope'>
+					<option id="public" value="1">&#xe83c; Public</option>	
+					<option id="unlisted" value="2">&#xe816; Unlisted</option>
+					<option id="private" value="3">&#xe819; Private</option>
+					<option id="direct" value="4">&#xf0e0; Direct</option>
+				</select>
+			</span>
+		</div>
 	</form>
 	</div>
 	<div style="clear: both;"></div> 
diff --git a/themes/bythebook/templates/replyform.txt b/themes/bythebook/templates/replyform.txt
index 4b43b5c..32216a5 100644
--- a/themes/bythebook/templates/replyform.txt
+++ b/themes/bythebook/templates/replyform.txt
@@ -9,28 +9,34 @@
 			</div>
 			<textarea name='status' id="status" style='width:100%; height:100px; border:none;'>:content:</textarea>
 		</div>
-		<span style='float:left;'>
-			<input type='submit' value='Send' id='send' onClick='return false'>
-			<div class='formbtn fontello' style='position:relative;'>
-				&#xe818;
-				<input style='opacity:0; position:absolute; left:0px; top:5px; background-color:yellow;' type='file' id="files_input_field" name='file[]' multiple onchange="upload_files_reply();">
-			</div>
-			<div class='formbtn fontello' style='position:relative;'>
-				<input type='checkbox' name='sensitive' id='rsensitive' style='display:none;'>
-				<label for='rsensitive' class='fontello'>&#xe81b;</label>
-			</div>
-		</span>
-		<span style='float:left; margin-left:10px;' class='status'>
-			
-		</span>
-		<span style='float:right;'>
-			<select name='scope' id='scope'>
-				<option id="public" value="1">&#xe83c; Public</option>	
-				<option id="unlisted" value="2">&#xe816; Unlisted</option>
-				<option id="private" value="3">&#xe819; Private</option>
-				<option id="direct" value="4">&#xf0e0; Direct</option>
-			</select>
-		</span>
+		<div style='display:none; clear:both; width:100%; text-align:left;' class='picker'><span class='close'> X </span> <input type='text' id='emojisearch'><div class='emojilist' style='max-height:100px; overflow:auto;'></div></div>
+		<div class="buttons">
+			<span style='float:left;'>
+				<input type='submit' value='Send' id='send' onClick='return false'>
+				<div class='formbtn fontello' style='position:relative;'>
+					&#xe818;
+					<input style='opacity:0; position:absolute; left:0px; top:5px; background-color:yellow;' type='file' id="files_input_field" name='file[]' multiple onchange="upload_files_reply();">
+				</div>
+				<div class='formbtn fontello' style='position:relative;'>
+					<input type='checkbox' name='sensitive' id='rsensitive' style='display:none;'>
+					<label for='rsensitive' class='fontello'>&#xe81b;</label>
+				</div>
+				<div class='formbtn fontello' id="emoji" style='position:relative; cursor:pointer;'>
+					&#128540;
+				</div>
+			</span>
+			<span style='float:left; margin-left:10px;' class='status'>
+				
+			</span>
+			<span style='float:right;'>
+				<select name='scope' id='scope'>
+					<option id="public" value="1">&#xe83c; Public</option>	
+					<option id="unlisted" value="2">&#xe816; Unlisted</option>
+					<option id="private" value="3">&#xe819; Private</option>
+					<option id="direct" value="4">&#xf0e0; Direct</option>
+				</select>
+			</span>
+		</div>
 	</form>
 	</div>
 	<div style="clear: both;"></div> 
diff --git a/themes/chicago/templates/replyform.txt b/themes/chicago/templates/replyform.txt
index 4b43b5c..32216a5 100644
--- a/themes/chicago/templates/replyform.txt
+++ b/themes/chicago/templates/replyform.txt
@@ -9,28 +9,34 @@
 			</div>
 			<textarea name='status' id="status" style='width:100%; height:100px; border:none;'>:content:</textarea>
 		</div>
-		<span style='float:left;'>
-			<input type='submit' value='Send' id='send' onClick='return false'>
-			<div class='formbtn fontello' style='position:relative;'>
-				&#xe818;
-				<input style='opacity:0; position:absolute; left:0px; top:5px; background-color:yellow;' type='file' id="files_input_field" name='file[]' multiple onchange="upload_files_reply();">
-			</div>
-			<div class='formbtn fontello' style='position:relative;'>
-				<input type='checkbox' name='sensitive' id='rsensitive' style='display:none;'>
-				<label for='rsensitive' class='fontello'>&#xe81b;</label>
-			</div>
-		</span>
-		<span style='float:left; margin-left:10px;' class='status'>
-			
-		</span>
-		<span style='float:right;'>
-			<select name='scope' id='scope'>
-				<option id="public" value="1">&#xe83c; Public</option>	
-				<option id="unlisted" value="2">&#xe816; Unlisted</option>
-				<option id="private" value="3">&#xe819; Private</option>
-				<option id="direct" value="4">&#xf0e0; Direct</option>
-			</select>
-		</span>
+		<div style='display:none; clear:both; width:100%; text-align:left;' class='picker'><span class='close'> X </span> <input type='text' id='emojisearch'><div class='emojilist' style='max-height:100px; overflow:auto;'></div></div>
+		<div class="buttons">
+			<span style='float:left;'>
+				<input type='submit' value='Send' id='send' onClick='return false'>
+				<div class='formbtn fontello' style='position:relative;'>
+					&#xe818;
+					<input style='opacity:0; position:absolute; left:0px; top:5px; background-color:yellow;' type='file' id="files_input_field" name='file[]' multiple onchange="upload_files_reply();">
+				</div>
+				<div class='formbtn fontello' style='position:relative;'>
+					<input type='checkbox' name='sensitive' id='rsensitive' style='display:none;'>
+					<label for='rsensitive' class='fontello'>&#xe81b;</label>
+				</div>
+				<div class='formbtn fontello' id="emoji" style='position:relative; cursor:pointer;'>
+					&#128540;
+				</div>
+			</span>
+			<span style='float:left; margin-left:10px;' class='status'>
+				
+			</span>
+			<span style='float:right;'>
+				<select name='scope' id='scope'>
+					<option id="public" value="1">&#xe83c; Public</option>	
+					<option id="unlisted" value="2">&#xe816; Unlisted</option>
+					<option id="private" value="3">&#xe819; Private</option>
+					<option id="direct" value="4">&#xf0e0; Direct</option>
+				</select>
+			</span>
+		</div>
 	</form>
 	</div>
 	<div style="clear: both;"></div> 
diff --git a/themes/cuatro/templates/replyform.txt b/themes/cuatro/templates/replyform.txt
index 4b43b5c..32216a5 100644
--- a/themes/cuatro/templates/replyform.txt
+++ b/themes/cuatro/templates/replyform.txt
@@ -9,28 +9,34 @@
 			</div>
 			<textarea name='status' id="status" style='width:100%; height:100px; border:none;'>:content:</textarea>
 		</div>
-		<span style='float:left;'>
-			<input type='submit' value='Send' id='send' onClick='return false'>
-			<div class='formbtn fontello' style='position:relative;'>
-				&#xe818;
-				<input style='opacity:0; position:absolute; left:0px; top:5px; background-color:yellow;' type='file' id="files_input_field" name='file[]' multiple onchange="upload_files_reply();">
-			</div>
-			<div class='formbtn fontello' style='position:relative;'>
-				<input type='checkbox' name='sensitive' id='rsensitive' style='display:none;'>
-				<label for='rsensitive' class='fontello'>&#xe81b;</label>
-			</div>
-		</span>
-		<span style='float:left; margin-left:10px;' class='status'>
-			
-		</span>
-		<span style='float:right;'>
-			<select name='scope' id='scope'>
-				<option id="public" value="1">&#xe83c; Public</option>	
-				<option id="unlisted" value="2">&#xe816; Unlisted</option>
-				<option id="private" value="3">&#xe819; Private</option>
-				<option id="direct" value="4">&#xf0e0; Direct</option>
-			</select>
-		</span>
+		<div style='display:none; clear:both; width:100%; text-align:left;' class='picker'><span class='close'> X </span> <input type='text' id='emojisearch'><div class='emojilist' style='max-height:100px; overflow:auto;'></div></div>
+		<div class="buttons">
+			<span style='float:left;'>
+				<input type='submit' value='Send' id='send' onClick='return false'>
+				<div class='formbtn fontello' style='position:relative;'>
+					&#xe818;
+					<input style='opacity:0; position:absolute; left:0px; top:5px; background-color:yellow;' type='file' id="files_input_field" name='file[]' multiple onchange="upload_files_reply();">
+				</div>
+				<div class='formbtn fontello' style='position:relative;'>
+					<input type='checkbox' name='sensitive' id='rsensitive' style='display:none;'>
+					<label for='rsensitive' class='fontello'>&#xe81b;</label>
+				</div>
+				<div class='formbtn fontello' id="emoji" style='position:relative; cursor:pointer;'>
+					&#128540;
+				</div>
+			</span>
+			<span style='float:left; margin-left:10px;' class='status'>
+				
+			</span>
+			<span style='float:right;'>
+				<select name='scope' id='scope'>
+					<option id="public" value="1">&#xe83c; Public</option>	
+					<option id="unlisted" value="2">&#xe816; Unlisted</option>
+					<option id="private" value="3">&#xe819; Private</option>
+					<option id="direct" value="4">&#xf0e0; Direct</option>
+				</select>
+			</span>
+		</div>
 	</form>
 	</div>
 	<div style="clear: both;"></div> 
diff --git a/themes/custom/templates/replyform.txt b/themes/custom/templates/replyform.txt
index 4b43b5c..32216a5 100644
--- a/themes/custom/templates/replyform.txt
+++ b/themes/custom/templates/replyform.txt
@@ -9,28 +9,34 @@
 			</div>
 			<textarea name='status' id="status" style='width:100%; height:100px; border:none;'>:content:</textarea>
 		</div>
-		<span style='float:left;'>
-			<input type='submit' value='Send' id='send' onClick='return false'>
-			<div class='formbtn fontello' style='position:relative;'>
-				&#xe818;
-				<input style='opacity:0; position:absolute; left:0px; top:5px; background-color:yellow;' type='file' id="files_input_field" name='file[]' multiple onchange="upload_files_reply();">
-			</div>
-			<div class='formbtn fontello' style='position:relative;'>
-				<input type='checkbox' name='sensitive' id='rsensitive' style='display:none;'>
-				<label for='rsensitive' class='fontello'>&#xe81b;</label>
-			</div>
-		</span>
-		<span style='float:left; margin-left:10px;' class='status'>
-			
-		</span>
-		<span style='float:right;'>
-			<select name='scope' id='scope'>
-				<option id="public" value="1">&#xe83c; Public</option>	
-				<option id="unlisted" value="2">&#xe816; Unlisted</option>
-				<option id="private" value="3">&#xe819; Private</option>
-				<option id="direct" value="4">&#xf0e0; Direct</option>
-			</select>
-		</span>
+		<div style='display:none; clear:both; width:100%; text-align:left;' class='picker'><span class='close'> X </span> <input type='text' id='emojisearch'><div class='emojilist' style='max-height:100px; overflow:auto;'></div></div>
+		<div class="buttons">
+			<span style='float:left;'>
+				<input type='submit' value='Send' id='send' onClick='return false'>
+				<div class='formbtn fontello' style='position:relative;'>
+					&#xe818;
+					<input style='opacity:0; position:absolute; left:0px; top:5px; background-color:yellow;' type='file' id="files_input_field" name='file[]' multiple onchange="upload_files_reply();">
+				</div>
+				<div class='formbtn fontello' style='position:relative;'>
+					<input type='checkbox' name='sensitive' id='rsensitive' style='display:none;'>
+					<label for='rsensitive' class='fontello'>&#xe81b;</label>
+				</div>
+				<div class='formbtn fontello' id="emoji" style='position:relative; cursor:pointer;'>
+					&#128540;
+				</div>
+			</span>
+			<span style='float:left; margin-left:10px;' class='status'>
+				
+			</span>
+			<span style='float:right;'>
+				<select name='scope' id='scope'>
+					<option id="public" value="1">&#xe83c; Public</option>	
+					<option id="unlisted" value="2">&#xe816; Unlisted</option>
+					<option id="private" value="3">&#xe819; Private</option>
+					<option id="direct" value="4">&#xf0e0; Direct</option>
+				</select>
+			</span>
+		</div>
 	</form>
 	</div>
 	<div style="clear: both;"></div> 
diff --git a/themes/default/templates/replyform.txt b/themes/default/templates/replyform.txt
index 4b43b5c..32216a5 100644
--- a/themes/default/templates/replyform.txt
+++ b/themes/default/templates/replyform.txt
@@ -9,28 +9,34 @@
 			</div>
 			<textarea name='status' id="status" style='width:100%; height:100px; border:none;'>:content:</textarea>
 		</div>
-		<span style='float:left;'>
-			<input type='submit' value='Send' id='send' onClick='return false'>
-			<div class='formbtn fontello' style='position:relative;'>
-				&#xe818;
-				<input style='opacity:0; position:absolute; left:0px; top:5px; background-color:yellow;' type='file' id="files_input_field" name='file[]' multiple onchange="upload_files_reply();">
-			</div>
-			<div class='formbtn fontello' style='position:relative;'>
-				<input type='checkbox' name='sensitive' id='rsensitive' style='display:none;'>
-				<label for='rsensitive' class='fontello'>&#xe81b;</label>
-			</div>
-		</span>
-		<span style='float:left; margin-left:10px;' class='status'>
-			
-		</span>
-		<span style='float:right;'>
-			<select name='scope' id='scope'>
-				<option id="public" value="1">&#xe83c; Public</option>	
-				<option id="unlisted" value="2">&#xe816; Unlisted</option>
-				<option id="private" value="3">&#xe819; Private</option>
-				<option id="direct" value="4">&#xf0e0; Direct</option>
-			</select>
-		</span>
+		<div style='display:none; clear:both; width:100%; text-align:left;' class='picker'><span class='close'> X </span> <input type='text' id='emojisearch'><div class='emojilist' style='max-height:100px; overflow:auto;'></div></div>
+		<div class="buttons">
+			<span style='float:left;'>
+				<input type='submit' value='Send' id='send' onClick='return false'>
+				<div class='formbtn fontello' style='position:relative;'>
+					&#xe818;
+					<input style='opacity:0; position:absolute; left:0px; top:5px; background-color:yellow;' type='file' id="files_input_field" name='file[]' multiple onchange="upload_files_reply();">
+				</div>
+				<div class='formbtn fontello' style='position:relative;'>
+					<input type='checkbox' name='sensitive' id='rsensitive' style='display:none;'>
+					<label for='rsensitive' class='fontello'>&#xe81b;</label>
+				</div>
+				<div class='formbtn fontello' id="emoji" style='position:relative; cursor:pointer;'>
+					&#128540;
+				</div>
+			</span>
+			<span style='float:left; margin-left:10px;' class='status'>
+				
+			</span>
+			<span style='float:right;'>
+				<select name='scope' id='scope'>
+					<option id="public" value="1">&#xe83c; Public</option>	
+					<option id="unlisted" value="2">&#xe816; Unlisted</option>
+					<option id="private" value="3">&#xe819; Private</option>
+					<option id="direct" value="4">&#xf0e0; Direct</option>
+				</select>
+			</span>
+		</div>
 	</form>
 	</div>
 	<div style="clear: both;"></div> 
diff --git a/themes/monad/templates/replyform.txt b/themes/monad/templates/replyform.txt
index e1fadd2..32216a5 100644
--- a/themes/monad/templates/replyform.txt
+++ b/themes/monad/templates/replyform.txt
@@ -3,34 +3,40 @@
 	<div style='text-align:right; background-color:white;'>
 	<form action='status.php' method='post' enctype='multipart/form-data'>
 		<input type='hidden' id='thread' name='thread' value=':id:'>
-		<div style='width:100%; border: 0px; text-align:left;'>
-			<div style='width:100% height:27px; border-bottom: 0px;'>
+		<div style='width:100%; border: 1px solid #ddd; text-align:left;'>
+			<div style='width:100% height:27px; border-bottom: 1px solid #ddd;'>
 				<input type='text' name='spoiler' value='Title (optional)' onClick='this.value=""' style='border:none; width:100%;'>
 			</div>
 			<textarea name='status' id="status" style='width:100%; height:100px; border:none;'>:content:</textarea>
 		</div>
-		<span style='float:left;'>
-			<input type='submit' value='Send' id='send' onClick='return false'>
-			<div class='formbtn fontello' style='position:relative;'>
-				&#xe818;
-				<input style='opacity:0; position:absolute; left:0px; top:5px; background-color:yellow;' type='file' id="files_input_field" name='file[]' multiple onchange="upload_files_reply();">
-			</div>
-			<div class='formbtn fontello' style='position:relative;'>
-				<input type='checkbox' name='sensitive' id='rsensitive' style='display:none;'>
-				<label for='rsensitive' class='fontello'>&#xe81b;</label>
-			</div>
-		</span>
-		<span style='float:left; margin-left:10px;' class='status'>
-			
-		</span>
-		<span style='float:right;'>
-			<select name='scope' id='scope'>
-				<option id="public" value="1">&#xe83c; Public</option>	
-				<option id="unlisted" value="2">&#xe816; Unlisted</option>
-				<option id="private" value="3">&#xe819; Private</option>
-				<option id="direct" value="4">&#xf0e0; Direct</option>
-			</select>
-		</span>
+		<div style='display:none; clear:both; width:100%; text-align:left;' class='picker'><span class='close'> X </span> <input type='text' id='emojisearch'><div class='emojilist' style='max-height:100px; overflow:auto;'></div></div>
+		<div class="buttons">
+			<span style='float:left;'>
+				<input type='submit' value='Send' id='send' onClick='return false'>
+				<div class='formbtn fontello' style='position:relative;'>
+					&#xe818;
+					<input style='opacity:0; position:absolute; left:0px; top:5px; background-color:yellow;' type='file' id="files_input_field" name='file[]' multiple onchange="upload_files_reply();">
+				</div>
+				<div class='formbtn fontello' style='position:relative;'>
+					<input type='checkbox' name='sensitive' id='rsensitive' style='display:none;'>
+					<label for='rsensitive' class='fontello'>&#xe81b;</label>
+				</div>
+				<div class='formbtn fontello' id="emoji" style='position:relative; cursor:pointer;'>
+					&#128540;
+				</div>
+			</span>
+			<span style='float:left; margin-left:10px;' class='status'>
+				
+			</span>
+			<span style='float:right;'>
+				<select name='scope' id='scope'>
+					<option id="public" value="1">&#xe83c; Public</option>	
+					<option id="unlisted" value="2">&#xe816; Unlisted</option>
+					<option id="private" value="3">&#xe819; Private</option>
+					<option id="direct" value="4">&#xf0e0; Direct</option>
+				</select>
+			</span>
+		</div>
 	</form>
 	</div>
 	<div style="clear: both;"></div> 
diff --git a/themes/phubbub/templates/replyform.txt b/themes/phubbub/templates/replyform.txt
index e1fadd2..32216a5 100644
--- a/themes/phubbub/templates/replyform.txt
+++ b/themes/phubbub/templates/replyform.txt
@@ -3,34 +3,40 @@
 	<div style='text-align:right; background-color:white;'>
 	<form action='status.php' method='post' enctype='multipart/form-data'>
 		<input type='hidden' id='thread' name='thread' value=':id:'>
-		<div style='width:100%; border: 0px; text-align:left;'>
-			<div style='width:100% height:27px; border-bottom: 0px;'>
+		<div style='width:100%; border: 1px solid #ddd; text-align:left;'>
+			<div style='width:100% height:27px; border-bottom: 1px solid #ddd;'>
 				<input type='text' name='spoiler' value='Title (optional)' onClick='this.value=""' style='border:none; width:100%;'>
 			</div>
 			<textarea name='status' id="status" style='width:100%; height:100px; border:none;'>:content:</textarea>
 		</div>
-		<span style='float:left;'>
-			<input type='submit' value='Send' id='send' onClick='return false'>
-			<div class='formbtn fontello' style='position:relative;'>
-				&#xe818;
-				<input style='opacity:0; position:absolute; left:0px; top:5px; background-color:yellow;' type='file' id="files_input_field" name='file[]' multiple onchange="upload_files_reply();">
-			</div>
-			<div class='formbtn fontello' style='position:relative;'>
-				<input type='checkbox' name='sensitive' id='rsensitive' style='display:none;'>
-				<label for='rsensitive' class='fontello'>&#xe81b;</label>
-			</div>
-		</span>
-		<span style='float:left; margin-left:10px;' class='status'>
-			
-		</span>
-		<span style='float:right;'>
-			<select name='scope' id='scope'>
-				<option id="public" value="1">&#xe83c; Public</option>	
-				<option id="unlisted" value="2">&#xe816; Unlisted</option>
-				<option id="private" value="3">&#xe819; Private</option>
-				<option id="direct" value="4">&#xf0e0; Direct</option>
-			</select>
-		</span>
+		<div style='display:none; clear:both; width:100%; text-align:left;' class='picker'><span class='close'> X </span> <input type='text' id='emojisearch'><div class='emojilist' style='max-height:100px; overflow:auto;'></div></div>
+		<div class="buttons">
+			<span style='float:left;'>
+				<input type='submit' value='Send' id='send' onClick='return false'>
+				<div class='formbtn fontello' style='position:relative;'>
+					&#xe818;
+					<input style='opacity:0; position:absolute; left:0px; top:5px; background-color:yellow;' type='file' id="files_input_field" name='file[]' multiple onchange="upload_files_reply();">
+				</div>
+				<div class='formbtn fontello' style='position:relative;'>
+					<input type='checkbox' name='sensitive' id='rsensitive' style='display:none;'>
+					<label for='rsensitive' class='fontello'>&#xe81b;</label>
+				</div>
+				<div class='formbtn fontello' id="emoji" style='position:relative; cursor:pointer;'>
+					&#128540;
+				</div>
+			</span>
+			<span style='float:left; margin-left:10px;' class='status'>
+				
+			</span>
+			<span style='float:right;'>
+				<select name='scope' id='scope'>
+					<option id="public" value="1">&#xe83c; Public</option>	
+					<option id="unlisted" value="2">&#xe816; Unlisted</option>
+					<option id="private" value="3">&#xe819; Private</option>
+					<option id="direct" value="4">&#xf0e0; Direct</option>
+				</select>
+			</span>
+		</div>
 	</form>
 	</div>
 	<div style="clear: both;"></div>