diff --git a/modules/settings.php b/modules/settings.php
index 6fa8800..8af6dcf 100644
--- a/modules/settings.php
+++ b/modules/settings.php
@@ -25,7 +25,7 @@
 				<h2>Bio</h2>
 				<div class='setting'>
 					<textarea name='bio' style='width:85%; height:100px'><?php
-							echo trim(strip_tags(str_replace("<br/>","\n",$info['note'])));
+							echo trim(strip_tags(str_replace(array("<br/>","<br />"),"\n",$info['note'])));
 						?></textarea>
 				</div>
 				
diff --git a/modules/timeline.php b/modules/timeline.php
index cfd61b7..0327f1b 100644
--- a/modules/timeline.php
+++ b/modules/timeline.php
@@ -144,7 +144,7 @@ if ((!isset($thread[0]['id']) && !empty($thread)) || !is_array($thread)) {
 			$post['handle'] = explode("@",$elem['reblog']['account']['acct'])[0];
 			
 			$post['replyto'] = "<span>" . ($elem['reblog']['in_reply_to_id'] ? " <a class='fontello link preview ldr' target='_blank' id='" . $elem['reblog']['in_reply_to_id'] . "' href='?thread=" . $elem['reblog']['in_reply_to_id'] . "'>&#xf112;</a>" : "") . "</span>";
-			$post['rt'] = "<div style='display:inline-block; font-family:fontello, sans-serif; vertical-align:top;'>[ &#xe826; <img src='" . $elem['account']['avatar'] . "' width=20 style='border-radius:5px; vertical-align:middle;'> <span class='user' id='" . $elem['account']['id'] . "'><a class='link ldr' style='font-size:12px;' id='" . $elem['account']['id'] . "' href='?user=" . $elem['account']['id'] . "'><span>@" . explode("@", $elem['account']['acct']) [0] . "</a></span> ]</div>";
+			$post['rt'] = "<div style='display:inline-block; font-family:fontello, sans-serif; vertical-align:top;'>&#xe826; by <img src='" . $elem['account']['avatar'] . "' width=20 style='border-radius:5px; vertical-align:middle;'> <span class='user' id='" . $elem['account']['id'] . "'><a class='link ldr' style='font-size:12px;' id='" . $elem['account']['id'] . "' href='?user=" . $elem['account']['id'] . "'><span>@" . explode("@", $elem['account']['acct']) [0] . "</a></span></div>";
 			$elem = $elem['reblog'];
 		}
 		else {
diff --git a/themes/hitech/bg.jpg b/themes/hitech/bg.jpg
new file mode 100644
index 0000000..9faa038
Binary files /dev/null and b/themes/hitech/bg.jpg differ
diff --git a/themes/hitech/css/color.css b/themes/hitech/css/color.css
new file mode 100644
index 0000000..8d54f44
--- /dev/null
+++ b/themes/hitech/css/color.css
@@ -0,0 +1,373 @@
+a, .link, a > span {
+	color: #b7fff4;
+	text-shadow: 0 0 3px rgba(212,151,107,0.8);
+}
+
+div,span,p {
+	color:#ecf3fd;
+}
+
+body {
+	background-color: #11141b;
+	background-image: url("../bg.jpg");
+}
+
+select{
+	color:black;
+	background-color: rgba(255,255,255,0.9);
+	border-left: 6px solid #ff6300;
+}
+
+label {
+	color: #ff6300;
+}
+
+textarea,input[type="text"]{
+	border: 2px solid #edf3fe;
+	border-left: 6px solid #ff6300;
+	background-color: rgba(255,255,255,0.9);
+	color:black;
+	box-shadow: 5px 0 2px rgba(237,243,254,0.2);
+}
+
+input[type="radio"]:checked+label {
+	color: black;
+}
+
+input[type="checkbox"]:checked+label {
+	color: #ff6300;
+}
+
+.topbar {
+	background-color: rgba(0,0,0,0.5);
+	border-bottom: 2px solid #edf3fe;
+}
+
+.appname {
+	color: #edf3fe;
+	text-shadow: 0 0 5px rgba(237,243,254,1);
+}
+
+.gotop {
+	background-color: rgba(223,234,250,0.4);
+	border: 2px solid #edf3fe;
+}
+
+.gotop a {
+	color: #ff6300;
+	text-shadow: 0 0 3px rgba(212,151,107,1);
+}
+
+.topicon {
+	color: #edf3fe;
+}
+
+.tiselected {
+	color: #edf3fe;
+	text-shadow: 0 0 5px rgba(237,243,254,1);
+	border-bottom: 2px solid #ff6300;
+}
+
+.badge {
+	color: #edf3fe;
+}
+
+.alert {
+	background-color: red;
+}
+
+#notifications {
+	background-color: rgba(10,10,10,0.8);
+	border: 2px solid #edf3fe;
+	border-right: 6px solid #edf3fe;
+	box-shadow: 5px 0 2px rgba(237,243,254,0.2);
+	box-shadow: 5px 0 2px rgba(237,243,254,0.2) inset;
+}
+
+.notif{
+	border-left: 6px solid #edf3fe;
+	border-bottom:1px solid #eeaa88;
+	background-color:rgba(223,234,250,0.1);
+	color:white;
+	transition: border 1s;
+}
+
+
+.notif:hover{
+	border-left: 6px solid #ff6300;
+}
+
+.new,.previewpost,.userinfo {
+	border: 2px solid #edf3fe;
+	border-left: 6px solid #ff6300;
+	background-color: rgba(10,10,10,0.8);
+	color:white;
+	box-shadow: 5px 0 2px rgba(237,243,254,0.2);
+}
+
+.menu {
+	border: 2px solid #edf3fe;
+}
+
+.menu li{
+transition: border 1s;
+}
+
+.menu, .menu li{
+	border-left: 6px solid #fff;
+	background-color: rgba(10,10,10,0.8) !important;
+	color:white !important;
+}
+
+.menu a {
+	color:white !important;
+}
+
+.menu li:hover{
+	border-left: 6px solid #ff6300;
+	background-color:B94A00 !important;
+}
+
+.menu li:hover a {
+	color:#fff !important;
+}
+
+.side_element,.postform {
+	background-color: rgba(223,234,250,0.4);
+	border: 2px solid #edf3fe;
+	border-right: 6px solid #edf3fe;
+	box-shadow: 5px 0 2px rgba(237,243,254,0.2);
+	box-shadow: 5px 0 2px rgba(237,243,254,0.2) inset;
+}
+
+.side_element:first-of-type,.postform {
+	border-right: 6px solid #ff6300;
+}
+
+.side_element li {
+	transition: color 1s;
+	transition: border 1s;
+}
+
+.side_element li:hover {
+	background-color: rgba(255, 255, 255, 0.25);
+	border-right: 6px solid #ff6300;
+	box-shadow: 5px 0 2px rgba(237,243,254,0.2);
+}
+
+.side_element li:active {
+	background-color: rgba(255, 255, 255, 0.25);
+}
+
+.side_element a {
+	color: white;
+}
+
+.uploadBox {
+	box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.3), 0 1px rgba(255, 255, 255, 0.1);
+}
+
+.delpic {
+	color:red;
+	background-color:white;
+}
+
+input[type="submit"] {
+	background-color:#739ccb; 
+	border: 1px solid #fff; 
+	color:white; 
+	transition: background-color 1s;
+}
+
+input[type="submit"]:hover {
+	background-color:#ff6300; 
+}
+
+.search input[type="submit"] {
+	color:#800 !important;
+	background-color:transparent !important; 
+	border: 0px !important; 
+}
+
+.formbtn {
+	color:#fff; 
+}
+
+.formbtn label{
+	color:#fff; 
+}
+
+.menu div{
+	box-shadow: 1px 1px 2px black;
+}
+
+.listmenu li {
+	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;
+}
+
+.unfav, .unreblog{
+	color: red !important;
+}
+
+.loadingImage{
+	background-image: url("../loadingb.png") !important;
+}
+
+.post,
+.rb,
+.textonly,
+.loadmore,.profile,.loader {
+	background-color: rgba(0,0,0,0.4);
+	border: 2px solid #edf3fe;
+	border-right: 6px solid #edf3fe;
+	box-shadow: 0 0 4px rgba(237,243,254,1);
+	box-shadow: 0 0 5px rgba(237,243,254,1) inset;
+}
+/*
+.postform,.searchmobile {
+	background-color: #eeaa88;
+	border:1px solid #eeaa88;
+}
+*/
+
+.icon {
+	background-color: black;
+}
+
+.toggleblur{
+	background-color: #117743;
+	color:white;
+}
+
+.polloption{
+	display:block;
+	margin:5px;
+	padding:5px;
+	background-color: rgba(223,234,250,0.4);
+	border:2px solid rgba(223,234,250,1);
+	border-right: 6px solid #edf3fe;
+	border-radius:3px;
+	color:#FFF;
+	font-weight:bold;
+	transition: background-color 1s;
+}
+
+.polloption:hover:not(.fixed),.voted{
+	cursor: pointer;
+	background-color: #ff6300;
+	color:white;
+}
+
+.voteBar{
+	background-color: #ff6300;
+	box-shadow: 0 0 4px rgba(237,243,254,1);
+}
+
+.post_footer {
+	background-color: rgba(223,234,250,0.4);
+	border-top:2px solid rgba(223,234,250,1);
+}
+.postAge{
+  color: #edf3fF !important;
+  text-shadow: 0 0 5px rgba(237,243,254,1);	
+}
+
+.felem a:hover > span {
+	background-color: #ff6300;
+	border:1px solid #fff;
+	color: #fff;
+}
+
+
+
+.public::after {
+	content: '';
+}
+
+.unlisted::after {
+	content: '';
+}
+
+.private::after {
+	content: '';
+}
+
+.direct::after {
+	content: '';
+}
+
+.post_buttons {
+	color: #425f99;
+}
+
+.notif .post_buttons {
+	background-color: #fff0d7;
+}
+
+.reply {
+	background-color: rgba(223,234,250,0.4);
+	border-bottom: 1px solid #fff;
+}
+
+.reply:hover {
+	border-right: 1px solid #ff6300;
+}
+
+.note {
+	background-color: #ccc;
+}
+
+.button {
+	background-color: white;
+}
+
+.setting label {
+	background-color: rgba(255, 255, 255, 0.8);
+	box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.3), 0 1px rgba(255, 255, 255, 0.1);
+	color:#800000;
+}
+
+.setting input[type="radio"]:checked+label {
+	background-color: #ff6300;
+	box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+	color: white;
+}
diff --git a/themes/hitech/css/mobile.css b/themes/hitech/css/mobile.css
new file mode 100644
index 0000000..d2614c2
--- /dev/null
+++ b/themes/hitech/css/mobile.css
@@ -0,0 +1,16 @@
+body {
+	margin: 0;
+	background-attachment: fixed;
+    background-size: auto 100%;
+    background-repeat: no-repeat;
+    background-position: center top;
+}
+
+.content {
+	width:90% !important;
+}
+
+.postMenu {
+	padding:3px 5px 3px 5px;
+	margin-top:-11px !important;
+}
diff --git a/themes/hitech/css/style.css b/themes/hitech/css/style.css
new file mode 100644
index 0000000..e1562c9
--- /dev/null
+++ b/themes/hitech/css/style.css
@@ -0,0 +1,6 @@
+body {
+	background-attachment: fixed;
+    background-size: cover;
+	margin: 0;
+}
+
diff --git a/themes/hitech/loadingb.png b/themes/hitech/loadingb.png
new file mode 100644
index 0000000..bc9c44b
Binary files /dev/null and b/themes/hitech/loadingb.png differ
diff --git a/themes/mammoth/css/color.css b/themes/mammoth/css/color.css
new file mode 100644
index 0000000..9f10d6d
--- /dev/null
+++ b/themes/mammoth/css/color.css
@@ -0,0 +1,140 @@
+body,.profileButton {
+	background-color: #06090c !important;
+}
+
+p,div,span{
+	color:white;
+}
+
+a {
+	color:#49a2cf;
+}
+
+input[type="submit"], .setting input[type="radio"]:checked+label{
+	background-color: #2b90d9;
+	color:white;
+	border:1px solid #2b90d9;
+	border-radius:2px;
+}
+
+.setting input[type="radio"]+label{
+	background-color: black;
+}
+
+.search input[type="submit"]{
+	color: #9baec8;
+	background-color:transparent;
+	border:0px;
+}
+
+input[type="text"]{
+	border:0px;
+}
+
+.topbar,.gotop{
+	background-color:#192432;
+}
+
+.alert {
+	background-color: #2b90d9;
+}
+
+
+.post,.postform,.notif,.loadmore,#notifications,.nloadmore,.loader {
+	background-color:#192432;
+	border-radius:0px !important;
+}
+
+.contact * {
+	color:black !important;
+}
+
+.contact:hover * {
+	color:white !important;
+}
+
+.post {
+	border-bottom:2px solid #202e3f;
+}
+
+.post_buttons a{
+	color:#3e5a7c;
+}
+
+.reply,.previewpost,.userinfo{
+	background-color: #121a24;
+}
+
+.previewpost,.userinfo{
+	border:1px solid #202e3f;
+}
+
+.unfav, .unreblog{
+	color: red !important;
+}
+
+.element{
+	margin:-2px !important;
+}
+
+.element_pad > .post {
+	border-left:3px solid #0b82d2;;
+	box-shadow: 1px 1px 1px rgba(0,0,0,0.5);
+}
+
+.menu {
+	background-color:#d9e1e8;
+}
+
+.menu a {
+	color: #06090c !important;
+}
+
+.menu li:hover a,.topicon,.side_element a {
+	color: #d9e1e8 !important;
+}
+
+.menu li:hover {
+	background-color: #06090c !important;
+}
+
+.side_element li:hover {
+	color: #fff !important;
+}
+
+.public::after {
+	content: '';
+}
+
+.unlisted::after {
+	content: '';
+}
+
+.private::after {
+	content: '';
+}
+
+.direct::after {
+	content: '';
+}
+.polloption{
+	display:block;
+	margin:5px;
+	padding:5px;
+	background-color: white;
+	border:2px solid #7dbcda;
+	border-radius:7px;
+	color:#048fb3;
+	font-weight:bold;
+}
+
+.polloption:hover:not(.fixed),.voted{
+	cursor: pointer;
+	border:2px solid #7dbcda;
+	background-color: #7dbcda;
+	color:white;
+}
+
+.voteBar{
+	background-color: #048fb3;
+}
\ No newline at end of file
diff --git a/themes/whistler/css/color.css b/themes/whistler/css/color.css
index 53f237a..8324758 100644
--- a/themes/whistler/css/color.css
+++ b/themes/whistler/css/color.css
@@ -118,6 +118,11 @@ input[type="checkbox"]:checked+label {
 	color:white !important;
 }
 
+.notif .profileButton{
+	color:black !important;
+	border: 1px solid black;
+}
+
 .side_element li:hover {
 	background-color: #000082;
 	color:white;