diff --git a/README.md b/README.md
index 928fc7e..2750779 100644
--- a/README.md
+++ b/README.md
@@ -2,4 +2,5 @@
 
 - ussrbasic
 - ussrbasicpub
-- ussrbasictwopanel
\ No newline at end of file
+- ussrbasicleft
+- ussrbasicright
\ No newline at end of file
diff --git a/ussrbasictwopanel/css/blockmode.css b/ussrbasicleft/css/blockmode.css
similarity index 100%
rename from ussrbasictwopanel/css/blockmode.css
rename to ussrbasicleft/css/blockmode.css
diff --git a/ussrbasictwopanel/css/mod_page.css b/ussrbasicleft/css/mod_page.css
similarity index 100%
rename from ussrbasictwopanel/css/mod_page.css
rename to ussrbasicleft/css/mod_page.css
diff --git a/ussrbasictwopanel/css/narrow_navbar.css b/ussrbasicleft/css/narrow_navbar.css
similarity index 100%
rename from ussrbasictwopanel/css/narrow_navbar.css
rename to ussrbasicleft/css/narrow_navbar.css
diff --git a/ussrbasictwopanel/css/sloppy_photos.css b/ussrbasicleft/css/sloppy_photos.css
similarity index 100%
rename from ussrbasictwopanel/css/sloppy_photos.css
rename to ussrbasicleft/css/sloppy_photos.css
diff --git a/ussrbasicleft/css/style.css b/ussrbasicleft/css/style.css
new file mode 100644
index 0000000..3c438d3
--- /dev/null
+++ b/ussrbasicleft/css/style.css
@@ -0,0 +1,1831 @@
+/**
+ * Ussrbasicleft
+ *
+ * Based on duepuntozero Friendica style
+ * Originally by Fabio Comuni <fabrix.xm@gmail.com>
+ */
+
+
+/* generals */
+
+html {
+	font-size: $font_size;
+}
+
+body {
+	font-size: 0.9rem;
+	background-color: $bgcolour;
+	background-image: url('$background_image');
+	background-attachment: fixed;
+	background-size: cover;
+	color: $font_colour;
+	margin: 0px;
+}
+
+aside {
+	width: $aside_widthpx;
+	min-width: $aside_widthpx;
+	max-width: $aside_widthpx;
+}
+
+aside #region_1 {
+	border-right: 1px solid transparent;
+}
+
+aside #left_aside_wrapper,
+aside #right_aside_wrapper {
+	margin-bottom: 10px;
+}
+
+main {
+	margin-left: auto;
+	margin-right: auto;
+	max-width: $main_widthpx;
+}
+
+#overlay {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	background: rgba(0, 0, 0, .5);
+	cursor: pointer;
+	z-index: 1028;
+}
+
+h1, .h1 {
+	font-size: 2rem;
+}
+
+h2, .h2 {
+	font-size: 1.6rem;
+}
+
+h3, .h3 {
+	font-size: 1.2rem;
+}
+
+h4, .h4 {
+	font-size: 1.05rem;
+}
+
+h5, .h5 {
+	font-size: 0.9rem;
+}
+
+h6, .h6 {
+	font-size: 0.75rem;
+}
+
+#banner {
+	color: $banner_colour;
+	font-weight: bold;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+#banner img {
+	max-height: 1.35rem;
+	width: auto;
+}
+
+.jslider {
+	font-family: sans-serif, arial, freesans;
+}
+
+abbr {
+	border-bottom: none;
+}
+
+/* icons */
+
+a,
+.fakelink {
+  color: $link_colour;
+}
+
+
+a:hover,
+a:focus,
+.fakelink:hover,
+.fakelink:focus {
+  color: $link_colour;
+}
+
+.fakelink,
+.cursor-pointer {
+	cursor: pointer;
+}
+
+input, optgroup, select, textarea {
+	font-size: 0.9rem !important;
+}
+
+input[type=text], textarea {
+	resize: vertical;
+	background-color: $comment_item_colour;
+	color: $font_colour;
+}
+
+.selected-doco-nav {
+	font-weight: bold;
+	text-shadow: 2px 2px 3px lightgray;
+}
+
+#doco-content img {
+	width: 100%;
+}
+
+#help-content pre code {
+	overflow-x: auto;
+	white-space: pre;
+}
+
+pre code {
+	border: none;
+	padding: 1em 1.5em;
+}
+
+code {
+	background: #ccc;
+	color: #000;
+}
+
+pre {
+	background: #F5F5F5;
+	color: #333;
+	border:1px solid #ccc;
+	border-radius: $radius;
+}
+
+.heart {
+	color: #FF0000;
+}
+
+nav {
+	opacity: $nav_float_min_opacity;
+	filter:alpha(opacity=$nav_percent_min_opacity);
+}
+
+#powered-by {
+	font-size: 0.5rem;
+	position: absolute;
+	top: 50px;
+	left: 16px;
+}
+
+#powered-by img {
+	margin-top: -2px;
+	height: 10px;
+	width: 10px;
+}
+
+.error-message {
+	color: #FF0000;
+	font-size: 1.1em;
+	border: 1px solid #FF8888;
+	background-color: #FFEEEE;
+	padding: 10px;
+}
+
+.nav-channel-select { margin-left: 8px; }
+
+/* contextual help */
+.contextual-help-content {
+	display: none;
+
+}
+
+.contextual-help-content-open {
+	display: block;
+	position: fixed;
+	top: 3.35rem;
+	left: 0px;
+	width: 100%;
+	max-height: 50%;
+	background: $comment_item_colour;
+	padding: 1rem;
+	border-bottom: #ccc 1px solid;
+	overflow: auto;
+	-moz-box-shadow: 0px 3px 3px rgba(0,0,0,0.2);
+	-webkit-box-shadow: 0px 3px 3px rgba(0,0,0,0.2);
+	box-shadow: 0px 3px 3px rgba(0,0,0,0.2);
+}
+
+.contextual-help-content dd {
+	margin-bottom: 1em;
+}
+
+.contextual-help-tool {
+	padding: 7px;
+	filter: alpha(opacity=20);
+	opacity: .5;
+}
+
+.contextual-help-tool:hover {
+	filter: alpha(opacity=50);
+	opacity: 1;
+	text-decoration: none;
+}
+
+.contextual-help-tool i {
+	color: $font_colour;
+	font-size: 1.05rem;
+}
+
+/* contextual help end */
+
+/* spinner */
+
+.spinner-wrapper {
+	display: none;
+}
+
+.spinner.s {
+	height: 1rem;
+	width: 1rem;
+}
+
+.spinner.m {
+	height: 2rem;
+	width: 2rem;
+}
+
+.spinner.l {
+	height: 3rem;
+	width: 3rem;
+}
+
+.spinner.s,
+.spinner.m,
+.spinner.l {
+	margin: 0 auto;
+	position: relative;
+	-webkit-animation: rotation 1s infinite linear;
+	-moz-animation: rotation 1s infinite linear;
+	-o-animation: rotation 1s infinite linear;
+	animation: rotation 1s infinite linear;
+	border-left: .2rem solid rgba(77, 77, 77, .15);
+	border-right: .2rem solid rgba(77, 77, 77, .15);
+	border-bottom: .2rem solid rgba(77, 77, 77, .15);
+	border-top: .2rem solid rgba(77, 77, 77, .5);
+	border-radius: 100%;
+}
+
+@-webkit-keyframes rotation {
+	from {
+		-webkit-transform: rotate(0deg);
+	}
+	to {
+		-webkit-transform: rotate(359deg);
+	}
+}
+
+@-moz-keyframes rotation {
+	from {
+		-moz-transform: rotate(0deg);
+	}
+	to {
+		-moz-transform: rotate(359deg);
+	}
+}
+
+@-o-keyframes rotation {
+	from {
+		-o-transform: rotate(0deg);
+	}
+	to {
+		-o-transform: rotate(359deg);
+	}
+}
+
+@keyframes rotation {
+	from {
+		transform: rotate(0deg);
+	}
+	to {
+		transform: rotate(359deg);
+	}
+}
+
+/* spinner end */
+
+/* jumping dots */
+.jumping-dots span {
+	position: relative;
+	bottom: 0px;
+	transition-timing-function: ease-in-out;
+	-webkit-animation: jump 1s infinite;
+	animation: jump 1s infinite;
+}
+
+.jumping-dots .dot-1 {
+	-webkit-animation-delay: 200ms;
+	animation-delay: 200ms;
+}
+
+.jumping-dots .dot-2 {
+	-webkit-animation-delay: 400ms;
+	animation-delay: 400ms;
+}
+
+.jumping-dots .dot-3 {
+	-webkit-animation-delay: 600ms;
+	animation-delay: 600ms;
+}
+
+@-webkit-keyframes jump {
+	0% {
+		bottom: 0px;
+	}
+	20% {
+		bottom: 3px;
+	}
+	40% {
+		bottom: 0px;
+	}
+}
+
+@keyframes jump {
+	0%   {bottom: 0px;}
+	20%  {bottom: 3px;}
+	40%  {bottom: 0px;}
+}
+/* jumping dots end */
+
+/* footer */
+
+footer {
+	position:fixed;
+	bottom:1px;
+	text-align: right;
+	padding-bottom: 1em;
+	padding-right: 3em; 
+}
+
+.birthday-today,
+.event-today {
+	font-weight: bold;
+}
+
+.warning-text {
+	font-size: 1.2em;
+	font-weight: bold;
+	color: #ff0000;
+}
+
+#noperm-msg {
+	margin-top: 15px;
+}
+
+.preview-indicator {
+}
+
+#theme-preview {
+	margin: 15px 0px;
+}
+
+#cropimage-wrapper,
+#cropimage-preview-wrapper {
+	margin-bottom: 10px;
+}
+
+.fn {
+	font-weight: bold;
+	font-size: 1rem;
+	color: #444444;
+}
+
+.vcard {
+	margin-bottom: 10px;
+	padding: 0px 10px 10px 10px;
+	background-color: rgba(254,254,254,0.5);
+	border: 1px solid rgba(254,254,254,0.5);
+	border-radius: $radius;
+	word-wrap: break-word;
+}
+
+.vcard dl,
+.vcard .title {
+	margin-top: 10px;
+	margin-bottom: 0px;
+}
+
+.connect-btn-wrapper {
+	margin-bottom: 10px;
+
+}
+
+.profile-edit-side-link {
+	padding: 3px 0px;
+	opacity: 0;
+	filter:alpha(opacity=30);
+	float: right;
+}
+
+.vcard:hover .profile-edit-side-link {
+	opacity: 1;
+	filter:alpha(opacity=100);
+}
+
+#profile-photo-wrapper img {
+	width: 100%;
+	height: 100%;
+	max-width: 300px;
+	max-height: 300px;
+}
+
+#profile-photo-wrapper {
+	width: 251px;
+	height: 251px;
+	margin-bottom: 10px;
+	border-radius: $radius;
+}
+
+#hide-friends-yes-label,
+#hide-friends-no-label {
+	margin-left: 125px;
+	float: left;
+	width: 50px;
+}
+
+#fsuggest-desc, #fsuggest-submit-wrapper {
+	margin-top: 15px;
+	margin-bottom: 15px;
+}
+
+.app-name {
+	overflow: none;
+}
+
+.app-container img {
+	margin-left: auto;
+	margin-right: auto;
+	width: 80px;
+	height: 80px;
+	display: block;
+}
+
+.pager {
+  padding: 10px;
+  text-align: center;
+  font-size: 1.0em;
+}
+
+
+.pager_first,
+.pager_last,
+.pager_prev,
+.pager_next,
+.pager-prev,
+.pager-next,
+.pager_n { 
+	border: 1px solid #ccc;
+	background: transparent;
+	padding: 4px;
+}
+
+.pager_current {
+	border: 1px solid transparent;
+	background: transparent;
+	padding: 4px;
+}
+
+.photo,
+.contact-block-img {
+	border-radius: $radius;
+	box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444;
+}
+
+#side-bar-photos-albums {
+	margin-top: 15px;
+}
+
+#side-bar-photos-albums ul {
+	list-style: none;
+}
+
+.profile-match-photo img,
+.directory-photo-img {
+	border-radius: $radius;
+	box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444;
+}
+
+.profile-match-photo img {
+	width: $top_photo !important;
+	height: $top_photo !important;
+}
+
+#photo-view-wrapper {
+	background-color: $item_colour;
+}
+
+.pmenu.horizontal {
+	padding: 0 0 0 0;
+	border-bottom: none;
+}
+
+.pmenu.horizontal .pmenu-title {
+	display: none;
+}
+.pmenu.horizontal ul {
+	-moz-padding-start: 0;
+}
+
+.pmenu.horizontal li {
+	margin-left: 0;
+	display: inline;
+	padding-right: 15px;
+}
+
+.group-delete-wrapper {
+	float: right;
+}
+
+#pause {
+	position: fixed;
+	bottom: 5px;
+	right: 5px;
+}
+
+#contact-block {
+	width: 100%;
+}
+
+#contact-block-numcontacts {
+	font-weight: bold;
+	margin-bottom:10px;
+}
+
+.contact-block-div {
+	display: inline;
+}
+
+.contact-block-textdiv {
+	width: 150px;
+	height: 34px;
+}
+
+.contact-block-img {
+	width:47px;
+	height:47px;
+	margin-bottom: 3px;
+}
+
+#tag-remove {
+	margin-bottom: 15px;
+}
+
+#tagrm li {
+	margin-bottom: 10px;
+}
+
+#tagrm-submit, #tagrm-cancel {
+	margin-top: 25px;
+}
+
+#tagrm-cancel {
+	margin-left: 15px;
+}
+
+.wall-item-conv {
+	background-color: $comment_item_colour;
+}
+
+#nav-notifications-template,
+#nav-notifications-forums-template {
+	display: none;
+}
+
+#nav-search-spinner {
+	float: right;
+	margin-top: -1.4rem;
+	margin-right: 1rem;
+}
+
+
+#nav-search-text {
+	width: 280px;
+	padding: .15rem .5rem;
+}
+
+nav .acpopup {
+	top: 46px !important;
+	margin-left: -35px;
+	width: 290px;
+}
+
+.clear {
+	clear: both;
+}
+
+.descriptive-text {
+	color: #888;
+}
+
+#plugin-settings-link, #account-settings-link {
+	margin-bottom: 10px;
+}
+
+#uexport-link {
+	margin-bottom: 20px;
+}
+
+#network-new-link {
+	margin-top: 15px;
+	margin-bottom: 15px;
+}
+
+#cboxOverlay {
+	z-index: 1050;
+}
+
+#colorbox {
+	z-index: 1051;
+}
+
+#cboxContent {
+	padding: 3px;
+	border: 0px solid #fff;
+	border-radius: $radius;
+	background-color: #fff;
+	z-index: 1052;
+}
+
+.app-title {
+	margin: 10px;
+}
+
+.profile-match-photo {
+	float: left;
+}
+
+.profile-match-name {
+	width: 116px;
+	height: 1.5em;
+	overflow: hidden !important;
+}
+
+.profile-match-note {
+	text-align: center;
+}
+
+.profile-match-connect {
+	text-align: center;
+	font-weight: bold;
+}
+
+.profile-match-wrapper {
+    float: left;
+    width: 118px;
+    height: 118px;
+    padding: 10px;
+    margin: 8px 10px 0 0;
+    border-top: 1px solid #eee;
+    border-left: 2px solid #eee;
+}
+.profile-match-ignore {
+	float: right;
+}
+
+.side-link {
+	margin-bottom: 15px;
+}
+
+#prof-members {
+	margin-top: 20px;
+	padding: 10px;
+	height: 250px;
+	overflow: auto;
+	border: 1px solid #ddd;
+}
+
+#prof-separator {
+	margin-top: 10px;
+	margin-bottom: 10px;
+}
+
+#prof-all-contacts {
+	padding: 10px;
+	height: 450px;
+	overflow: auto;
+	border: 1px solid #ddd;
+}
+
+#prof-edit-desc {
+	margin-top: 15px;
+}
+
+.required {
+	color: #ff0000;
+}
+
+.notif-image {
+	height: 80px;
+	width: 80px;
+	margin-right: 15px;
+}
+
+/**
+ * OAuth
+ */
+.oauthapp {
+	height: auto; overflow: auto;
+	border-bottom: 2px solid #cccccc;
+	padding-bottom: 1em;
+	margin-bottom: 1em;	
+}
+.oauthapp img {
+	float: left;
+	width: 48px; height: 48px;
+	margin: 10px;
+}
+.oauthapp .icon {
+	margin-right: 20px;
+}
+
+.oauthapp img.noicon {
+	background-image: url("../../../../images/icons/48/plugin.png");
+	background-position: center center;
+	background-repeat: no-repeat;
+}
+.oauthapp a {
+	float: left;
+}
+
+
+.body-attach {
+	margin-top: 10px;
+}
+
+.acpopup li div.taggable {
+	color:#cc0000;
+}
+
+/* popup notifications */
+div.jGrowl div.notice {
+  background: #511919 url("../../../../images/icons/48/notice.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+div.jGrowl div.info {
+  background: #364e59 url("../../../../images/icons/48/info.png") no-repeat 5px center;
+  color: #ffffff;
+  padding-left: 58px;
+}
+#jGrowl.top-right {
+	top: 4.5rem;
+	right: 15px;
+}
+
+div.jGrowl div.jGrowl-notification {
+    min-height: 60px;
+}
+
+.jslider .jslider-scale ins {
+	color: #333;
+	font-size: 0.9rem;
+	width: 100px;
+	text-align: center;
+}
+
+.conv-participants {
+	color: $font_colour;
+}
+
+.contactname {
+	font-weight: bold;
+	color: $font_colour;
+	display: block;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+.dropdown-notification,
+.notification,
+.member-item {
+	line-height: 1.2em;
+	font-size: 0.75rem;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	display: block;
+	white-space: nowrap;
+}
+
+.notification.notification-forum {
+	font-size: 0.9rem;
+	color: $font_colour;
+}
+
+#acl-search::-webkit-input-placeholder {
+	/* non-fontawesome fonts set a fallback for text parts of the placeholder*/
+	font-family: ForkAwesome, sans-serif, arial, freesans;
+}
+
+#acl-search::-moz-placeholder {
+	/* non-fontawesome fonts set a fallback for text parts of the placeholder*/
+	font-family: ForkAwesome, sans-serif, arial, freesans;
+}
+
+.acl-item-header {
+	width: 100%;
+}
+
+.acl-list-item.grouphide {
+	border: 1px solid red;
+	z-index: 2;
+}
+
+.acl-list-item.groupshow {
+	border: 1px solid green;
+	z-index: 2;
+}
+
+.acl-list-item.taggable {
+	background-color: #ddddff;
+}
+
+.acl-button-show,
+.acl-button-hide {
+	float: right;
+	margin-left: 5px;
+}
+
+.contact-block-content {
+	margin-top: 10px;
+}
+.contact-block-img.archived,
+.app-deleted,
+.dim {
+	opacity: 0.3;
+	filter:alpha(opacity=30);
+}
+
+
+.profile-match-connect {
+	margin-top: 5px;
+}
+
+.reshared-content {
+	margin-left: 20px;
+}
+
+.reshared-content img {
+	width: 100%;
+}
+
+.shared_header img {
+	border-radius: $radius;
+	margin-right: 10px;
+}
+
+.tag1 {
+    font-size : 0.9em !important;
+  }
+.tag2 {
+    font-size : 1.0em !important;
+  }
+
+
+.tag3 {
+    font-size : 1.1em !important;
+  }
+
+
+.tag4 {
+    font-size : 1.2em !important;
+  }
+
+
+.tag5 {
+    font-size : 1.3em !important;
+  }
+
+
+.tag6 {
+    font-size : 1.4em !important;
+  }
+
+
+.tag7 {
+    font-size : 1.5em !important;
+  }
+
+
+.tag8 {
+    font-size : 1.6em !important;
+  }
+
+
+.tag9 {
+    font-size : 1.7em !important;
+  }
+
+
+.tag10 {
+    font-size : 1.8em !important;
+  }
+
+div#write-pages {
+display: block;
+background: silver;
+width: 100%;
+}
+
+div#write-pages a {
+color: #000;
+margin-right: 50px;
+}
+
+.pmenu ul {
+	list-style-type: none;
+}
+
+.generic-icons,
+a .generic-icons {
+	font-size: 1rem;
+	margin-right: 0.5rem;
+	color: $font_colour;
+}
+
+.generic-icons-right {
+	font-size: 1rem;
+	margin-left: 0.5rem;
+	color: $font_colour;
+}
+
+.generic-icons:hover,
+a .generic-icons:hover,
+.generic-icons-right:hover,
+a .generic-icons-right:hover {
+	color: $font_colour;
+}
+
+.generic-icons-nav {
+	font-size: 1rem;
+	margin-right: 7px;
+}
+
+.admin-icons {
+	font-size: 1.2em;
+	margin-right: 7px;
+}
+
+.drop-icons,
+a .drop-icons {
+	font-size: 1rem;
+	color: $font_colour;
+	text-decoration: none;
+	cursor: pointer;
+}
+
+.drop-icons:hover,
+a .drop-icons:hover {
+	color: #FF0000;
+}
+
+.lockview,
+.sys-apps-toggle {
+	cursor: pointer;
+}
+
+.permission-inherited {
+	float: left;
+	margin-right: 10px;
+	color: #FF0000;
+}
+
+.perm-inherited {
+	color: #FF0000;
+}
+
+
+#menulist {
+	list-style-type: none;
+}
+
+#adminpage table tr:hover {
+	background-color: #BBC7D7;
+}
+
+table {
+	border-spacing: 2px;
+	max-width: 100%;
+}
+
+th,td {
+	padding: 3px;
+}
+
+#channels > tbody > tr > td, #users > tbody > tr > td {
+	max-width: 19.4em;
+	overflow: hidden;
+}
+	
+/* mail */
+
+img.mail-conv-sender-photo {
+	border-radius: $radius;
+}
+
+/* jot */
+
+.jothidden {
+	font-weight: bold;
+}
+
+.jothidden input::-webkit-input-placeholder {
+	font-weight: bold;
+}
+
+.jothidden input::-moz-placeholder {
+	font-weight: bold;
+}
+
+#profile-jot-wrapper {
+	background-color: rgba(254, 254, 254, 1);
+	border: 1px solid rgba(0, 0, 0, .2);
+	border-radius: $radius;
+
+}
+
+#jot-title,
+#jot-pagetitle,
+#profile-jot-text {
+	border-radius: $radius;
+}
+
+#profile-jot-text::-webkit-input-placeholder {
+	font-size: 1.2rem;
+}
+
+#profile-jot-text::-moz-placeholder {
+	font-size: 1.2rem;
+}
+
+#profile-jot-text:focus::-webkit-input-placeholder {
+	color: transparent;
+}
+
+#profile-jot-text:focus::-moz-placeholder {
+	color: transparent;
+}
+
+#profile-jot-text-loading {
+	color: #777;
+	display: none;
+}
+
+.jot-icons.jot-lock-warn {
+	color: darkorange;
+}
+
+
+/* conversation */
+
+.top-radius {
+	border-top-right-radius: $radius;
+	border-top-left-radius: $radius;
+}
+
+.wall-event-item {
+	padding: 10px;
+	color: #fff;
+	background-color: #3A87AD; /* should reflect calendar color */
+	border-top-left-radius: $radius;
+	border-top-right-radius: $radius;
+}
+
+.wall-photo-item img {
+	max-width: 100% !important;
+	border-top-right-radius: $radius;
+	border-top-left-radius: $radius;
+}
+
+.wall-item-footer {
+	font-size: 0.75rem;
+	margin-top: 2em;
+}
+
+.wall-item-content-wrapper {
+	background-color: $item_colour;
+	border-top-right-radius: $radius;
+	border-top-left-radius: $radius;
+}
+
+.wall-item-content-wrapper.comment {
+	background-color: $comment_item_colour;
+	border-top-right-radius: 0px;
+	border-top-left-radius: 0px;
+}
+
+.hide-comments-outer {
+	background-color: $comment_item_colour;
+	border-top-color: #ccc;
+	border-style: solid;
+	border-top-style: dashed;
+	border-width: 1px 0px 0px 0px;
+	text-align: center;
+	border-radius: 0px;
+}
+
+.hide-comments-outer:hover {
+	border-top: 1px dashed #adadad;
+}
+
+.wall-item-comment-wrapper {
+	padding: 7px 10px;
+	background-color: $item_colour;
+	border-radius: 0px;
+	border-bottom-right-radius: $radius;
+	border-bottom-left-radius: $radius;
+	border-top: 3px solid $comment_item_colour;
+}
+
+.wall-item-comment-wrapper-wc {
+	border-top: 0px solid $comment_item_colour;
+}
+
+
+.wall-item-photo {
+	width: $top_photo;
+	height: $top_photo;
+	border: none;
+	border-radius: $radius;
+	box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444;
+}
+
+.comment .wall-item-photo {
+	width: $reply_photo;
+	height: $reply_photo;
+}
+
+.wall-item-ago,
+.dropdown-sub-text {
+	color: #777;
+}
+
+.wall-item-content,
+.mail-conv-body,
+.page-body,
+.chat-item-text,
+.chat-item-text-self {
+	font-size: 1rem;
+}
+
+
+.comment-edit-text {
+	border: 1px solid #ccc;
+	border-radius: $radius;
+}
+
+.divgrow-showmore {
+	display: block;
+	border-top: 1px dashed #ccc;
+	text-align: center;
+}
+
+.divgrow-showmore:hover {
+	border-top: 1px dashed #adadad;
+}
+
+.directory-item .divgrow-showmore {
+	background-color: $comment_item_colour;
+}
+
+/* widgets */
+
+.widget {
+	background-color: rgba(254,254,254,.5);
+	border: 1px solid rgba(254,254,254,.5);
+	border-radius: $radius;
+}
+
+#note-text {
+	border-radius: $radius;
+}
+
+.fileas-ul {
+	list-style-type: none;
+}
+
+#datebrowse-sidebar select {
+	border: 1px solid #ccc;
+	border-radius: $radius;
+}
+
+.thing-show img {
+	margin: 10px;
+}
+
+.abook-self {
+	background-color: #ffdddd;
+}
+
+.abook-pending-contact, .abook-permschange {
+	background: orange;
+}
+
+.online-now {
+	color: red;
+	cursor: pointer;
+}
+
+.chat-item-photo,
+.chat-item-photo-self {
+	border-radius: $radius;
+}
+
+.chat-item-title,
+.chat-item-title-self {
+	border-radius: $radius;
+	background-color: $item_colour;
+}
+
+#chatMembers img {
+	border-radius: $radius;
+}
+
+.menu-img-3 {
+	width: 3.3em;
+	height: 3.3em;
+	margin-right: 5px;
+	border-radius: $radius;
+	float: left;
+}
+
+.menu-img-2 {
+	height: 2.2em;
+	width: 2.2em;
+	margin-right: 5px;
+	border-radius: $radius;
+	float: left;
+}
+
+.menu-img-1 {
+	height: 1.28571429em;
+	width: 1.28571429em;
+	border-radius: $radius;
+}
+
+.usermenu {
+	width: 3.75rem;
+}
+
+#avatar {
+	width: 2.35rem;
+	height: 2.35rem;
+	border-radius: $radius;
+}
+
+#nav-app-link {
+	padding: 0 !important;
+	line-height: 1.175;
+	white-space: nowrap;
+}
+
+.page-title {
+	margin: 7px 0px;
+}
+
+.generic-content-wrapper-styled {
+	background-color: $bgcolour;
+	padding: 10px;
+	border-radius: $radius;
+}
+
+.generic-content-wrapper {
+	border: 1px solid rgba(0, 0, 0, .2);
+	border-radius: $radius;
+	margin-bottom: 1.5rem;
+}
+
+.section-title-wrapper {
+	padding: 7px 10px;
+	background-color: $item_colour;
+	border-top-left-radius: $radius;
+	border-top-right-radius: $radius;
+	border-bottom: 3px solid $comment_item_colour;
+}
+
+.section-title-wrapper h2,
+.section-subtitle-wrapper h3 {
+	margin-top: 0px;
+	margin-bottom: 0px;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+.section-subtitle-wrapper h3 {
+	padding: 3px;
+}
+
+.section-subtitle-wrapper {
+	padding: 4px 10px;
+	background-color: $item_colour;
+	border-bottom: 3px solid $comment_item_colour;
+}
+
+.section-content-tools-wrapper {
+	padding: 7px 10px;
+	background-color: $comment_item_colour;
+	border-bottom: 3px solid $comment_item_colour;
+}
+
+.section-content-info-wrapper {
+	padding: 21px 10px;
+	color: #0c5460;
+	background-color: #d1ecf1;
+	border-bottom: 3px solid $comment_item_colour;
+	text-align: center;
+}
+
+.section-content-warning-wrapper {
+	padding: 21px 10px;
+	color: #856404;
+	background-color: #fff3cd;
+	border-bottom: 3px solid $comment_item_colour;
+	text-align: center;
+}
+
+.section-content-danger-wrapper {
+	padding: 21px 10px;
+	color: #721c24;
+	background-color: #f8d7da;
+	border-bottom: 3px solid $comment_item_colour;
+	text-align: center;
+}
+
+.section-content-tools-wrapper .section-content-info-wrapper,
+.section-content-wrapper .section-content-info-wrapper,
+.section-content-tools-wrapper .section-content-warning-wrapper,
+.section-content-wrapper .section-content-warning-wrapper,
+.section-content-tools-wrapper .section-content-danger-wrapper,
+.section-content-wrapper .section-content-danger-wrapper {
+	margin-bottom: 10px;
+	border-bottom: none;
+	border-radius: $radius;
+}
+
+
+.section-content-wrapper {
+	padding: 7px 10px;
+	background-color: $comment_item_colour;
+	border-bottom-left-radius: $radius;
+	border-bottom-right-radius: $radius;
+	word-wrap: break-word;
+}
+
+.section-content-wrapper-np {
+	background-color: $comment_item_colour;
+	border-bottom-left-radius: $radius;
+	border-bottom-right-radius: $radius;
+	word-wrap: break-word;
+}
+
+main.fullscreen {
+	left: 0px;
+	width: 100%;
+	height: 100vh;
+	max-width: none;
+}
+
+main.fullscreen .generic-content-wrapper {
+	position: absolute;
+	width: 100%;
+	top: 0px;
+	left: 0px;
+	border-radius: 0px;
+	border-width: 0px;
+}
+
+main.fullscreen .section-title-wrapper {
+	border-radius: 0px;
+	position: sticky;
+	top: 0;
+	z-index: 1020;
+}
+
+main.fullscreen .section-content-wrapper,
+main.fullscreen .section-content-wrapper-np {
+	border-radius: 0px;
+}
+
+#inline-btn {
+	display: none;
+}
+
+.atoken-index-row:hover td,
+.chatroom-index-row:hover td,
+.group-index-row:hover td,
+.wikis-index-row:hover td,
+.locs-index-row:hover td,
+[id^="cloud-index-"]:hover td,
+.cloud-index-active {
+	background-color: $item_colour;
+}
+
+[id^="webpage-list-item-"]:hover td,
+[id^="block-list-item-"]:hover td,
+[id^="layout-list-item-"]:hover td,
+[id^="menu-list-item-"]:hover td,
+[id^="mitem-list-item-"]:hover td {
+	background-color: $item_colour;
+}
+
+#perms-tool-table .highlight:hover {
+	background-color: $item_colour;
+}
+
+.notify-seen {
+	background-color: $item_colour;
+}
+/* bootstrap overrides */
+
+.btn,
+.form-control,
+.nav-pills .nav-link,
+.nav-tabs .nav-link {
+	border-radius: $radius;
+}
+
+.rounded-top {
+	border-top-left-radius: $radius !important;
+	border-top-right-radius: $radius !important;
+}
+
+blockquote {
+	font-size: 1rem;
+	font-style: italic;
+	border-left: 3px solid #ccc;
+	padding: 1em 0px 1em 1.5em;
+	margin: 0px;
+}
+
+.dropdown-menu {
+	color: $font_colour;
+	font-size: 0.9rem;
+	border-radius: $radius;
+}
+
+.dropdown-item {
+	color: $font_colour;
+}
+
+.dropdown-item:active,
+.dropdown-item:focus,
+.dropdown-item:hover,
+.textcomplete-item:focus .dropdown-item,
+.textcomplete-item:hover .dropdown-item,
+.textcomplete-item.active .dropdown-item,
+.textcomplete-item:active .dropdown-item {
+	color: $font_colour;
+	background-color: $item_colour;
+}
+
+.textcomplete-dropdown {
+	max-height: 300px;
+	max-width: 250px;
+	overflow: auto;
+}
+
+.dropdown-item.active {
+	color: #fff;
+	background-color: #007bff;
+}
+
+.bg-dark {
+	background-color: $nav_bg !important;
+}
+
+.navbar {
+	z-index:1030;
+}
+
+.navbar-dark .navbar-nav .nav-link,
+.usermenu i {
+	color: $nav_icon_colour;
+}
+
+.navbar-dark .navbar-nav .nav-link:focus,
+.navbar-dark .navbar-nav .nav-link:hover,
+.usermenu:focus i,
+.usermenu:hover i {
+	color: $nav_active_icon_colour;
+}
+
+@media screen and (max-width: 992px) {
+
+	aside#region_1 {
+		border-right: 1px solid $nav_bd;
+	}
+
+	main {
+		left: -$aside_widthpx;
+		width: calc( 100% + $aside_widthpx );
+	}
+
+	main.region_1-on {
+		left: 0px;
+	}
+
+	#nav-app-link-wrapper.has_location {
+		min-width: 0;
+		flex-basis: 25%;
+	}
+
+	#nav-app-link-wrapper {
+		margin-right: 0.5rem;
+	}
+
+	#navbar-collapse-2 .navbar-app i {
+		font-size: 1rem;
+		margin-right: 0.5rem;
+	}
+
+}
+
+.shareable_element_text {
+	height: 300px;
+	width: 300px;
+}
+
+.bb_observer {
+	color: red;
+}
+
+.bb_observer img {
+	border: 3px solid red !important;
+}
+
+.bb_rm-logo {
+	height: 1.3em;
+	width: auto;
+	margin-top:-3px;
+}
+
+dl.bb-dl > dt { 
+	/* overriding the default dl style from bootstrap, as bootstrap's
+	   style of a bold unindented line followed by a plain unindented
+	   line is already acheivable in bbcode without dl */
+	font-weight: normal; 
+} 
+dl.dl-terms-monospace > dt { font-family:     monospace; }
+dl.dl-terms-bold      > dt { font-weight:     bold; }
+dl.dl-terms-italic    > dt { font-style:      italic; }
+dl.dl-terms-underline > dt { text-decoration: underline; }
+dl.dl-terms-large     > dt { font-size:       120%; }
+dl.bb-dl:not(.dl-horizontal) > dd {
+	display: block;
+	margin-left: 2em;
+}
+dl.bb-dl > dd > li {
+	/* adding some indent so bullet-list items will line up better with 
+	   dl descriptions if someone wants to be impure and combine them */
+	margin-left: 1em;
+}
+
+.bootstrap-tagsinput .tag:before {
+	/* Copied from fa-asterisk, is there a better way to do it? */
+	font-family: ForkAwesome;
+	font-weight: normal;
+	font-style: normal;
+	text-decoration: inherit;
+	content:"\f069  ";
+}
+
+.jothidden .bootstrap-tagsinput {
+	border: 0px solid transparent;
+	margin-bottom: 0px;
+	box-shadow: none;
+	display: inline-block;
+	border-radius: $radius;
+	cursor: text;
+	padding: 0px 10px;
+	width: 100%;
+}
+
+.bootstrap-tagsinput .label {
+	font-size: 100%;
+}
+
+/* Abusing theme-green is less work than makeing a new new one */
+.theme-green .back-bar .selected-bar {
+	background-color: #000000;
+	background-image: none !important;
+}
+
+
+/* Turn checkboxes into switches */
+.form-group.checkbox > div {
+    position: relative; width: 60px;
+    -webkit-user-select:none; -moz-user-select:none; -ms-user-select: none;
+    display:inline-block;
+}
+
+.form-group.checkbox input {
+    display: none;
+}
+
+.form-group.checkbox > div label {
+    display: block; overflow: hidden; cursor: pointer;
+    border: 1px solid #ccc;
+    border-radius: 12px;
+    margin:0px;
+	-webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
+	-o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+	transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+}
+
+.form-group.checkbox:hover label {
+	color: $link_colour;
+}
+
+.form-group.checkbox:hover > div label {
+	border-color: $link_colour;
+}
+
+.onoffswitch-inner {
+    display: block; width: 200%; margin-left: -100%;
+    -moz-transition: margin 0.3s ease-in 0s; -webkit-transition: margin 0.3s ease-in 0s;
+    -o-transition: margin 0.3s ease-in 0s; transition: margin 0.3s ease-in 0s;
+}
+
+.onoffswitch-inner:before, .onoffswitch-inner:after {
+    display: block; float: left; width: 50%; height: 20px; padding: 0; line-height:20px;
+    -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box;
+}
+
+.onoffswitch-inner:before {
+    content: attr(data-on);
+    padding-right: 21px;
+    background-color: $item_colour;
+	color: $font_colour;
+    text-align: right;
+}
+
+.onoffswitch-inner:after {
+    content: attr(data-off);
+    padding-left: 21px;
+    background-color: $item_colour; color: #ccc;
+    text-align: left;
+}
+
+.onoffswitch-switch {
+    display: block; width: 15px; margin:4px;
+    background: #ccc;
+    border-radius: 10px;
+    position: absolute; top: 0; bottom: 0; right: 36px;
+    -moz-transition: all 0.3s ease-in 0s; -webkit-transition: all 0.3s ease-in 0s;
+    -o-transition: all 0.3s ease-in 0s; transition: all 0.3s ease-in 0s;
+}
+
+.form-group.checkbox > div > input:checked + label .onoffswitch-inner {
+    margin-left: 0px;
+}
+
+.form-group.checkbox > div > input:checked + label .onoffswitch-switch {
+    right: 0px;
+    background-color: #0275d8;
+}
+
+
+.form-group.checkbox > div > input:disabled + label .onoffswitch-switch {
+	background-color: red;
+	opacity: 0.3;
+	filter:alpha(opacity=30);
+}
+
+
+
+.help-searchlist {
+	list-style-type: none;
+}
+
+.help-searchlist a {
+	font-size: 130%;
+}
+
+.embed-photo-selected-photo {
+	border-color: blue;
+	border-style: solid;
+	border-width: 5px;
+}
+
+#wiki-preview img {
+	max-width: 100%;
+}
+
+#ace-editor,
+#editor {
+	border-bottom-left-radius: $radius;
+	border-bottom-right-radius: $radius;
+}
+
+.sub-menu-wrapper {
+	padding-left: 1rem;
+	display: none;
+}
+
+.sub-menu {
+	width: 100%;
+	margin-top: 0.5rem;
+	padding-left: 1rem;
+	border-left: 0.2rem solid #eee;
+}
+
+.app-icon {
+	color: #777;
+	font-size: 80px;
+	text-shadow: 3px 3px 3px lightgrey;
+}
+
+.app-detail {
+	text-align: center;
+}
+
+#login-main, .rmagic-button {
+	max-width: 400px;
+	margin-top: 20px;
+	margin-left: auto;
+	margin-right: auto;
+}
+
+#permcat-index {
+	margin: 10px;
+}
+
+.cloud-container {
+	float: left;
+	width: 100px;
+	height: 110px;
+	margin: 5px;
+}
+
+.cloud-icon-container {
+	width: 64px;
+	height: 64px;
+	border: 1px solid #eee;
+	border-radius: $radius;
+}
+
+.cloud-icon i {
+	font-size: 42px;
+	color: #888;
+	margin-top: 8px;
+	margin-left: 6px;
+}
+
+.cloud-icon img {
+	max-width: 64px;
+	max-height: 64px;
+	border-radius: $radius;
+}
+
+.cloud-title {
+	width: 98px;
+	height: 36px;
+	overflow: hidden;
+}
+
+.caption-visible {
+	max-height: 75%;
+}
+
+.oneway-overlay {
+    position: absolute;
+    text-shadow: -2px 0 1px #fff, 0 2px 1px#fff, 2px 0 1px #fff, 0 -2px 1px #fff;
+}
+
+.cover-photo-review {
+    margin-bottom: 10px;
+}
+
+.hover-fx-hide  {
+    opacity: 0;
+}
+
+.hover-fx-show:hover .hover-fx-hide {
+    opacity: 1;
+}
+
+.bg-primary {
+    background-color: #505050 !important;
+}
+
+.nav-link.active {
+    background-color: #505050 !important;
+}
+
+div.tagblock > h3 {
+    position: relative;
+    left: 33%;
+    content: url(https://ussr.win/photo/73e2201da875ccae6fecadfcf8ccba55c6c8ac093634d2e4af8e0f3cec1f2de3.gif);
+}
+
+#region_3 {
+    display: none !important;
+}
diff --git a/ussrbasictwopanel/img/gray_and_black_diagonal_stripes_background_seamless.gif b/ussrbasicleft/img/gray_and_black_diagonal_stripes_background_seamless.gif
similarity index 100%
rename from ussrbasictwopanel/img/gray_and_black_diagonal_stripes_background_seamless.gif
rename to ussrbasicleft/img/gray_and_black_diagonal_stripes_background_seamless.gif
diff --git a/ussrbasictwopanel/img/gray_and_white_diagonal_stripes_background_seamless.gif b/ussrbasicleft/img/gray_and_white_diagonal_stripes_background_seamless.gif
similarity index 100%
rename from ussrbasictwopanel/img/gray_and_white_diagonal_stripes_background_seamless.gif
rename to ussrbasicleft/img/gray_and_white_diagonal_stripes_background_seamless.gif
diff --git a/ussrbasictwopanel/img/screenshot.png b/ussrbasicleft/img/screenshot.png
similarity index 100%
rename from ussrbasictwopanel/img/screenshot.png
rename to ussrbasicleft/img/screenshot.png
diff --git a/ussrbasicpub/js/redbasic.js b/ussrbasicleft/js/ussrbasicleft.js
similarity index 98%
rename from ussrbasicpub/js/redbasic.js
rename to ussrbasicleft/js/ussrbasicleft.js
index b8f8c34..ecaf8dd 100644
--- a/ussrbasicpub/js/redbasic.js
+++ b/ussrbasicleft/js/ussrbasicleft.js
@@ -1,5 +1,5 @@
 /**
- * ussrbasicpub theme specific JavaScript
+ * ussrbasicleft theme specific JavaScript
  */
 
 $(document).ready(function() {
diff --git a/ussrbasicleft/pdl/mod_admin.pdl b/ussrbasicleft/pdl/mod_admin.pdl
new file mode 100644
index 0000000..17b31bf
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_admin.pdl
@@ -0,0 +1,7 @@
+[region=aside]
+[widget=admin][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_appman.pdl b/ussrbasicleft/pdl/mod_appman.pdl
new file mode 100644
index 0000000..6fa8295
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_appman.pdl
@@ -0,0 +1,7 @@
+[region=aside]
+[widget=appcategories][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_apps.pdl b/ussrbasicleft/pdl/mod_apps.pdl
new file mode 100644
index 0000000..a323418
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_apps.pdl
@@ -0,0 +1,8 @@
+[region=aside]
+[widget=appstore][/widget]
+[widget=appcategories][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_articles.pdl b/ussrbasicleft/pdl/mod_articles.pdl
new file mode 100644
index 0000000..f0e07c0
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_articles.pdl
@@ -0,0 +1,10 @@
+[region=aside]
+[widget=archive][var=articles]1[/var][/widget]
+[widget=categories][var=articles]1[/var][/widget]
+[widget=tasklist][/widget]
+[widget=notes][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_blocks.pdl b/ussrbasicleft/pdl/mod_blocks.pdl
new file mode 100644
index 0000000..3b30cbd
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_blocks.pdl
@@ -0,0 +1,7 @@
+[region=aside]
+[widget=design_tools][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_cal.pdl b/ussrbasicleft/pdl/mod_cal.pdl
new file mode 100644
index 0000000..22ecd80
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_cal.pdl
@@ -0,0 +1,7 @@
+[region=aside]
+[widget=fullprofile][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_cards.pdl b/ussrbasicleft/pdl/mod_cards.pdl
new file mode 100644
index 0000000..5a44ae9
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_cards.pdl
@@ -0,0 +1,9 @@
+[region=aside]
+[widget=categories][var=cards]1[/var][/widget]
+[widget=tasklist][/widget]
+[widget=notes][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_cdav.pdl b/ussrbasicleft/pdl/mod_cdav.pdl
new file mode 100644
index 0000000..cdd12bb
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_cdav.pdl
@@ -0,0 +1,7 @@
+[region=aside]
+[widget=cdav][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_channel.pdl b/ussrbasicleft/pdl/mod_channel.pdl
new file mode 100644
index 0000000..7513e3d
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_channel.pdl
@@ -0,0 +1,13 @@
+[region=banner]
+[widget=cover_photo][/widget]
+[/region]
+[region=aside]
+[widget=fullprofile][/widget]
+[widget=tagcloud_wall][var=limit]50[/var][/widget]
+[widget=categories][/widget]
+[widget=archive][var=wall]1[/var][/widget]
+[widget=common_friends][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_chanview.pdl b/ussrbasicleft/pdl/mod_chanview.pdl
new file mode 100644
index 0000000..936daf2
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_chanview.pdl
@@ -0,0 +1,7 @@
+[region=aside]
+[widget=vcard][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_chat.pdl b/ussrbasicleft/pdl/mod_chat.pdl
new file mode 100644
index 0000000..ee721e6
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_chat.pdl
@@ -0,0 +1,11 @@
+[region=aside]
+[widget=vcard][/widget]
+[widget=chatroom_list][/widget]
+[widget=bookmarkedchats][/widget]
+[widget=suggestedchats][/widget]
+[widget=chatroom_members][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_cloud.pdl b/ussrbasicleft/pdl/mod_cloud.pdl
new file mode 100644
index 0000000..936daf2
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_cloud.pdl
@@ -0,0 +1,7 @@
+[region=aside]
+[widget=vcard][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_common.pdl b/ussrbasicleft/pdl/mod_common.pdl
new file mode 100644
index 0000000..22ecd80
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_common.pdl
@@ -0,0 +1,7 @@
+[region=aside]
+[widget=fullprofile][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_connect.pdl b/ussrbasicleft/pdl/mod_connect.pdl
new file mode 100644
index 0000000..261bef6
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_connect.pdl
@@ -0,0 +1,7 @@
+[region=aside]
+[widget=profile][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_connections.pdl b/ussrbasicleft/pdl/mod_connections.pdl
new file mode 100644
index 0000000..73942fc
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_connections.pdl
@@ -0,0 +1,10 @@
+[region=aside]
+[widget=follow][/widget]
+[widget=collections][var=mode][connections[/arg][/widget]
+[widget=suggestions][/widget]
+[widget=findpeople][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_connedit.pdl b/ussrbasicleft/pdl/mod_connedit.pdl
new file mode 100644
index 0000000..39880f9
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_connedit.pdl
@@ -0,0 +1,10 @@
+[region=aside]
+[widget=vcard][/widget]
+[widget=collections][var=mode]abook[/var][/widget]
+[widget=suggestions][/widget]
+[widget=findpeople][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_defperms.pdl b/ussrbasicleft/pdl/mod_defperms.pdl
new file mode 100644
index 0000000..e663805
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_defperms.pdl
@@ -0,0 +1,7 @@
+[region=aside]
+[widget=settings_menu][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_directory.pdl b/ussrbasicleft/pdl/mod_directory.pdl
new file mode 100644
index 0000000..c253818
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_directory.pdl
@@ -0,0 +1,10 @@
+[region=aside]
+[widget=findpeople][/widget]
+[widget=dirsort][/widget]
+[widget=dirtags][/widget]
+[widget=suggestions][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_display.pdl b/ussrbasicleft/pdl/mod_display.pdl
new file mode 100644
index 0000000..936daf2
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_display.pdl
@@ -0,0 +1,7 @@
+[region=aside]
+[widget=vcard][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_editblock.pdl b/ussrbasicleft/pdl/mod_editblock.pdl
new file mode 100644
index 0000000..3b30cbd
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_editblock.pdl
@@ -0,0 +1,7 @@
+[region=aside]
+[widget=design_tools][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_editlayout.pdl b/ussrbasicleft/pdl/mod_editlayout.pdl
new file mode 100644
index 0000000..3b30cbd
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_editlayout.pdl
@@ -0,0 +1,7 @@
+[region=aside]
+[widget=design_tools][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_editwebpage.pdl b/ussrbasicleft/pdl/mod_editwebpage.pdl
new file mode 100644
index 0000000..3b30cbd
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_editwebpage.pdl
@@ -0,0 +1,7 @@
+[region=aside]
+[widget=design_tools][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_go.pdl b/ussrbasicleft/pdl/mod_go.pdl
new file mode 100644
index 0000000..22ecd80
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_go.pdl
@@ -0,0 +1,7 @@
+[region=aside]
+[widget=fullprofile][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_group.pdl b/ussrbasicleft/pdl/mod_group.pdl
new file mode 100644
index 0000000..6682643
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_group.pdl
@@ -0,0 +1,7 @@
+[region=aside]
+[widget=collections][var=mode]groups[/var][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_help.pdl b/ussrbasicleft/pdl/mod_help.pdl
new file mode 100644
index 0000000..1eb9fea
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_help.pdl
@@ -0,0 +1,7 @@
+[region=aside]
+[widget=helpindex][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_hq.pdl b/ussrbasicleft/pdl/mod_hq.pdl
new file mode 100644
index 0000000..06e1f62
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_hq.pdl
@@ -0,0 +1,7 @@
+[region=aside]
+[widget=hq_controls][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_id.pdl b/ussrbasicleft/pdl/mod_id.pdl
new file mode 100644
index 0000000..22ecd80
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_id.pdl
@@ -0,0 +1,7 @@
+[region=aside]
+[widget=fullprofile][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_layouts.pdl b/ussrbasicleft/pdl/mod_layouts.pdl
new file mode 100644
index 0000000..3b30cbd
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_layouts.pdl
@@ -0,0 +1,7 @@
+[region=aside]
+[widget=design_tools][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_locs.pdl b/ussrbasicleft/pdl/mod_locs.pdl
new file mode 100644
index 0000000..e663805
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_locs.pdl
@@ -0,0 +1,7 @@
+[region=aside]
+[widget=settings_menu][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_mail.pdl b/ussrbasicleft/pdl/mod_mail.pdl
new file mode 100644
index 0000000..7c869d0
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_mail.pdl
@@ -0,0 +1,8 @@
+[region=aside]
+[widget=mailmenu][/widget]
+[widget=conversations][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_menu.pdl b/ussrbasicleft/pdl/mod_menu.pdl
new file mode 100644
index 0000000..3b30cbd
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_menu.pdl
@@ -0,0 +1,7 @@
+[region=aside]
+[widget=design_tools][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_message.pdl b/ussrbasicleft/pdl/mod_message.pdl
new file mode 100644
index 0000000..8b4f6a6
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_message.pdl
@@ -0,0 +1,7 @@
+[region=aside]
+[widget=mailmenu][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_mitem.pdl b/ussrbasicleft/pdl/mod_mitem.pdl
new file mode 100644
index 0000000..42181de
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_mitem.pdl
@@ -0,0 +1,8 @@
+[region=aside]
+[widget=design_tools][/widget]
+[widget=menu_preview][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_moderate.pdl b/ussrbasicleft/pdl/mod_moderate.pdl
new file mode 100644
index 0000000..bf7e390
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_moderate.pdl
@@ -0,0 +1,6 @@
+[region=aside]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_network.pdl b/ussrbasicleft/pdl/mod_network.pdl
new file mode 100644
index 0000000..8d1b5cf
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_network.pdl
@@ -0,0 +1,17 @@
+[region=aside]
+[widget=notifications][/widget]
+[widget=activity_order][/widget]
+[widget=activity_filter][/widget]
+[widget=savedsearch][/widget]
+[widget=suggestions][/widget]
+[widget=notes][/widget]
+[widget=newmember][/widget]
+[/region]
+
+[region=content]
+[widget=affinity][/widget]
+$content
+[/region]
+
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_photos.pdl b/ussrbasicleft/pdl/mod_photos.pdl
new file mode 100644
index 0000000..93d04cc
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_photos.pdl
@@ -0,0 +1,8 @@
+[region=aside]
+[widget=vcard][/widget]
+[widget=photo_albums][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_profile.pdl b/ussrbasicleft/pdl/mod_profile.pdl
new file mode 100644
index 0000000..22ecd80
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_profile.pdl
@@ -0,0 +1,7 @@
+[region=aside]
+[widget=fullprofile][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_profile_photo.pdl b/ussrbasicleft/pdl/mod_profile_photo.pdl
new file mode 100644
index 0000000..22ecd80
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_profile_photo.pdl
@@ -0,0 +1,7 @@
+[region=aside]
+[widget=fullprofile][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_profiles.pdl b/ussrbasicleft/pdl/mod_profiles.pdl
new file mode 100644
index 0000000..22ecd80
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_profiles.pdl
@@ -0,0 +1,7 @@
+[region=aside]
+[widget=fullprofile][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_profperm.pdl b/ussrbasicleft/pdl/mod_profperm.pdl
new file mode 100644
index 0000000..22ecd80
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_profperm.pdl
@@ -0,0 +1,7 @@
+[region=aside]
+[widget=fullprofile][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_pubstream.pdl b/ussrbasicleft/pdl/mod_pubstream.pdl
new file mode 100644
index 0000000..3c32bf3
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_pubstream.pdl
@@ -0,0 +1,7 @@
+[region=aside]
+[widget=pubtagcloud][var=trending]8[/var][var=limit]20[/var][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_rate.pdl b/ussrbasicleft/pdl/mod_rate.pdl
new file mode 100644
index 0000000..936daf2
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_rate.pdl
@@ -0,0 +1,7 @@
+[region=aside]
+[widget=vcard][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_ratings.pdl b/ussrbasicleft/pdl/mod_ratings.pdl
new file mode 100644
index 0000000..4c6fa3c
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_ratings.pdl
@@ -0,0 +1,11 @@
+[region=aside]
+[widget=pubsites][/widget]
+[widget=vcard][/widget]
+[widget=rating][/widget]
+[widget=suggestions][/widget]
+[widget=findpeople][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_search.pdl b/ussrbasicleft/pdl/mod_search.pdl
new file mode 100644
index 0000000..bf7e390
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_search.pdl
@@ -0,0 +1,6 @@
+[region=aside]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_settings.pdl b/ussrbasicleft/pdl/mod_settings.pdl
new file mode 100644
index 0000000..e663805
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_settings.pdl
@@ -0,0 +1,7 @@
+[region=aside]
+[widget=settings_menu][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_sharedwithme.pdl b/ussrbasicleft/pdl/mod_sharedwithme.pdl
new file mode 100644
index 0000000..bf7e390
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_sharedwithme.pdl
@@ -0,0 +1,6 @@
+[region=aside]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_sources.pdl b/ussrbasicleft/pdl/mod_sources.pdl
new file mode 100644
index 0000000..e663805
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_sources.pdl
@@ -0,0 +1,7 @@
+[region=aside]
+[widget=settings_menu][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_suggest.pdl b/ussrbasicleft/pdl/mod_suggest.pdl
new file mode 100644
index 0000000..68c9263
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_suggest.pdl
@@ -0,0 +1,8 @@
+[region=aside]
+[widget=follow][/widget]
+[widget=findpeople][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_thing.pdl b/ussrbasicleft/pdl/mod_thing.pdl
new file mode 100644
index 0000000..22ecd80
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_thing.pdl
@@ -0,0 +1,7 @@
+[region=aside]
+[widget=fullprofile][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_uexport.pdl b/ussrbasicleft/pdl/mod_uexport.pdl
new file mode 100644
index 0000000..bf7e390
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_uexport.pdl
@@ -0,0 +1,6 @@
+[region=aside]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_viewconnections.pdl b/ussrbasicleft/pdl/mod_viewconnections.pdl
new file mode 100644
index 0000000..22ecd80
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_viewconnections.pdl
@@ -0,0 +1,7 @@
+[region=aside]
+[widget=fullprofile][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_webpages.pdl b/ussrbasicleft/pdl/mod_webpages.pdl
new file mode 100644
index 0000000..3bc576f
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_webpages.pdl
@@ -0,0 +1,8 @@
+[region=aside]
+[widget=design_tools][/widget]
+[widget=website_portation_tools][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/pdl/mod_wiki.pdl b/ussrbasicleft/pdl/mod_wiki.pdl
new file mode 100644
index 0000000..06c4bef
--- /dev/null
+++ b/ussrbasicleft/pdl/mod_wiki.pdl
@@ -0,0 +1,8 @@
+[region=aside]
+[widget=vcard][/widget]
+[widget=wiki_pages][/widget]
+[widget=notifications][/widget]
+[widget=newmember][/widget]
+[/region]
+[region=right_aside]
+[/region]
diff --git a/ussrbasicleft/php/config.php b/ussrbasicleft/php/config.php
new file mode 100644
index 0000000..0ca81b4
--- /dev/null
+++ b/ussrbasicleft/php/config.php
@@ -0,0 +1,128 @@
+<?php
+
+namespace Zotlabs\Theme;
+
+class UssrbasicleftConfig {
+
+	function get_schemas() {
+		$files = glob('view/theme/ussrbasicleft/schema/*.php');
+
+		$scheme_choices = [];
+
+		if($files) {
+
+			if(in_array('view/theme/ussrbasicleft/schema/default.php', $files)) {
+				$scheme_choices['---'] = t('Default');
+				$scheme_choices['focus'] = t('Focus (Hubzilla default)');
+			}
+			else {
+				$scheme_choices['---'] = t('Focus (Hubzilla default)');
+			}
+
+			foreach($files as $file) {
+				$f = basename($file, ".php");
+				if($f != 'default') {
+					$scheme_name = $f;
+					$scheme_choices[$f] = $scheme_name;
+				}
+			}
+		}
+
+		return $scheme_choices;
+	}
+
+	function get() {
+		if(! local_channel()) { 
+			return;
+		}
+
+		$arr = array();
+		$arr['narrow_navbar'] = get_pconfig(local_channel(),'ussrbasicleft', 'narrow_navbar' );
+		$arr['nav_bg'] = get_pconfig(local_channel(),'ussrbasicleft', 'nav_bg' );
+		$arr['nav_icon_colour'] = get_pconfig(local_channel(),'ussrbasicleft', 'nav_icon_colour' );
+		$arr['nav_active_icon_colour'] = get_pconfig(local_channel(),'ussrbasicleft', 'nav_active_icon_colour' );
+		$arr['link_colour'] = get_pconfig(local_channel(),'ussrbasicleft', 'link_colour' );
+		$arr['banner_colour'] = get_pconfig(local_channel(),'ussrbasicleft', 'banner_colour' );
+		$arr['bgcolour'] = get_pconfig(local_channel(),'ussrbasicleft', 'background_colour' );
+		$arr['background_image'] = get_pconfig(local_channel(),'ussrbasicleft', 'background_image' );
+		$arr['item_colour'] = get_pconfig(local_channel(),'ussrbasicleft', 'item_colour' );
+		$arr['comment_item_colour'] = get_pconfig(local_channel(),'ussrbasicleft', 'comment_item_colour' );
+		$arr['font_size'] = get_pconfig(local_channel(),'ussrbasicleft', 'font_size' );
+		$arr['font_colour'] = get_pconfig(local_channel(),'ussrbasicleft', 'font_colour' );
+		$arr['radius'] = get_pconfig(local_channel(),'ussrbasicleft', 'radius' );
+		$arr['shadow'] = get_pconfig(local_channel(),'ussrbasicleft', 'photo_shadow' );
+		$arr['converse_width']=get_pconfig(local_channel(),"ussrbasicleft","converse_width");
+		$arr['top_photo']=get_pconfig(local_channel(),"ussrbasicleft","top_photo");
+		$arr['reply_photo']=get_pconfig(local_channel(),"ussrbasicleft","reply_photo");
+		$arr['advanced_theming'] = get_pconfig(local_channel(), 'ussrbasicleft', 'advanced_theming');
+		return $this->form($arr);
+	}
+
+	function post() {
+		if(!local_channel()) { 
+			return;
+		}
+
+		if (isset($_POST['ussrbasicleft-settings-submit'])) {
+			set_pconfig(local_channel(), 'ussrbasicleft', 'narrow_navbar', $_POST['ussrbasicleft_narrow_navbar']);
+			set_pconfig(local_channel(), 'ussrbasicleft', 'nav_bg', $_POST['ussrbasicleft_nav_bg']);
+			set_pconfig(local_channel(), 'ussrbasicleft', 'nav_icon_colour', $_POST['ussrbasicleft_nav_icon_colour']);
+			set_pconfig(local_channel(), 'ussrbasicleft', 'nav_active_icon_colour', $_POST['ussrbasicleft_nav_active_icon_colour']);
+			set_pconfig(local_channel(), 'ussrbasicleft', 'link_colour', $_POST['ussrbasicleft_link_colour']);
+			set_pconfig(local_channel(), 'ussrbasicleft', 'background_colour', $_POST['ussrbasicleft_background_colour']);
+			set_pconfig(local_channel(), 'ussrbasicleft', 'banner_colour', $_POST['ussrbasicleft_banner_colour']);
+			set_pconfig(local_channel(), 'ussrbasicleft', 'background_image', $_POST['ussrbasicleft_background_image']);
+			set_pconfig(local_channel(), 'ussrbasicleft', 'item_colour', $_POST['ussrbasicleft_item_colour']);
+			set_pconfig(local_channel(), 'ussrbasicleft', 'comment_item_colour', $_POST['ussrbasicleft_comment_item_colour']);
+			set_pconfig(local_channel(), 'ussrbasicleft', 'font_size', $_POST['ussrbasicleft_font_size']);
+			set_pconfig(local_channel(), 'ussrbasicleft', 'font_colour', $_POST['ussrbasicleft_font_colour']);
+			set_pconfig(local_channel(), 'ussrbasicleft', 'radius', $_POST['ussrbasicleft_radius']);
+			set_pconfig(local_channel(), 'ussrbasicleft', 'photo_shadow', $_POST['ussrbasicleft_shadow']);
+			set_pconfig(local_channel(), 'ussrbasicleft', 'converse_width', $_POST['ussrbasicleft_converse_width']);
+			set_pconfig(local_channel(), 'ussrbasicleft', 'top_photo', $_POST['ussrbasicleft_top_photo']);
+			set_pconfig(local_channel(), 'ussrbasicleft', 'reply_photo', $_POST['ussrbasicleft_reply_photo']);
+			set_pconfig(local_channel(), 'ussrbasicleft', 'advanced_theming', $_POST['ussrbasicleft_advanced_theming']);
+		}
+	}
+
+	function form($arr) {
+
+		if(get_pconfig(local_channel(), 'ussrbasicleft', 'advanced_theming'))
+			$expert = 1;
+					
+	  	$o .= replace_macros(get_markup_template('theme_settings.tpl'), array(
+			'$submit' => t('Submit'),
+			'$baseurl' => z_root(),
+			'$theme' => \App::$channel['channel_theme'],
+			'$expert' => $expert,
+			'$title' => t("Theme settings"),
+			'$narrow_navbar' => array('ussrbasicleft_narrow_navbar',t('Narrow navbar'),$arr['narrow_navbar'], '', array(t('No'),t('Yes'))),
+			'$nav_bg' => array('ussrbasicleft_nav_bg', t('Navigation bar background color'), $arr['nav_bg']),
+			'$nav_icon_colour' => array('ussrbasicleft_nav_icon_colour', t('Navigation bar icon color '), $arr['nav_icon_colour']),	
+			'$nav_active_icon_colour' => array('ussrbasicleft_nav_active_icon_colour', t('Navigation bar active icon color '), $arr['nav_active_icon_colour']),
+			'$link_colour' => array('ussrbasicleft_link_colour', t('Link color'), $arr['link_colour'], '', $link_colours),
+			'$banner_colour' => array('ussrbasicleft_banner_colour', t('Set font-color for banner'), $arr['banner_colour']),
+			'$bgcolour' => array('ussrbasicleft_background_colour', t('Set the background color'), $arr['bgcolour']),
+			'$background_image' => array('ussrbasicleft_background_image', t('Set the background image'), $arr['background_image']),	
+			'$item_colour' => array('ussrbasicleft_item_colour', t('Set the background color of items'), $arr['item_colour']),
+			'$comment_item_colour' => array('ussrbasicleft_comment_item_colour', t('Set the background color of comments'), $arr['comment_item_colour']),
+			'$font_size' => array('ussrbasicleft_font_size', t('Set font-size for the entire application'), $arr['font_size'], t('Examples: 1rem, 100%, 16px')),
+			'$font_colour' => array('ussrbasicleft_font_colour', t('Set font-color for posts and comments'), $arr['font_colour']),
+			'$radius' => array('ussrbasicleft_radius', t('Set radius of corners'), $arr['radius'], t('Example: 4px')),
+			'$shadow' => array('ussrbasicleft_shadow', t('Set shadow depth of photos'), $arr['shadow']),
+			'$converse_width' => array('ussrbasicleft_converse_width',t('Set maximum width of content region in pixel'),$arr['converse_width'], t('Leave empty for default width')),
+			'$top_photo' => array('ussrbasicleft_top_photo', t('Set size of conversation author photo'), $arr['top_photo']),
+			'$reply_photo' => array('ussrbasicleft_reply_photo', t('Set size of followup author photos'), $arr['reply_photo']),
+			'$advanced_theming' => ['ussrbasicleft_advanced_theming', t('Show advanced settings'), $arr['advanced_theming'], '', [t('No'), t('Yes')]]
+			));
+
+		return $o;
+	}
+
+}
+
+
+
+
+
+
diff --git a/ussrbasicleft/php/style.php b/ussrbasicleft/php/style.php
new file mode 100644
index 0000000..34c449a
--- /dev/null
+++ b/ussrbasicleft/php/style.php
@@ -0,0 +1,163 @@
+<?php
+
+if(! App::$install) {
+
+	// Get the UID of the channel owner
+	$uid = get_theme_uid();
+
+	if($uid) {
+		load_pconfig($uid,'ussrbasicleft');
+	}
+
+	// Load the owners pconfig
+	$nav_bg = get_pconfig($uid, 'ussrbasicleft', 'nav_bg');
+	$nav_icon_colour = get_pconfig($uid, 'ussrbasicleft', 'nav_icon_colour');
+	$nav_active_icon_colour = get_pconfig($uid, 'ussrbasicleft', 'nav_active_icon_colour');
+	$banner_colour = get_pconfig($uid,'ussrbasicleft','banner_colour');
+	$narrow_navbar = get_pconfig($uid,'ussrbasicleft','narrow_navbar');
+	$link_colour = get_pconfig($uid, 'ussrbasicleft', 'link_colour');
+	$schema = get_pconfig($uid,'ussrbasicleft','schema');
+	$bgcolour = get_pconfig($uid, 'ussrbasicleft', 'background_colour');
+	$background_image = get_pconfig($uid, 'ussrbasicleft', 'background_image');
+	$item_colour = get_pconfig($uid, 'ussrbasicleft', 'item_colour');
+	$comment_item_colour = get_pconfig($uid, 'ussrbasicleft', 'comment_item_colour');
+	$font_size = get_pconfig($uid, 'ussrbasicleft', 'font_size');
+	$font_colour = get_pconfig($uid, 'ussrbasicleft', 'font_colour');
+	$radius = get_pconfig($uid, 'ussrbasicleft', 'radius');
+	$shadow = get_pconfig($uid,'ussrbasicleft','photo_shadow');
+	$converse_width=get_pconfig($uid,'ussrbasicleft','converse_width');
+	$top_photo=get_pconfig($uid,'ussrbasicleft','top_photo');
+	$reply_photo=get_pconfig($uid,'ussrbasicleft','reply_photo');
+}
+
+// Now load the scheme.  If a value is changed above, we'll keep the settings
+// If not, we'll keep those defined by the schema
+// Setting $schema to '' wasn't working for some reason, so we'll check it's
+// not --- like the mobile theme does instead.
+
+// Allow layouts to over-ride the schema
+
+if($_REQUEST['schema']) {
+	$schema = $_REQUEST['schema'];
+}
+
+if (($schema) && ($schema != '---')) {
+
+	// Check it exists, because this setting gets distributed to clones
+	if(file_exists('view/theme/ussrbasicleft/schema/' . $schema . '.php')) {
+		$schemefile = 'view/theme/ussrbasicleft/schema/' . $schema . '.php';
+		require_once ($schemefile);
+	}
+
+	if(file_exists('view/theme/ussrbasicleft/schema/' . $schema . '.css')) {
+		$schemecss = file_get_contents('view/theme/ussrbasicleft/schema/' . $schema . '.css');
+	}
+
+}
+
+// Allow admins to set a default schema for the hub.
+// default.php and default.css MUST be symlinks to existing schema files in view/theme/ussrbasicleft/schema
+if ((!$schema) || ($schema == '---')) {
+
+	if(file_exists('view/theme/ussrbasicleft/schema/default.php')) {
+		$schemefile = 'view/theme/ussrbasicleft/schema/default.php';
+		require_once ($schemefile);
+	}
+
+	if(file_exists('view/theme/ussrbasicleft/schema/default.css')) {
+		$schemecss = file_get_contents('view/theme/ussrbasicleft/schema/default.css');
+	}
+
+}
+		
+//Set some defaults - we have to do this after pulling owner settings, and we have to check for each setting
+//individually.  If we don't, we'll have problems if a user has set one, but not all options.
+if (! $nav_bg)
+	$nav_bg = '#343a40';
+if (! $nav_icon_colour)
+	$nav_icon_colour = 'rgba(255, 255, 255, 0.5)';
+if (! $nav_active_icon_colour)
+	$nav_active_icon_colour = 'rgba(255, 255, 255, 0.75)';
+if (! $link_colour)
+	$link_colour = '#007bff';
+if (! $banner_colour)
+	$banner_colour = '#fff';
+if (! $bgcolour)
+	$bgcolour = 'rgb(254,254,254)';
+if (! $background_image)
+	$background_image ='';
+if (! $item_colour)
+	$item_colour = 'rgb(238,238,238)';
+if (! $comment_item_colour)
+	$comment_item_colour = 'rgb(255,255,255)';
+if (! $item_opacity)
+	$item_opacity = '1';
+if (! $font_size)
+	$font_size = '0.875rem';
+if (! $font_colour)
+	$font_colour = '#4d4d4d';
+if (! $radius)
+	$radius = '0.25rem';
+if (! $shadow)
+	$shadow = '0';
+if (! $converse_width)
+	$converse_width = '790';
+if(! $top_photo)
+	$top_photo = '2.3rem';
+if(! $reply_photo)
+	$reply_photo = '2.3rem';
+
+// Apply the settings
+if(file_exists('view/theme/ussrbasicleft/css/style.css')) {
+
+	$x = file_get_contents('view/theme/ussrbasicleft/css/style.css');
+
+	if($narrow_navbar && file_exists('view/theme/ussrbasicleft/css/narrow_navbar.css')) {
+		$x .= file_get_contents('view/theme/ussrbasicleft/css/narrow_navbar.css');
+	}
+
+	if($schemecss) {
+		$x .= $schemecss;
+	}
+
+	$aside_width = 288;
+
+	// left aside and right aside are 285px + converse width
+	$main_width = (($aside_width * 2) + intval($converse_width));
+
+	// prevent main_width smaller than 768px
+	$main_width = (($main_width < 768) ? 768 : $main_width);
+
+	$options = array (
+		'$nav_bg' => $nav_bg,
+		'$nav_icon_colour' => $nav_icon_colour,
+		'$nav_active_icon_colour' => $nav_active_icon_colour,
+		'$link_colour' => $link_colour,
+		'$banner_colour' => $banner_colour,
+		'$bgcolour' => $bgcolour,
+		'$background_image' => $background_image,
+		'$item_colour' => $item_colour,
+		'$comment_item_colour' => $comment_item_colour,
+		'$font_size' => $font_size,
+		'$font_colour' => $font_colour,
+		'$radius' => $radius,
+		'$shadow' => $shadow,
+		'$converse_width' => $converse_width,
+		'$nav_float_min_opacity' => $nav_float_min_opacity,
+		'$nav_percent_min_opacity' => $nav_percent_min_opacity,
+		'$top_photo' => $top_photo,
+		'$reply_photo' => $reply_photo,
+		'$pmenu_top' => $pmenu_top,
+		'$pmenu_reply' => $pmenu_reply,
+		'$main_width' => $main_width,
+		'$aside_width' => $aside_width
+	);
+
+	echo str_replace(array_keys($options), array_values($options), $x);
+
+}
+
+// Set the schema to the default schema in derived themes. See the documentation for creating derived themes how to override this. 
+
+// if(local_channel() && App::$channel && App::$channel['channel_theme'] != 'ussrbasicleft')
+// 	set_pconfig(local_channel(), 'ussrbasicleft', 'schema', '---');
diff --git a/ussrbasictwopanel/php/theme.php b/ussrbasicleft/php/theme.php
similarity index 80%
rename from ussrbasictwopanel/php/theme.php
rename to ussrbasicleft/php/theme.php
index 0ad259d..bba1c0b 100644
--- a/ussrbasictwopanel/php/theme.php
+++ b/ussrbasicleft/php/theme.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- *   * Name: Ussrbasictwopanel
+ *   * Name: Ussrbasicleft
  *   * Description: zlax theme (removed like button and contact's minus circle)
  *   * Version: 2.23
  *   * MinVersion: 3.8
@@ -11,7 +11,7 @@
  *   * Maintainer: Mario Vavti
  */
 
-function ussrbasictwopanel_init(&$a) {
+function ussrbasicleft_init(&$a) {
 
 App::$theme_info['extends'] = 'redbasic';
 
diff --git a/ussrbasictwopanel/php/theme_init.php b/ussrbasicleft/php/theme_init.php
similarity index 100%
rename from ussrbasictwopanel/php/theme_init.php
rename to ussrbasicleft/php/theme_init.php
diff --git a/ussrbasictwopanel/schema/Focus-Boxy.css b/ussrbasicleft/schema/Focus-Boxy.css
similarity index 100%
rename from ussrbasictwopanel/schema/Focus-Boxy.css
rename to ussrbasicleft/schema/Focus-Boxy.css
diff --git a/ussrbasictwopanel/schema/Focus-Boxy.php b/ussrbasicleft/schema/Focus-Boxy.php
similarity index 100%
rename from ussrbasictwopanel/schema/Focus-Boxy.php
rename to ussrbasicleft/schema/Focus-Boxy.php
diff --git a/ussrbasictwopanel/schema/Focus-Light.css b/ussrbasicleft/schema/Focus-Light.css
similarity index 100%
rename from ussrbasictwopanel/schema/Focus-Light.css
rename to ussrbasicleft/schema/Focus-Light.css
diff --git a/ussrbasictwopanel/schema/Focus-Light.php b/ussrbasicleft/schema/Focus-Light.php
similarity index 100%
rename from ussrbasictwopanel/schema/Focus-Light.php
rename to ussrbasicleft/schema/Focus-Light.php
diff --git a/ussrbasictwopanel/schema/Nolikes.css b/ussrbasicleft/schema/Nolikes.css
similarity index 100%
rename from ussrbasictwopanel/schema/Nolikes.css
rename to ussrbasicleft/schema/Nolikes.css
diff --git a/ussrbasictwopanel/schema/Nolikes.php b/ussrbasicleft/schema/Nolikes.php
similarity index 100%
rename from ussrbasictwopanel/schema/Nolikes.php
rename to ussrbasicleft/schema/Nolikes.php
diff --git a/ussrbasictwopanel/schema/Nominus-Nolikes.css b/ussrbasicleft/schema/Nominus-Nolikes.css
similarity index 100%
rename from ussrbasictwopanel/schema/Nominus-Nolikes.css
rename to ussrbasicleft/schema/Nominus-Nolikes.css
diff --git a/ussrbasictwopanel/schema/Nominus-Nolikes.php b/ussrbasicleft/schema/Nominus-Nolikes.php
similarity index 100%
rename from ussrbasictwopanel/schema/Nominus-Nolikes.php
rename to ussrbasicleft/schema/Nominus-Nolikes.php
diff --git a/ussrbasictwopanel/schema/Nominus.css b/ussrbasicleft/schema/Nominus.css
similarity index 100%
rename from ussrbasictwopanel/schema/Nominus.css
rename to ussrbasicleft/schema/Nominus.css
diff --git a/ussrbasictwopanel/schema/Nominus.php b/ussrbasicleft/schema/Nominus.php
similarity index 100%
rename from ussrbasictwopanel/schema/Nominus.php
rename to ussrbasicleft/schema/Nominus.php
diff --git a/ussrbasictwopanel/schema/dark-Nominus.css b/ussrbasicleft/schema/dark-Nominus.css
similarity index 100%
rename from ussrbasictwopanel/schema/dark-Nominus.css
rename to ussrbasicleft/schema/dark-Nominus.css
diff --git a/ussrbasictwopanel/schema/dark-Nominus.php b/ussrbasicleft/schema/dark-Nominus.php
similarity index 100%
rename from ussrbasictwopanel/schema/dark-Nominus.php
rename to ussrbasicleft/schema/dark-Nominus.php
diff --git a/ussrbasictwopanel/schema/dark.css b/ussrbasicleft/schema/dark.css
similarity index 100%
rename from ussrbasictwopanel/schema/dark.css
rename to ussrbasicleft/schema/dark.css
diff --git a/ussrbasictwopanel/schema/dark.php b/ussrbasicleft/schema/dark.php
similarity index 100%
rename from ussrbasictwopanel/schema/dark.php
rename to ussrbasicleft/schema/dark.php
diff --git a/ussrbasictwopanel/schema/zlax.css b/ussrbasicleft/schema/zlax.css
similarity index 100%
rename from ussrbasictwopanel/schema/zlax.css
rename to ussrbasicleft/schema/zlax.css
diff --git a/ussrbasictwopanel/schema/zlax.php b/ussrbasicleft/schema/zlax.php
similarity index 100%
rename from ussrbasictwopanel/schema/zlax.php
rename to ussrbasicleft/schema/zlax.php
diff --git a/ussrbasictwopanel/tpl/suggest_widget.tpl b/ussrbasicleft/tpl/suggest_widget.tpl
similarity index 100%
rename from ussrbasictwopanel/tpl/suggest_widget.tpl
rename to ussrbasicleft/tpl/suggest_widget.tpl
diff --git a/ussrbasictwopanel/tpl/theme_settings.tpl b/ussrbasicleft/tpl/theme_settings.tpl
similarity index 65%
rename from ussrbasictwopanel/tpl/theme_settings.tpl
rename to ussrbasicleft/tpl/theme_settings.tpl
index 9565a4f..e500c27 100644
--- a/ussrbasictwopanel/tpl/theme_settings.tpl
+++ b/ussrbasicleft/tpl/theme_settings.tpl
@@ -22,13 +22,13 @@
 
 <script>
 	$(function(){
-		$('#id_ussrbasictwopanel_nav_bg, #id_ussrbasictwopanel_nav_icon_colour, #id_ussrbasictwopanel_nav_active_icon_colour, #id_ussrbasictwopanel_banner_colour').colorpicker({format: 'rgba'});
-		$('#id_ussrbasictwopanel_link_colour,#id_ussrbasictwopanel_background_colour').colorpicker();
-		$('#id_ussrbasictwopanel_toolicon_colour,#id_ussrbasictwopanel_toolicon_activecolour,#id_ussrbasictwopanel_font_colour').colorpicker();
-		$('#id_ussrbasictwopanel_item_colour,#id_ussrbasictwopanel_comment_item_colour,#id_ussrbasictwopanel_comment_border_colour').colorpicker({format: 'rgba'});
+		$('#id_ussrbasicleft_nav_bg, #id_ussrbasicleft_nav_icon_colour, #id_ussrbasicleft_nav_active_icon_colour, #id_ussrbasicleft_banner_colour').colorpicker({format: 'rgba'});
+		$('#id_ussrbasicleft_link_colour,#id_ussrbasicleft_background_colour').colorpicker();
+		$('#id_ussrbasicleft_toolicon_colour,#id_ussrbasicleft_toolicon_activecolour,#id_ussrbasicleft_font_colour').colorpicker();
+		$('#id_ussrbasicleft_item_colour,#id_ussrbasicleft_comment_item_colour,#id_ussrbasicleft_comment_border_colour').colorpicker({format: 'rgba'});
 	});
 </script>
 {{/if}}
 <div class="settings-submit-wrapper" >
-	<button type="submit" name="ussrbasictwopanel-settings-submit" class="btn btn-primary">{{$submit}}</button>
+	<button type="submit" name="ussrbasicleft-settings-submit" class="btn btn-primary">{{$submit}}</button>
 </div>
diff --git a/ussrbasicright/css/blockmode.css b/ussrbasicright/css/blockmode.css
new file mode 100644
index 0000000..cc1db20
--- /dev/null
+++ b/ussrbasicright/css/blockmode.css
@@ -0,0 +1,15 @@
+
+.wall-item-content.conv-list-mode {
+	max-width: 280px;
+	height:200px;
+	min-height: 200px;
+	overflow: hidden;
+}
+
+.thread-wrapper.toplevel_item.conv-list-mode {
+	width: 300px;
+	height: 300px; 
+	float: left;
+	margin-left: 5px;
+	margin-bottom: 35px;
+}
diff --git a/ussrbasicright/css/mod_page.css b/ussrbasicright/css/mod_page.css
new file mode 100644
index 0000000..37f597f
--- /dev/null
+++ b/ussrbasicright/css/mod_page.css
@@ -0,0 +1,24 @@
+/*
+section {
+left: 0px;
+width: 800px;
+margin-left: auto;
+margin-right: auto;
+}
+body {background-color: #d00 !important;}
+
+.page-content-wrapper {background: #fff;
+		color: #000;
+		border-radius: 20px;
+		box-shadow: 5px 5px 5px #111;
+}
+
+h3.page-title {
+padding-top: 30px;
+		color: #033}
+.page-body {padding: 40px;}
+
+.page-body strong {color: #033;}
+
+.nav-links {margin-top: 5px;}
+*/
\ No newline at end of file
diff --git a/ussrbasicright/css/narrow_navbar.css b/ussrbasicright/css/narrow_navbar.css
new file mode 100644
index 0000000..99f0836
--- /dev/null
+++ b/ussrbasicright/css/narrow_navbar.css
@@ -0,0 +1,30 @@
+@media screen and (min-width: 767px) {
+
+	nav.navbar {
+		padding-top: 1px;
+		padding-bottom: 1px
+	}
+
+	nav .badge {
+		top: 0px;
+		left: -0.25rem;
+	}
+
+	.contextual-help-content-open {
+		top: 2.5rem;
+	}
+
+	aside {
+		padding-top: 3.5rem;
+	}
+
+	section {
+		padding-top: 3.5rem;
+	}
+
+	#jGrowl.top-right {
+		top: 3.5rem;
+		right: 15px;
+	}
+
+}
diff --git a/ussrbasicright/css/sloppy_photos.css b/ussrbasicright/css/sloppy_photos.css
new file mode 100644
index 0000000..78aedc9
--- /dev/null
+++ b/ussrbasicright/css/sloppy_photos.css
@@ -0,0 +1,58 @@
+
+.rotleft1 {
+-webkit-transform: rotate(-1deg);
+-moz-transform: rotate(-1deg);
+-ms-transform: rotate(-1deg);
+-o-transform: rotate(-1deg);
+}
+
+.rotleft2 {
+-webkit-transform: rotate(-2deg);
+-moz-transform: rotate(-2deg);
+-ms-transform: rotate(-2deg);
+-o-transform: rotate(-2deg);
+}
+
+.rotleft3 {
+-webkit-transform: rotate(-3deg);
+-moz-transform: rotate(-3deg);
+-ms-transform: rotate(-3deg);
+-o-transform: rotate(-3deg);
+}
+
+.rotleft4 {
+-webkit-transform: rotate(-4deg);
+-moz-transform: rotate(-4deg);
+-ms-transform: rotate(-4deg);
+-o-transform: rotate(-4deg);
+}
+
+
+.rotright1 {
+-webkit-transform: rotate(1deg);
+-moz-transform: rotate(1deg);
+-ms-transform: rotate(1deg);
+-o-transform: rotate(1deg);
+}
+
+.rotright2 {
+-webkit-transform: rotate(2deg);
+-moz-transform: rotate(2deg);
+-ms-transform: rotate(2deg);
+-o-transform: rotate(2deg);
+}
+
+.rotright3 {
+-webkit-transform: rotate(3deg);
+-moz-transform: rotate(3deg);
+-ms-transform: rotate(3deg);
+-o-transform: rotate(3deg);
+}
+
+.rotright4 {
+-webkit-transform: rotate(4deg);
+-moz-transform: rotate(4deg);
+-ms-transform: rotate(4deg);
+-o-transform: rotate(4deg);
+}
+
diff --git a/ussrbasictwopanel/css/style.css b/ussrbasicright/css/style.css
similarity index 99%
rename from ussrbasictwopanel/css/style.css
rename to ussrbasicright/css/style.css
index 0ebbc6c..bb5d04d 100644
--- a/ussrbasictwopanel/css/style.css
+++ b/ussrbasicright/css/style.css
@@ -1,5 +1,5 @@
 /**
- * Ussrbasictwopanel
+ * Ussrbasicright
  *
  * Based on duepuntozero Friendica style
  * Originally by Fabio Comuni <fabrix.xm@gmail.com>
diff --git a/ussrbasicright/img/gray_and_black_diagonal_stripes_background_seamless.gif b/ussrbasicright/img/gray_and_black_diagonal_stripes_background_seamless.gif
new file mode 100644
index 0000000..615c986
Binary files /dev/null and b/ussrbasicright/img/gray_and_black_diagonal_stripes_background_seamless.gif differ
diff --git a/ussrbasicright/img/gray_and_white_diagonal_stripes_background_seamless.gif b/ussrbasicright/img/gray_and_white_diagonal_stripes_background_seamless.gif
new file mode 100644
index 0000000..1443692
Binary files /dev/null and b/ussrbasicright/img/gray_and_white_diagonal_stripes_background_seamless.gif differ
diff --git a/ussrbasicright/img/screenshot.png b/ussrbasicright/img/screenshot.png
new file mode 100644
index 0000000..60d7e23
Binary files /dev/null and b/ussrbasicright/img/screenshot.png differ
diff --git a/ussrbasictwopanel/js/ussrbasiczlax.js b/ussrbasicright/js/ussrbasicright.js
similarity index 98%
rename from ussrbasictwopanel/js/ussrbasiczlax.js
rename to ussrbasicright/js/ussrbasicright.js
index 43083d4..911714c 100644
--- a/ussrbasictwopanel/js/ussrbasiczlax.js
+++ b/ussrbasicright/js/ussrbasicright.js
@@ -1,5 +1,5 @@
 /**
- * ussrbasictwopanel theme specific JavaScript
+ * ussrbasicright theme specific JavaScript
  */
 
 $(document).ready(function() {
diff --git a/ussrbasictwopanel/pdl/mod_admin.pdl b/ussrbasicright/pdl/mod_admin.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_admin.pdl
rename to ussrbasicright/pdl/mod_admin.pdl
diff --git a/ussrbasictwopanel/pdl/mod_appman.pdl b/ussrbasicright/pdl/mod_appman.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_appman.pdl
rename to ussrbasicright/pdl/mod_appman.pdl
diff --git a/ussrbasictwopanel/pdl/mod_apps.pdl b/ussrbasicright/pdl/mod_apps.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_apps.pdl
rename to ussrbasicright/pdl/mod_apps.pdl
diff --git a/ussrbasictwopanel/pdl/mod_articles.pdl b/ussrbasicright/pdl/mod_articles.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_articles.pdl
rename to ussrbasicright/pdl/mod_articles.pdl
diff --git a/ussrbasictwopanel/pdl/mod_blocks.pdl b/ussrbasicright/pdl/mod_blocks.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_blocks.pdl
rename to ussrbasicright/pdl/mod_blocks.pdl
diff --git a/ussrbasictwopanel/pdl/mod_cal.pdl b/ussrbasicright/pdl/mod_cal.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_cal.pdl
rename to ussrbasicright/pdl/mod_cal.pdl
diff --git a/ussrbasictwopanel/pdl/mod_cards.pdl b/ussrbasicright/pdl/mod_cards.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_cards.pdl
rename to ussrbasicright/pdl/mod_cards.pdl
diff --git a/ussrbasictwopanel/pdl/mod_cdav.pdl b/ussrbasicright/pdl/mod_cdav.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_cdav.pdl
rename to ussrbasicright/pdl/mod_cdav.pdl
diff --git a/ussrbasictwopanel/pdl/mod_channel.pdl b/ussrbasicright/pdl/mod_channel.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_channel.pdl
rename to ussrbasicright/pdl/mod_channel.pdl
diff --git a/ussrbasictwopanel/pdl/mod_chanview.pdl b/ussrbasicright/pdl/mod_chanview.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_chanview.pdl
rename to ussrbasicright/pdl/mod_chanview.pdl
diff --git a/ussrbasictwopanel/pdl/mod_chat.pdl b/ussrbasicright/pdl/mod_chat.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_chat.pdl
rename to ussrbasicright/pdl/mod_chat.pdl
diff --git a/ussrbasictwopanel/pdl/mod_cloud.pdl b/ussrbasicright/pdl/mod_cloud.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_cloud.pdl
rename to ussrbasicright/pdl/mod_cloud.pdl
diff --git a/ussrbasictwopanel/pdl/mod_common.pdl b/ussrbasicright/pdl/mod_common.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_common.pdl
rename to ussrbasicright/pdl/mod_common.pdl
diff --git a/ussrbasictwopanel/pdl/mod_connect.pdl b/ussrbasicright/pdl/mod_connect.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_connect.pdl
rename to ussrbasicright/pdl/mod_connect.pdl
diff --git a/ussrbasictwopanel/pdl/mod_connections.pdl b/ussrbasicright/pdl/mod_connections.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_connections.pdl
rename to ussrbasicright/pdl/mod_connections.pdl
diff --git a/ussrbasictwopanel/pdl/mod_connedit.pdl b/ussrbasicright/pdl/mod_connedit.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_connedit.pdl
rename to ussrbasicright/pdl/mod_connedit.pdl
diff --git a/ussrbasictwopanel/pdl/mod_defperms.pdl b/ussrbasicright/pdl/mod_defperms.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_defperms.pdl
rename to ussrbasicright/pdl/mod_defperms.pdl
diff --git a/ussrbasictwopanel/pdl/mod_directory.pdl b/ussrbasicright/pdl/mod_directory.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_directory.pdl
rename to ussrbasicright/pdl/mod_directory.pdl
diff --git a/ussrbasictwopanel/pdl/mod_display.pdl b/ussrbasicright/pdl/mod_display.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_display.pdl
rename to ussrbasicright/pdl/mod_display.pdl
diff --git a/ussrbasictwopanel/pdl/mod_editblock.pdl b/ussrbasicright/pdl/mod_editblock.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_editblock.pdl
rename to ussrbasicright/pdl/mod_editblock.pdl
diff --git a/ussrbasictwopanel/pdl/mod_editlayout.pdl b/ussrbasicright/pdl/mod_editlayout.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_editlayout.pdl
rename to ussrbasicright/pdl/mod_editlayout.pdl
diff --git a/ussrbasictwopanel/pdl/mod_editwebpage.pdl b/ussrbasicright/pdl/mod_editwebpage.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_editwebpage.pdl
rename to ussrbasicright/pdl/mod_editwebpage.pdl
diff --git a/ussrbasictwopanel/pdl/mod_go.pdl b/ussrbasicright/pdl/mod_go.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_go.pdl
rename to ussrbasicright/pdl/mod_go.pdl
diff --git a/ussrbasictwopanel/pdl/mod_group.pdl b/ussrbasicright/pdl/mod_group.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_group.pdl
rename to ussrbasicright/pdl/mod_group.pdl
diff --git a/ussrbasictwopanel/pdl/mod_help.pdl b/ussrbasicright/pdl/mod_help.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_help.pdl
rename to ussrbasicright/pdl/mod_help.pdl
diff --git a/ussrbasictwopanel/pdl/mod_hq.pdl b/ussrbasicright/pdl/mod_hq.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_hq.pdl
rename to ussrbasicright/pdl/mod_hq.pdl
diff --git a/ussrbasictwopanel/pdl/mod_id.pdl b/ussrbasicright/pdl/mod_id.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_id.pdl
rename to ussrbasicright/pdl/mod_id.pdl
diff --git a/ussrbasictwopanel/pdl/mod_layouts.pdl b/ussrbasicright/pdl/mod_layouts.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_layouts.pdl
rename to ussrbasicright/pdl/mod_layouts.pdl
diff --git a/ussrbasictwopanel/pdl/mod_locs.pdl b/ussrbasicright/pdl/mod_locs.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_locs.pdl
rename to ussrbasicright/pdl/mod_locs.pdl
diff --git a/ussrbasictwopanel/pdl/mod_mail.pdl b/ussrbasicright/pdl/mod_mail.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_mail.pdl
rename to ussrbasicright/pdl/mod_mail.pdl
diff --git a/ussrbasictwopanel/pdl/mod_menu.pdl b/ussrbasicright/pdl/mod_menu.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_menu.pdl
rename to ussrbasicright/pdl/mod_menu.pdl
diff --git a/ussrbasictwopanel/pdl/mod_message.pdl b/ussrbasicright/pdl/mod_message.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_message.pdl
rename to ussrbasicright/pdl/mod_message.pdl
diff --git a/ussrbasictwopanel/pdl/mod_mitem.pdl b/ussrbasicright/pdl/mod_mitem.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_mitem.pdl
rename to ussrbasicright/pdl/mod_mitem.pdl
diff --git a/ussrbasictwopanel/pdl/mod_moderate.pdl b/ussrbasicright/pdl/mod_moderate.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_moderate.pdl
rename to ussrbasicright/pdl/mod_moderate.pdl
diff --git a/ussrbasictwopanel/pdl/mod_network.pdl b/ussrbasicright/pdl/mod_network.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_network.pdl
rename to ussrbasicright/pdl/mod_network.pdl
diff --git a/ussrbasictwopanel/pdl/mod_photos.pdl b/ussrbasicright/pdl/mod_photos.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_photos.pdl
rename to ussrbasicright/pdl/mod_photos.pdl
diff --git a/ussrbasictwopanel/pdl/mod_profile.pdl b/ussrbasicright/pdl/mod_profile.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_profile.pdl
rename to ussrbasicright/pdl/mod_profile.pdl
diff --git a/ussrbasictwopanel/pdl/mod_profile_photo.pdl b/ussrbasicright/pdl/mod_profile_photo.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_profile_photo.pdl
rename to ussrbasicright/pdl/mod_profile_photo.pdl
diff --git a/ussrbasictwopanel/pdl/mod_profiles.pdl b/ussrbasicright/pdl/mod_profiles.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_profiles.pdl
rename to ussrbasicright/pdl/mod_profiles.pdl
diff --git a/ussrbasictwopanel/pdl/mod_profperm.pdl b/ussrbasicright/pdl/mod_profperm.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_profperm.pdl
rename to ussrbasicright/pdl/mod_profperm.pdl
diff --git a/ussrbasictwopanel/pdl/mod_pubstream.pdl b/ussrbasicright/pdl/mod_pubstream.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_pubstream.pdl
rename to ussrbasicright/pdl/mod_pubstream.pdl
diff --git a/ussrbasictwopanel/pdl/mod_rate.pdl b/ussrbasicright/pdl/mod_rate.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_rate.pdl
rename to ussrbasicright/pdl/mod_rate.pdl
diff --git a/ussrbasictwopanel/pdl/mod_ratings.pdl b/ussrbasicright/pdl/mod_ratings.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_ratings.pdl
rename to ussrbasicright/pdl/mod_ratings.pdl
diff --git a/ussrbasictwopanel/pdl/mod_search.pdl b/ussrbasicright/pdl/mod_search.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_search.pdl
rename to ussrbasicright/pdl/mod_search.pdl
diff --git a/ussrbasictwopanel/pdl/mod_settings.pdl b/ussrbasicright/pdl/mod_settings.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_settings.pdl
rename to ussrbasicright/pdl/mod_settings.pdl
diff --git a/ussrbasictwopanel/pdl/mod_sharedwithme.pdl b/ussrbasicright/pdl/mod_sharedwithme.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_sharedwithme.pdl
rename to ussrbasicright/pdl/mod_sharedwithme.pdl
diff --git a/ussrbasictwopanel/pdl/mod_sources.pdl b/ussrbasicright/pdl/mod_sources.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_sources.pdl
rename to ussrbasicright/pdl/mod_sources.pdl
diff --git a/ussrbasictwopanel/pdl/mod_suggest.pdl b/ussrbasicright/pdl/mod_suggest.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_suggest.pdl
rename to ussrbasicright/pdl/mod_suggest.pdl
diff --git a/ussrbasictwopanel/pdl/mod_thing.pdl b/ussrbasicright/pdl/mod_thing.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_thing.pdl
rename to ussrbasicright/pdl/mod_thing.pdl
diff --git a/ussrbasictwopanel/pdl/mod_uexport.pdl b/ussrbasicright/pdl/mod_uexport.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_uexport.pdl
rename to ussrbasicright/pdl/mod_uexport.pdl
diff --git a/ussrbasictwopanel/pdl/mod_viewconnections.pdl b/ussrbasicright/pdl/mod_viewconnections.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_viewconnections.pdl
rename to ussrbasicright/pdl/mod_viewconnections.pdl
diff --git a/ussrbasictwopanel/pdl/mod_webpages.pdl b/ussrbasicright/pdl/mod_webpages.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_webpages.pdl
rename to ussrbasicright/pdl/mod_webpages.pdl
diff --git a/ussrbasictwopanel/pdl/mod_wiki.pdl b/ussrbasicright/pdl/mod_wiki.pdl
similarity index 100%
rename from ussrbasictwopanel/pdl/mod_wiki.pdl
rename to ussrbasicright/pdl/mod_wiki.pdl
diff --git a/ussrbasicright/php/config.php b/ussrbasicright/php/config.php
new file mode 100644
index 0000000..fa0a2f9
--- /dev/null
+++ b/ussrbasicright/php/config.php
@@ -0,0 +1,128 @@
+<?php
+
+namespace Zotlabs\Theme;
+
+class UssrbasicrightConfig {
+
+	function get_schemas() {
+		$files = glob('view/theme/ussrbasicright/schema/*.php');
+
+		$scheme_choices = [];
+
+		if($files) {
+
+			if(in_array('view/theme/ussrbasicright/schema/default.php', $files)) {
+				$scheme_choices['---'] = t('Default');
+				$scheme_choices['focus'] = t('Focus (Hubzilla default)');
+			}
+			else {
+				$scheme_choices['---'] = t('Focus (Hubzilla default)');
+			}
+
+			foreach($files as $file) {
+				$f = basename($file, ".php");
+				if($f != 'default') {
+					$scheme_name = $f;
+					$scheme_choices[$f] = $scheme_name;
+				}
+			}
+		}
+
+		return $scheme_choices;
+	}
+
+	function get() {
+		if(! local_channel()) { 
+			return;
+		}
+
+		$arr = array();
+		$arr['narrow_navbar'] = get_pconfig(local_channel(),'ussrbasicright', 'narrow_navbar' );
+		$arr['nav_bg'] = get_pconfig(local_channel(),'ussrbasicright', 'nav_bg' );
+		$arr['nav_icon_colour'] = get_pconfig(local_channel(),'ussrbasicright', 'nav_icon_colour' );
+		$arr['nav_active_icon_colour'] = get_pconfig(local_channel(),'ussrbasicright', 'nav_active_icon_colour' );
+		$arr['link_colour'] = get_pconfig(local_channel(),'ussrbasicright', 'link_colour' );
+		$arr['banner_colour'] = get_pconfig(local_channel(),'ussrbasicright', 'banner_colour' );
+		$arr['bgcolour'] = get_pconfig(local_channel(),'ussrbasicright', 'background_colour' );
+		$arr['background_image'] = get_pconfig(local_channel(),'ussrbasicright', 'background_image' );
+		$arr['item_colour'] = get_pconfig(local_channel(),'ussrbasicright', 'item_colour' );
+		$arr['comment_item_colour'] = get_pconfig(local_channel(),'ussrbasicright', 'comment_item_colour' );
+		$arr['font_size'] = get_pconfig(local_channel(),'ussrbasicright', 'font_size' );
+		$arr['font_colour'] = get_pconfig(local_channel(),'ussrbasicright', 'font_colour' );
+		$arr['radius'] = get_pconfig(local_channel(),'ussrbasicright', 'radius' );
+		$arr['shadow'] = get_pconfig(local_channel(),'ussrbasicright', 'photo_shadow' );
+		$arr['converse_width']=get_pconfig(local_channel(),"ussrbasicright","converse_width");
+		$arr['top_photo']=get_pconfig(local_channel(),"ussrbasicright","top_photo");
+		$arr['reply_photo']=get_pconfig(local_channel(),"ussrbasicright","reply_photo");
+		$arr['advanced_theming'] = get_pconfig(local_channel(), 'ussrbasicright', 'advanced_theming');
+		return $this->form($arr);
+	}
+
+	function post() {
+		if(!local_channel()) { 
+			return;
+		}
+
+		if (isset($_POST['ussrbasicright-settings-submit'])) {
+			set_pconfig(local_channel(), 'ussrbasicright', 'narrow_navbar', $_POST['ussrbasicright_narrow_navbar']);
+			set_pconfig(local_channel(), 'ussrbasicright', 'nav_bg', $_POST['ussrbasicright_nav_bg']);
+			set_pconfig(local_channel(), 'ussrbasicright', 'nav_icon_colour', $_POST['ussrbasicright_nav_icon_colour']);
+			set_pconfig(local_channel(), 'ussrbasicright', 'nav_active_icon_colour', $_POST['ussrbasicright_nav_active_icon_colour']);
+			set_pconfig(local_channel(), 'ussrbasicright', 'link_colour', $_POST['ussrbasicright_link_colour']);
+			set_pconfig(local_channel(), 'ussrbasicright', 'background_colour', $_POST['ussrbasicright_background_colour']);
+			set_pconfig(local_channel(), 'ussrbasicright', 'banner_colour', $_POST['ussrbasicright_banner_colour']);
+			set_pconfig(local_channel(), 'ussrbasicright', 'background_image', $_POST['ussrbasicright_background_image']);
+			set_pconfig(local_channel(), 'ussrbasicright', 'item_colour', $_POST['ussrbasicright_item_colour']);
+			set_pconfig(local_channel(), 'ussrbasicright', 'comment_item_colour', $_POST['ussrbasicright_comment_item_colour']);
+			set_pconfig(local_channel(), 'ussrbasicright', 'font_size', $_POST['ussrbasicright_font_size']);
+			set_pconfig(local_channel(), 'ussrbasicright', 'font_colour', $_POST['ussrbasicright_font_colour']);
+			set_pconfig(local_channel(), 'ussrbasicright', 'radius', $_POST['ussrbasicright_radius']);
+			set_pconfig(local_channel(), 'ussrbasicright', 'photo_shadow', $_POST['ussrbasicright_shadow']);
+			set_pconfig(local_channel(), 'ussrbasicright', 'converse_width', $_POST['ussrbasicright_converse_width']);
+			set_pconfig(local_channel(), 'ussrbasicright', 'top_photo', $_POST['ussrbasicright_top_photo']);
+			set_pconfig(local_channel(), 'ussrbasicright', 'reply_photo', $_POST['ussrbasicright_reply_photo']);
+			set_pconfig(local_channel(), 'ussrbasicright', 'advanced_theming', $_POST['ussrbasicright_advanced_theming']);
+		}
+	}
+
+	function form($arr) {
+
+		if(get_pconfig(local_channel(), 'ussrbasicright', 'advanced_theming'))
+			$expert = 1;
+					
+	  	$o .= replace_macros(get_markup_template('theme_settings.tpl'), array(
+			'$submit' => t('Submit'),
+			'$baseurl' => z_root(),
+			'$theme' => \App::$channel['channel_theme'],
+			'$expert' => $expert,
+			'$title' => t("Theme settings"),
+			'$narrow_navbar' => array('ussrbasicright_narrow_navbar',t('Narrow navbar'),$arr['narrow_navbar'], '', array(t('No'),t('Yes'))),
+			'$nav_bg' => array('ussrbasicright_nav_bg', t('Navigation bar background color'), $arr['nav_bg']),
+			'$nav_icon_colour' => array('ussrbasicright_nav_icon_colour', t('Navigation bar icon color '), $arr['nav_icon_colour']),	
+			'$nav_active_icon_colour' => array('ussrbasicright_nav_active_icon_colour', t('Navigation bar active icon color '), $arr['nav_active_icon_colour']),
+			'$link_colour' => array('ussrbasicright_link_colour', t('Link color'), $arr['link_colour'], '', $link_colours),
+			'$banner_colour' => array('ussrbasicright_banner_colour', t('Set font-color for banner'), $arr['banner_colour']),
+			'$bgcolour' => array('ussrbasicright_background_colour', t('Set the background color'), $arr['bgcolour']),
+			'$background_image' => array('ussrbasicright_background_image', t('Set the background image'), $arr['background_image']),	
+			'$item_colour' => array('ussrbasicright_item_colour', t('Set the background color of items'), $arr['item_colour']),
+			'$comment_item_colour' => array('ussrbasicright_comment_item_colour', t('Set the background color of comments'), $arr['comment_item_colour']),
+			'$font_size' => array('ussrbasicright_font_size', t('Set font-size for the entire application'), $arr['font_size'], t('Examples: 1rem, 100%, 16px')),
+			'$font_colour' => array('ussrbasicright_font_colour', t('Set font-color for posts and comments'), $arr['font_colour']),
+			'$radius' => array('ussrbasicright_radius', t('Set radius of corners'), $arr['radius'], t('Example: 4px')),
+			'$shadow' => array('ussrbasicright_shadow', t('Set shadow depth of photos'), $arr['shadow']),
+			'$converse_width' => array('ussrbasicright_converse_width',t('Set maximum width of content region in pixel'),$arr['converse_width'], t('Leave empty for default width')),
+			'$top_photo' => array('ussrbasicright_top_photo', t('Set size of conversation author photo'), $arr['top_photo']),
+			'$reply_photo' => array('ussrbasicright_reply_photo', t('Set size of followup author photos'), $arr['reply_photo']),
+			'$advanced_theming' => ['ussrbasicright_advanced_theming', t('Show advanced settings'), $arr['advanced_theming'], '', [t('No'), t('Yes')]]
+			));
+
+		return $o;
+	}
+
+}
+
+
+
+
+
+
diff --git a/ussrbasictwopanel/php/style.php b/ussrbasicright/php/style.php
similarity index 58%
rename from ussrbasictwopanel/php/style.php
rename to ussrbasicright/php/style.php
index eaea794..d42b8b1 100644
--- a/ussrbasictwopanel/php/style.php
+++ b/ussrbasicright/php/style.php
@@ -6,28 +6,28 @@ if(! App::$install) {
 	$uid = get_theme_uid();
 
 	if($uid) {
-		load_pconfig($uid,'ussrbasictwopanel');
+		load_pconfig($uid,'ussrbasicright');
 	}
 
 	// Load the owners pconfig
-	$nav_bg = get_pconfig($uid, 'ussrbasictwopanel', 'nav_bg');
-	$nav_icon_colour = get_pconfig($uid, 'ussrbasictwopanel', 'nav_icon_colour');
-	$nav_active_icon_colour = get_pconfig($uid, 'ussrbasictwopanel', 'nav_active_icon_colour');
-	$banner_colour = get_pconfig($uid,'ussrbasictwopanel','banner_colour');
-	$narrow_navbar = get_pconfig($uid,'ussrbasictwopanel','narrow_navbar');
-	$link_colour = get_pconfig($uid, 'ussrbasictwopanel', 'link_colour');
-	$schema = get_pconfig($uid,'ussrbasictwopanel','schema');
-	$bgcolour = get_pconfig($uid, 'ussrbasictwopanel', 'background_colour');
-	$background_image = get_pconfig($uid, 'ussrbasictwopanel', 'background_image');
-	$item_colour = get_pconfig($uid, 'ussrbasictwopanel', 'item_colour');
-	$comment_item_colour = get_pconfig($uid, 'ussrbasictwopanel', 'comment_item_colour');
-	$font_size = get_pconfig($uid, 'ussrbasictwopanel', 'font_size');
-	$font_colour = get_pconfig($uid, 'ussrbasictwopanel', 'font_colour');
-	$radius = get_pconfig($uid, 'ussrbasictwopanel', 'radius');
-	$shadow = get_pconfig($uid,'ussrbasictwopanel','photo_shadow');
-	$converse_width=get_pconfig($uid,'ussrbasictwopanel','converse_width');
-	$top_photo=get_pconfig($uid,'ussrbasictwopanel','top_photo');
-	$reply_photo=get_pconfig($uid,'ussrbasictwopanel','reply_photo');
+	$nav_bg = get_pconfig($uid, 'ussrbasicright', 'nav_bg');
+	$nav_icon_colour = get_pconfig($uid, 'ussrbasicright', 'nav_icon_colour');
+	$nav_active_icon_colour = get_pconfig($uid, 'ussrbasicright', 'nav_active_icon_colour');
+	$banner_colour = get_pconfig($uid,'ussrbasicright','banner_colour');
+	$narrow_navbar = get_pconfig($uid,'ussrbasicright','narrow_navbar');
+	$link_colour = get_pconfig($uid, 'ussrbasicright', 'link_colour');
+	$schema = get_pconfig($uid,'ussrbasicright','schema');
+	$bgcolour = get_pconfig($uid, 'ussrbasicright', 'background_colour');
+	$background_image = get_pconfig($uid, 'ussrbasicright', 'background_image');
+	$item_colour = get_pconfig($uid, 'ussrbasicright', 'item_colour');
+	$comment_item_colour = get_pconfig($uid, 'ussrbasicright', 'comment_item_colour');
+	$font_size = get_pconfig($uid, 'ussrbasicright', 'font_size');
+	$font_colour = get_pconfig($uid, 'ussrbasicright', 'font_colour');
+	$radius = get_pconfig($uid, 'ussrbasicright', 'radius');
+	$shadow = get_pconfig($uid,'ussrbasicright','photo_shadow');
+	$converse_width=get_pconfig($uid,'ussrbasicright','converse_width');
+	$top_photo=get_pconfig($uid,'ussrbasicright','top_photo');
+	$reply_photo=get_pconfig($uid,'ussrbasicright','reply_photo');
 }
 
 // Now load the scheme.  If a value is changed above, we'll keep the settings
@@ -44,28 +44,28 @@ if($_REQUEST['schema']) {
 if (($schema) && ($schema != '---')) {
 
 	// Check it exists, because this setting gets distributed to clones
-	if(file_exists('view/theme/ussrbasictwopanel/schema/' . $schema . '.php')) {
-		$schemefile = 'view/theme/ussrbasictwopanel/schema/' . $schema . '.php';
+	if(file_exists('view/theme/ussrbasicright/schema/' . $schema . '.php')) {
+		$schemefile = 'view/theme/ussrbasicright/schema/' . $schema . '.php';
 		require_once ($schemefile);
 	}
 
-	if(file_exists('view/theme/ussrbasictwopanel/schema/' . $schema . '.css')) {
-		$schemecss = file_get_contents('view/theme/ussrbasictwopanel/schema/' . $schema . '.css');
+	if(file_exists('view/theme/ussrbasicright/schema/' . $schema . '.css')) {
+		$schemecss = file_get_contents('view/theme/ussrbasicright/schema/' . $schema . '.css');
 	}
 
 }
 
 // Allow admins to set a default schema for the hub.
-// default.php and default.css MUST be symlinks to existing schema files in view/theme/ussrbasictwopanel/schema
+// default.php and default.css MUST be symlinks to existing schema files in view/theme/ussrbasicright/schema
 if ((!$schema) || ($schema == '---')) {
 
-	if(file_exists('view/theme/ussrbasictwopanel/schema/default.php')) {
-		$schemefile = 'view/theme/ussrbasictwopanel/schema/default.php';
+	if(file_exists('view/theme/ussrbasicright/schema/default.php')) {
+		$schemefile = 'view/theme/ussrbasicright/schema/default.php';
 		require_once ($schemefile);
 	}
 
-	if(file_exists('view/theme/ussrbasictwopanel/schema/default.css')) {
-		$schemecss = file_get_contents('view/theme/ussrbasictwopanel/schema/default.css');
+	if(file_exists('view/theme/ussrbasicright/schema/default.css')) {
+		$schemecss = file_get_contents('view/theme/ussrbasicright/schema/default.css');
 	}
 
 }
@@ -108,12 +108,12 @@ if(! $reply_photo)
 	$reply_photo = '2.3rem';
 
 // Apply the settings
-if(file_exists('view/theme/ussrbasictwopanel/css/style.css')) {
+if(file_exists('view/theme/ussrbasicright/css/style.css')) {
 
-	$x = file_get_contents('view/theme/ussrbasictwopanel/css/style.css');
+	$x = file_get_contents('view/theme/ussrbasicright/css/style.css');
 
-	if($narrow_navbar && file_exists('view/theme/ussrbasictwopanel/css/narrow_navbar.css')) {
-		$x .= file_get_contents('view/theme/ussrbasictwopanel/css/narrow_navbar.css');
+	if($narrow_navbar && file_exists('view/theme/ussrbasicright/css/narrow_navbar.css')) {
+		$x .= file_get_contents('view/theme/ussrbasicright/css/narrow_navbar.css');
 	}
 
 	if($schemecss) {
@@ -159,5 +159,5 @@ if(file_exists('view/theme/ussrbasictwopanel/css/style.css')) {
 
 // Set the schema to the default schema in derived themes. See the documentation for creating derived themes how to override this. 
 
-// if(local_channel() && App::$channel && App::$channel['channel_theme'] != 'ussrbasictwopanel')
-// 	set_pconfig(local_channel(), 'ussrbasictwopanel', 'schema', '---');
+// if(local_channel() && App::$channel && App::$channel['channel_theme'] != 'ussrbasicright')
+// 	set_pconfig(local_channel(), 'ussrbasicright', 'schema', '---');
diff --git a/ussrbasicright/php/theme.php b/ussrbasicright/php/theme.php
new file mode 100644
index 0000000..9225e36
--- /dev/null
+++ b/ussrbasicright/php/theme.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ *   * Name: Ussrbasicright
+ *   * Description: zlax theme (removed like button and contact's minus circle)
+ *   * Version: 2.23
+ *   * MinVersion: 3.8
+ *   * MaxVersion: 6.0
+ *   * Author: Fabrixxm
+ *   * Maintainer: Mike Macgirvin
+ *   * Maintainer: Mario Vavti
+ */
+
+function ussrbasicright_init(&$a) {
+
+App::$theme_info['extends'] = 'redbasic';
+
+}
diff --git a/ussrbasicright/php/theme_init.php b/ussrbasicright/php/theme_init.php
new file mode 100644
index 0000000..5f73f67
--- /dev/null
+++ b/ussrbasicright/php/theme_init.php
@@ -0,0 +1,17 @@
+<?php
+
+head_add_css('/library/fork-awesome/css/fork-awesome.min.css');
+head_add_css('/vendor/twbs/bootstrap/dist/css/bootstrap.min.css');
+head_add_css('/library/bootstrap-tagsinput/bootstrap-tagsinput.css');
+head_add_css('/view/css/bootstrap-red.css');
+head_add_css('/library/datetimepicker/jquery.datetimepicker.css');
+head_add_css('/library/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css');
+require_once('view/php/theme_init.php');
+
+head_add_js('/vendor/twbs/bootstrap/dist/js/bootstrap.bundle.min.js');
+head_add_js('/library/bootbox/bootbox.min.js');
+head_add_js('/library/bootstrap-tagsinput/bootstrap-tagsinput.js');
+head_add_js('/library/datetimepicker/jquery.datetimepicker.js');
+head_add_js('/library/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.js');
+
+
diff --git a/ussrbasicright/schema/Focus-Boxy.css b/ussrbasicright/schema/Focus-Boxy.css
new file mode 100644
index 0000000..b9b2597
--- /dev/null
+++ b/ussrbasicright/schema/Focus-Boxy.css
@@ -0,0 +1,15 @@
+.comment .wall-item-body {
+	padding-left: 42px;
+}
+
+.wall-item-content-wrapper.comment {
+	border-bottom: 1px solid #dee2e6;
+}
+
+.widget {
+	border: 1px solid #dee2e6;
+}
+
+#note-text {
+	border: 1px solid transparent;
+}
diff --git a/ussrbasicright/schema/Focus-Boxy.php b/ussrbasicright/schema/Focus-Boxy.php
new file mode 100644
index 0000000..f298a0d
--- /dev/null
+++ b/ussrbasicright/schema/Focus-Boxy.php
@@ -0,0 +1,6 @@
+<?php
+
+if (! $radiuspx)
+	$radiuspx = "4";
+if (! $comment_border_colour)
+	$comment_border_colour = "rgb(238,238,238)";
diff --git a/ussrbasicright/schema/Focus-Light.css b/ussrbasicright/schema/Focus-Light.css
new file mode 100644
index 0000000..7289acf
--- /dev/null
+++ b/ussrbasicright/schema/Focus-Light.css
@@ -0,0 +1,5 @@
+.dropdown-header.text-white-50,
+.navbar-dark .navbar-toggler,
+.navbar-dark .nav-link.active {
+	color: rgba(0,0,0,0.7) !important;
+}
diff --git a/ussrbasicright/schema/Focus-Light.php b/ussrbasicright/schema/Focus-Light.php
new file mode 100644
index 0000000..14ee130
--- /dev/null
+++ b/ussrbasicright/schema/Focus-Light.php
@@ -0,0 +1,12 @@
+<?php
+	
+	if (! $nav_bg)
+		$nav_bg = "#f8f9fa";
+	if (! $nav_icon_colour)
+		$nav_icon_colour = "rgba(0, 0, 0, 0.5);";
+	if (! $nav_active_icon_colour)
+		$nav_active_icon_colour = "rgba(0, 0, 0, 0.7)";
+	if (! $radius)
+		$radius = "4px";
+	if (! $banner_colour)
+		$banner_colour = "rgba(0, 0, 0, 0.7)";
diff --git a/ussrbasicright/schema/Nolikes.css b/ussrbasicright/schema/Nolikes.css
new file mode 100644
index 0000000..4ab84b7
--- /dev/null
+++ b/ussrbasicright/schema/Nolikes.css
@@ -0,0 +1,7 @@
+.wall-item-like {
+    visibility: hidden;
+}
+
+.wall-item-tools-right > .btn-group > .btn:not(:last-child):not(.dropdown-toggle) {
+    visibility: hidden;
+}
diff --git a/ussrbasicright/schema/Nolikes.php b/ussrbasicright/schema/Nolikes.php
new file mode 100644
index 0000000..a4abe2d
--- /dev/null
+++ b/ussrbasicright/schema/Nolikes.php
@@ -0,0 +1,2 @@
+<?php
+
diff --git a/ussrbasicright/schema/Nominus-Nolikes.css b/ussrbasicright/schema/Nominus-Nolikes.css
new file mode 100644
index 0000000..3b2e929
--- /dev/null
+++ b/ussrbasicright/schema/Nominus-Nolikes.css
@@ -0,0 +1,11 @@
+.wall-item-like {
+    visibility: hidden;
+}
+
+.wall-item-tools-right > .btn-group > .btn:not(:last-child):not(.dropdown-toggle) {
+    visibility: hidden;
+}
+
+.fa-minus-circle {
+    visibility: hidden;
+}
diff --git a/ussrbasicright/schema/Nominus-Nolikes.php b/ussrbasicright/schema/Nominus-Nolikes.php
new file mode 100644
index 0000000..a4abe2d
--- /dev/null
+++ b/ussrbasicright/schema/Nominus-Nolikes.php
@@ -0,0 +1,2 @@
+<?php
+
diff --git a/ussrbasicright/schema/Nominus.css b/ussrbasicright/schema/Nominus.css
new file mode 100644
index 0000000..76ff1fe
--- /dev/null
+++ b/ussrbasicright/schema/Nominus.css
@@ -0,0 +1,3 @@
+.fa-minus-circle {
+    visibility: hidden;
+}
\ No newline at end of file
diff --git a/ussrbasicright/schema/Nominus.php b/ussrbasicright/schema/Nominus.php
new file mode 100644
index 0000000..a4abe2d
--- /dev/null
+++ b/ussrbasicright/schema/Nominus.php
@@ -0,0 +1,2 @@
+<?php
+
diff --git a/ussrbasicright/schema/dark-Nominus.css b/ussrbasicright/schema/dark-Nominus.css
new file mode 100644
index 0000000..d0321a3
--- /dev/null
+++ b/ussrbasicright/schema/dark-Nominus.css
@@ -0,0 +1,486 @@
+.generic-content-wrapper {
+	background-color: transparent;
+}
+
+textarea, input, select
+{
+  color: #BBB !important;
+  background: #333 !important;
+  border-color: #2B2B2B !important;
+ }
+
+#profile-jot-submit-wrapper {
+	border-top: none;
+	padding: 10px 0;
+}
+
+#jot-title {
+	border-radius: 3px;
+}
+
+#jot-title-wrap {
+	border-bottom: none;
+	margin-bottom: 5px;
+}
+
+#jot-category-wrap {
+	border-bottom: none;
+	margin-bottom: 5px;
+}
+
+.bootstrap-tagsinput {
+	background: #333;
+}
+
+optgroup {
+	color: #CCC !important;
+}
+
+option {
+	color: $link_colour !important;
+}
+
+.vcard, #contact-block, .widget {
+	background-color: transparent;
+	border: none;
+	border-bottom: 1px solid #333;
+	border-radius: 0px
+}
+
+#profile-photo-wrapper {
+	border: none;
+}
+
+#profile-edit-default-desc {
+	background-color: #665029;
+	color: #FFF;
+	padding: 20px;
+}
+
+.photo {
+	box-shadow: none;
+}
+
+.abook-pending-contact, .abook-permschange {
+	background: #402900;
+}
+
+.contact-entry-wrapper {
+	border: 1px solid #333;
+}
+
+#cboxContent a {
+	color: #000;
+}
+
+#cboxContent {
+	color: #111;
+}
+
+#adminpage table tr:hover {
+    background-color: #222;
+}
+
+#colorbox {
+	border: 0px solid #1E1E1E;
+	background-color: #1E1E1E;
+}
+
+.chat-item-text {
+	background-color: #222;
+}
+
+.fc-state-highlight {
+    background: none repeat scroll 0% 0% #333 !important;
+}
+
+.well {
+	background-color: #1E1E1E;
+	border: 1px solid #222;
+	background-image: linear-gradient(to bottom, #1E1E1E 0px, #1E1E1E 100%);
+}
+
+.alert-info, .section-content-info-wrapper {
+	color: #CCC;
+	background-color:#333;
+	border-color: #444;
+	background-image: linear-gradient(to bottom, #333 0px, #333 100%);
+}
+
+.abook-self {
+	background-color: #251111;
+}
+
+.acl-button-show,
+.acl-button-hide {
+	color: #fff;
+}
+
+#acl-select {
+	background-color:#333;
+	border: 1px solid #444;
+	color: #FFF;
+}
+
+#acl-showall {
+	color: #FFF;
+}
+
+
+#acl-list {
+	border: 1px solid #444;
+}
+
+#acl-search-wrapper {
+	border-bottom: 1px solid #444;
+}
+
+.acl-list-item {
+	border: 1px solid #222;
+	color: #CCC;
+	background-color:#333;
+}
+
+.abook-self {
+	border: 1px solid #222;
+	color: #555;
+	background-color:#111;
+}
+
+.modal-content,
+#notifications_wrapper {
+    background-color: #111;
+}
+
+.dropdown-header.text-black-50,
+.nav-link.active {
+	color:#fff !important;
+}
+
+a.btn, aside a {
+	font-weight: 400 !important;
+}
+
+.btn {
+	background-color: #1e1e1e;
+	border-color: #222;
+	color: #ccc;
+	text-shadow: none;
+	box-shadow: none;
+}
+
+.btn:hover, .btn:focus, .btn:active {
+	background-color: #222;
+	border-color: #222;
+	color: #fff;
+	text-decoration: underline;
+}
+
+.btn-default.btn-sm:hover, .btn-default.btn-sm:focus, .btn-default.btn-sm:active .btn-default.btn-sm.active {
+	text-decoration: none;
+}
+
+.btn-primary, input#event-submit, input#rmagic-submit-button, input#lostpass-submit-button {
+    background-color: #337AB7;
+    color: #FFF;
+}
+
+.btn-primary:hover, .btn-primary:focus, input#event-submit:hover, input#event-submit:focus, input#rmagic-submit-button:hover, input#rmagic-submit-button:focus, input#lostpass-submit-button:hover, input#lostpass-submit-button:focus {
+    border-color: #204D74;
+    background-color: #286090;
+    color: #FFF;
+}
+
+.btn-success {
+    color: #FFF !important;
+    background-color: #5CB85C !important;
+    border-color: #4CAE4C !important;
+}
+
+.btn-success:hover, .btn-success:focus {
+    color: #FFF !important;
+    background-color: #449D44 !important;
+    border-color: #398439 !important;
+}
+
+.btn-warning {
+    color: #FFF !important;
+    background-color: #F0AD4E !important;
+    border-color: #EEA236 !important;
+}
+
+.btn-warning:hover, .btn-warning:focus {
+	color: #FFF !important;
+	background-color: #EC971F !important;
+	border-color: #D58512 !important;
+}
+
+.btn-danger, form#chat-destroy > input {
+    background-color: #D9534F !important;
+    border-color: #D43F3A !important;
+	color: #FFF !important;
+}
+.btn-danger:hover, .btn-danger:focus, form#chat-destroy > input:hover, form#chat-destroy > input:focus {
+	color: #FFF !important;
+    background-color: #C9302C !important;
+    border-color: #AC2925 !important;
+}
+
+.pager_first,
+.pager_last,
+.pager_prev,
+.pager_next,
+.pager-prev,
+.pager-next,
+.pager_n {
+	border: 1px solid #222;
+	background: #1e1e1e;
+}
+
+input {
+	border: 1px solid #222;
+}
+
+input[type="submit"] {
+	background-color: #333;
+	color: #fff;
+}
+
+.notify-seen a {
+	background: #111;
+	color: #222 !important;
+}
+
+.notify-seen a:hover {
+	background: #222;
+	color: #ccc !important;
+}
+
+nav .dropdown-menu>li>a{
+	color: #fff;
+}
+
+nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
+	color: #fff;
+	background-color: #222;
+	background-image: none;
+}
+
+nav .dropdown-menu .divider{
+	background-color: #222;
+}
+
+nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
+	color: #fff;
+	background-color: #222;
+	background-image: none;
+}
+
+nav .dropdown-menu {
+	background-color: #000;
+}
+
+#nav-search-text {
+	background-color: #999;
+}
+
+.autocomplete .selected {
+	background: #999;
+}
+
+.nav-tabs {
+	border-bottom:1px solid #333;
+}
+
+.nav-tabs .nav-link.active {
+	color: #fff;
+	background-color: #111;
+	border-color: #333;
+}
+
+.nav-tabs .nav-link:hover,
+.nav-tabs .nav-link:focus {
+	text-decoration: underline;
+	background-color: #222;
+	color: #ccc;
+	border-color: #333;
+}
+
+aside .nav > li > a:hover, aside .nav > li > a:focus {
+	text-decoration: underline;
+	background-color: #222;
+}
+
+a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link {
+	font-weight: bold;
+}
+
+.list-group-item {
+	background-color: #222;
+}
+
+.text-dark {
+	color: #aaa !important;
+}
+a.text-dark:focus, a.text-dark:hover {
+	color: #ddd !important;
+}
+
+.group-selected, .fileas-selected, .categories-selected, .search-selected, a.active {
+	color: #fff !important;
+	text-decoration: underline !important;
+}
+
+.generic-content-wrapper-styled {
+	background-color: rgba(28,28,28,0.8);
+}
+
+.autocomplete {
+	background: #222;
+}
+
+blockquote {
+	background-color: #1e1e1e;
+	border-left: 3px solid #666;
+	color: #ccc;
+}
+
+code {
+	border: 1px solid #090909;
+	background: #000;
+	color: #fff;
+}
+
+pre {
+	background: #000;
+	color: #fff;
+	border:1px solid #090909;
+}
+
+#wiki-content-container code {
+	background: #000;
+}
+
+.notif-item a {
+	color: #ccc;
+}
+
+.notif-item a:hover {
+	color: #fff;
+}
+
+.dropdown-menu {
+	background-color: #222;
+}
+
+.dropdown-menu >li > a {
+	color: #ccc !important;
+}
+
+.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus {
+    	color: #ddd;
+    	background-color: #333;
+	background-image: none;
+}
+
+.open .dropdown-toggle.btn-default, .open .dropdown-toggle.btn-default:focus {
+    color: #ccc;
+    background-color: #222;
+    border-color: #222;
+}
+
+.pmenu-item:hover a {
+	background-color: #333 !important;
+	color: #ddd;
+}
+
+.preview {
+	background: url('../img/gray_and_black_diagonal_stripes_background_seamless.gif');
+}
+
+.xdsoft_datepicker.active {
+	color: #222 !important;
+	text-decoration: none !important;
+}
+
+.xdsoft_datepicker.active:hover, .xdsoft_datepicker.active:focus {
+	color: #222 !important;
+	text-decoration: underline;
+}
+
+@media (min-width: 768px) {
+  .nav-tabs.nav-justified > li > a {
+    border-bottom: 1px solid #333;
+  }
+}
+
+#profile-jot-wrapper {
+	background-color: inherit;
+	border: none;
+}
+
+.nav-tabs.nav-justified {
+	background-color: inherit;
+	border: none;
+}
+
+.table-striped > tbody > tr:nth-of-type(2n+1), .table-hover > tbody > tr:hover {
+	background-color: #191919;
+}
+
+.table > tbody > tr > td {
+	border-color: #888;
+}
+
+.help-content {
+	border-bottom: #222 thin solid;
+}
+
+.help-content-open {
+  	-moz-box-shadow: 0px 3px 3px #222;
+  	-webkit-box-shadow: 0px 3px 3px #222;
+  	box-shadow: 0px 3px 3px #222;
+}
+
+.contextual-help-content-open {
+	background: $nav_bg;
+	border-bottom: #555 1px solid;
+	box-shadow: 0px 3px 3px rgba(85,85,85,0.2);
+}
+
+.contextual-help-tool {
+	opacity: 0.5;
+}
+
+.contextual-help-tool:hover {
+	opacity: 1;
+}
+
+.contextual-help-tool i {
+	color: $link_colour;
+}
+
+
+.profile-match-wrapper {
+	width: 150px;
+	height: 120px;
+	border: none;
+}
+
+.profile-match-name {
+    	width: 144px;
+    	white-space: nowrap;
+    	text-overflow: ellipsis;
+}
+
+.widget-nav-pills-icons:hover + a {
+	background-color: #222;
+}
+
+.widget-nav-pills-checkbox:hover + a {
+	background-color: #222;
+}
+
+.fa-minus-circle {
+    visibility: hidden;
+}
\ No newline at end of file
diff --git a/ussrbasicright/schema/dark-Nominus.php b/ussrbasicright/schema/dark-Nominus.php
new file mode 100644
index 0000000..af4b122
--- /dev/null
+++ b/ussrbasicright/schema/dark-Nominus.php
@@ -0,0 +1,41 @@
+<?php
+	
+	if (! $nav_bg)
+		$nav_bg = "#000";
+	if (! $nav_gradient_top)
+		$nav_gradient_top = "#000";
+	if (! $nav_gradient_bottom)
+		$nav_gradient_bottom = "#000";
+	if (! $nav_active_gradient_top)
+		$nav_active_gradient_top = "#333";
+	if (! $nav_active_gradient_bottom)
+		$nav_active_gradient_bottom = "#111";
+	if (! $nav_bd)
+		$nav_bd = "#111";
+	if (! $nav_icon_colour)
+		$nav_icon_colour = "#999";
+	if (! $nav_active_icon_colour)
+		$nav_active_icon_colour = "#fff";
+	if (! $link_colour)
+		$link_colour = "#fff";
+	if (! $banner_colour)
+		$banner_colour = "#999";
+	if (! $bgcolour)
+		$bgcolour = "#111";
+	if (! $item_colour)
+		$item_colour = "rgba(28,28,28,0.8)";
+	if (! $comment_item_colour)
+		$comment_item_colour = "rgba(18,18,18,0.4)";
+	if (! $comment_border_colour)
+		$comment_border_colour = "rgba(28,28,28,0.8)";
+	if (! $toolicon_colour)
+		$toolicon_colour = '#999';
+	if (! $toolicon_activecolour)
+		$toolicon_activecolour = '#fff';
+	if (! $font_colour)
+		$font_colour = "#ccc";
+	if (! $converse_width)
+		$converse_width = "1024";
+		
+
+
diff --git a/ussrbasicright/schema/dark.css b/ussrbasicright/schema/dark.css
new file mode 100644
index 0000000..71f7bc3
--- /dev/null
+++ b/ussrbasicright/schema/dark.css
@@ -0,0 +1,482 @@
+.generic-content-wrapper {
+	background-color: transparent;
+}
+
+textarea, input, select
+{
+  color: #BBB !important;
+  background: #333 !important;
+  border-color: #2B2B2B !important;
+ }
+
+#profile-jot-submit-wrapper {
+	border-top: none;
+	padding: 10px 0;
+}
+
+#jot-title {
+	border-radius: 3px;
+}
+
+#jot-title-wrap {
+	border-bottom: none;
+	margin-bottom: 5px;
+}
+
+#jot-category-wrap {
+	border-bottom: none;
+	margin-bottom: 5px;
+}
+
+.bootstrap-tagsinput {
+	background: #333;
+}
+
+optgroup {
+	color: #CCC !important;
+}
+
+option {
+	color: $link_colour !important;
+}
+
+.vcard, #contact-block, .widget {
+	background-color: transparent;
+	border: none;
+	border-bottom: 1px solid #333;
+	border-radius: 0px
+}
+
+#profile-photo-wrapper {
+	border: none;
+}
+
+#profile-edit-default-desc {
+	background-color: #665029;
+	color: #FFF;
+	padding: 20px;
+}
+
+.photo {
+	box-shadow: none;
+}
+
+.abook-pending-contact, .abook-permschange {
+	background: #402900;
+}
+
+.contact-entry-wrapper {
+	border: 1px solid #333;
+}
+
+#cboxContent a {
+	color: #000;
+}
+
+#cboxContent {
+	color: #111;
+}
+
+#adminpage table tr:hover {
+    background-color: #222;
+}
+
+#colorbox {
+	border: 0px solid #1E1E1E;
+	background-color: #1E1E1E;
+}
+
+.chat-item-text {
+	background-color: #222;
+}
+
+.fc-state-highlight {
+    background: none repeat scroll 0% 0% #333 !important;
+}
+
+.well {
+	background-color: #1E1E1E;
+	border: 1px solid #222;
+	background-image: linear-gradient(to bottom, #1E1E1E 0px, #1E1E1E 100%);
+}
+
+.alert-info, .section-content-info-wrapper {
+	color: #CCC;
+	background-color:#333;
+	border-color: #444;
+	background-image: linear-gradient(to bottom, #333 0px, #333 100%);
+}
+
+.abook-self {
+	background-color: #251111;
+}
+
+.acl-button-show,
+.acl-button-hide {
+	color: #fff;
+}
+
+#acl-select {
+	background-color:#333;
+	border: 1px solid #444;
+	color: #FFF;
+}
+
+#acl-showall {
+	color: #FFF;
+}
+
+
+#acl-list {
+	border: 1px solid #444;
+}
+
+#acl-search-wrapper {
+	border-bottom: 1px solid #444;
+}
+
+.acl-list-item {
+	border: 1px solid #222;
+	color: #CCC;
+	background-color:#333;
+}
+
+.abook-self {
+	border: 1px solid #222;
+	color: #555;
+	background-color:#111;
+}
+
+.modal-content,
+#notifications_wrapper {
+    background-color: #111;
+}
+
+.dropdown-header.text-black-50,
+.nav-link.active {
+	color:#fff !important;
+}
+
+a.btn, aside a {
+	font-weight: 400 !important;
+}
+
+.btn {
+	background-color: #1e1e1e;
+	border-color: #222;
+	color: #ccc;
+	text-shadow: none;
+	box-shadow: none;
+}
+
+.btn:hover, .btn:focus, .btn:active {
+	background-color: #222;
+	border-color: #222;
+	color: #fff;
+	text-decoration: underline;
+}
+
+.btn-default.btn-sm:hover, .btn-default.btn-sm:focus, .btn-default.btn-sm:active .btn-default.btn-sm.active {
+	text-decoration: none;
+}
+
+.btn-primary, input#event-submit, input#rmagic-submit-button, input#lostpass-submit-button {
+    background-color: #337AB7;
+    color: #FFF;
+}
+
+.btn-primary:hover, .btn-primary:focus, input#event-submit:hover, input#event-submit:focus, input#rmagic-submit-button:hover, input#rmagic-submit-button:focus, input#lostpass-submit-button:hover, input#lostpass-submit-button:focus {
+    border-color: #204D74;
+    background-color: #286090;
+    color: #FFF;
+}
+
+.btn-success {
+    color: #FFF !important;
+    background-color: #5CB85C !important;
+    border-color: #4CAE4C !important;
+}
+
+.btn-success:hover, .btn-success:focus {
+    color: #FFF !important;
+    background-color: #449D44 !important;
+    border-color: #398439 !important;
+}
+
+.btn-warning {
+    color: #FFF !important;
+    background-color: #F0AD4E !important;
+    border-color: #EEA236 !important;
+}
+
+.btn-warning:hover, .btn-warning:focus {
+	color: #FFF !important;
+	background-color: #EC971F !important;
+	border-color: #D58512 !important;
+}
+
+.btn-danger, form#chat-destroy > input {
+    background-color: #D9534F !important;
+    border-color: #D43F3A !important;
+	color: #FFF !important;
+}
+.btn-danger:hover, .btn-danger:focus, form#chat-destroy > input:hover, form#chat-destroy > input:focus {
+	color: #FFF !important;
+    background-color: #C9302C !important;
+    border-color: #AC2925 !important;
+}
+
+.pager_first,
+.pager_last,
+.pager_prev,
+.pager_next,
+.pager-prev,
+.pager-next,
+.pager_n {
+	border: 1px solid #222;
+	background: #1e1e1e;
+}
+
+input {
+	border: 1px solid #222;
+}
+
+input[type="submit"] {
+	background-color: #333;
+	color: #fff;
+}
+
+.notify-seen a {
+	background: #111;
+	color: #222 !important;
+}
+
+.notify-seen a:hover {
+	background: #222;
+	color: #ccc !important;
+}
+
+nav .dropdown-menu>li>a{
+	color: #fff;
+}
+
+nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
+	color: #fff;
+	background-color: #222;
+	background-image: none;
+}
+
+nav .dropdown-menu .divider{
+	background-color: #222;
+}
+
+nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
+	color: #fff;
+	background-color: #222;
+	background-image: none;
+}
+
+nav .dropdown-menu {
+	background-color: #000;
+}
+
+#nav-search-text {
+	background-color: #999;
+}
+
+.autocomplete .selected {
+	background: #999;
+}
+
+.nav-tabs {
+	border-bottom:1px solid #333;
+}
+
+.nav-tabs .nav-link.active {
+	color: #fff;
+	background-color: #111;
+	border-color: #333;
+}
+
+.nav-tabs .nav-link:hover,
+.nav-tabs .nav-link:focus {
+	text-decoration: underline;
+	background-color: #222;
+	color: #ccc;
+	border-color: #333;
+}
+
+aside .nav > li > a:hover, aside .nav > li > a:focus {
+	text-decoration: underline;
+	background-color: #222;
+}
+
+a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link {
+	font-weight: bold;
+}
+
+.list-group-item {
+	background-color: #222;
+}
+
+.text-dark {
+	color: #aaa !important;
+}
+a.text-dark:focus, a.text-dark:hover {
+	color: #ddd !important;
+}
+
+.group-selected, .fileas-selected, .categories-selected, .search-selected, a.active {
+	color: #fff !important;
+	text-decoration: underline !important;
+}
+
+.generic-content-wrapper-styled {
+	background-color: rgba(28,28,28,0.8);
+}
+
+.autocomplete {
+	background: #222;
+}
+
+blockquote {
+	background-color: #1e1e1e;
+	border-left: 3px solid #666;
+	color: #ccc;
+}
+
+code {
+	border: 1px solid #090909;
+	background: #000;
+	color: #fff;
+}
+
+pre {
+	background: #000;
+	color: #fff;
+	border:1px solid #090909;
+}
+
+#wiki-content-container code {
+	background: #000;
+}
+
+.notif-item a {
+	color: #ccc;
+}
+
+.notif-item a:hover {
+	color: #fff;
+}
+
+.dropdown-menu {
+	background-color: #222;
+}
+
+.dropdown-menu >li > a {
+	color: #ccc !important;
+}
+
+.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus {
+    	color: #ddd;
+    	background-color: #333;
+	background-image: none;
+}
+
+.open .dropdown-toggle.btn-default, .open .dropdown-toggle.btn-default:focus {
+    color: #ccc;
+    background-color: #222;
+    border-color: #222;
+}
+
+.pmenu-item:hover a {
+	background-color: #333 !important;
+	color: #ddd;
+}
+
+.preview {
+	background: url('../img/gray_and_black_diagonal_stripes_background_seamless.gif');
+}
+
+.xdsoft_datepicker.active {
+	color: #222 !important;
+	text-decoration: none !important;
+}
+
+.xdsoft_datepicker.active:hover, .xdsoft_datepicker.active:focus {
+	color: #222 !important;
+	text-decoration: underline;
+}
+
+@media (min-width: 768px) {
+  .nav-tabs.nav-justified > li > a {
+    border-bottom: 1px solid #333;
+  }
+}
+
+#profile-jot-wrapper {
+	background-color: inherit;
+	border: none;
+}
+
+.nav-tabs.nav-justified {
+	background-color: inherit;
+	border: none;
+}
+
+.table-striped > tbody > tr:nth-of-type(2n+1), .table-hover > tbody > tr:hover {
+	background-color: #191919;
+}
+
+.table > tbody > tr > td {
+	border-color: #888;
+}
+
+.help-content {
+	border-bottom: #222 thin solid;
+}
+
+.help-content-open {
+  	-moz-box-shadow: 0px 3px 3px #222;
+  	-webkit-box-shadow: 0px 3px 3px #222;
+  	box-shadow: 0px 3px 3px #222;
+}
+
+.contextual-help-content-open {
+	background: $nav_bg;
+	border-bottom: #555 1px solid;
+	box-shadow: 0px 3px 3px rgba(85,85,85,0.2);
+}
+
+.contextual-help-tool {
+	opacity: 0.5;
+}
+
+.contextual-help-tool:hover {
+	opacity: 1;
+}
+
+.contextual-help-tool i {
+	color: $link_colour;
+}
+
+
+.profile-match-wrapper {
+	width: 150px;
+	height: 120px;
+	border: none;
+}
+
+.profile-match-name {
+    	width: 144px;
+    	white-space: nowrap;
+    	text-overflow: ellipsis;
+}
+
+.widget-nav-pills-icons:hover + a {
+	background-color: #222;
+}
+
+.widget-nav-pills-checkbox:hover + a {
+	background-color: #222;
+}
diff --git a/ussrbasicright/schema/dark.php b/ussrbasicright/schema/dark.php
new file mode 100644
index 0000000..af4b122
--- /dev/null
+++ b/ussrbasicright/schema/dark.php
@@ -0,0 +1,41 @@
+<?php
+	
+	if (! $nav_bg)
+		$nav_bg = "#000";
+	if (! $nav_gradient_top)
+		$nav_gradient_top = "#000";
+	if (! $nav_gradient_bottom)
+		$nav_gradient_bottom = "#000";
+	if (! $nav_active_gradient_top)
+		$nav_active_gradient_top = "#333";
+	if (! $nav_active_gradient_bottom)
+		$nav_active_gradient_bottom = "#111";
+	if (! $nav_bd)
+		$nav_bd = "#111";
+	if (! $nav_icon_colour)
+		$nav_icon_colour = "#999";
+	if (! $nav_active_icon_colour)
+		$nav_active_icon_colour = "#fff";
+	if (! $link_colour)
+		$link_colour = "#fff";
+	if (! $banner_colour)
+		$banner_colour = "#999";
+	if (! $bgcolour)
+		$bgcolour = "#111";
+	if (! $item_colour)
+		$item_colour = "rgba(28,28,28,0.8)";
+	if (! $comment_item_colour)
+		$comment_item_colour = "rgba(18,18,18,0.4)";
+	if (! $comment_border_colour)
+		$comment_border_colour = "rgba(28,28,28,0.8)";
+	if (! $toolicon_colour)
+		$toolicon_colour = '#999';
+	if (! $toolicon_activecolour)
+		$toolicon_activecolour = '#fff';
+	if (! $font_colour)
+		$font_colour = "#ccc";
+	if (! $converse_width)
+		$converse_width = "1024";
+		
+
+
diff --git a/ussrbasicright/schema/zlax.css b/ussrbasicright/schema/zlax.css
new file mode 100644
index 0000000..6b6e331
--- /dev/null
+++ b/ussrbasicright/schema/zlax.css
@@ -0,0 +1,17 @@
+.wall-item-like {
+    visibility: hidden;
+}
+
+.wall-item-tools-right > .btn-group > .btn:not(:last-child):not(.dropdown-toggle) {
+    visibility: hidden;
+}
+
+.fa-minus-circle {
+    visibility: hidden;
+}
+
+div.tagblock > h3 {
+    position: relative;
+    left: 33%;
+    content: url(https://ussr.win/photo/73e2201da875ccae6fecadfcf8ccba55c6c8ac093634d2e4af8e0f3cec1f2de3.gif);
+}
diff --git a/ussrbasicright/schema/zlax.php b/ussrbasicright/schema/zlax.php
new file mode 100644
index 0000000..a4abe2d
--- /dev/null
+++ b/ussrbasicright/schema/zlax.php
@@ -0,0 +1,2 @@
+<?php
+
diff --git a/ussrbasicright/tpl/suggest_widget.tpl b/ussrbasicright/tpl/suggest_widget.tpl
new file mode 100644
index 0000000..7b9afa6
--- /dev/null
+++ b/ussrbasicright/tpl/suggest_widget.tpl
@@ -0,0 +1,10 @@
+<div class="widget suggestions-widget">
+<h3>{{$title}}</h3>
+{{if $entries}}
+{{foreach $entries as $child}}
+{{include file="suggest_friends.tpl" entry=$child}}
+{{/foreach}}
+{{/if}}
+<div class="clear"></div>
+<div class="suggest-widget-more"><a href="suggest">{{$more}}</a></div>
+</div>
diff --git a/ussrbasicright/tpl/theme_settings.tpl b/ussrbasicright/tpl/theme_settings.tpl
new file mode 100644
index 0000000..4bff96b
--- /dev/null
+++ b/ussrbasicright/tpl/theme_settings.tpl
@@ -0,0 +1,34 @@
+{{include file="field_checkbox.tpl" field=$narrow_navbar}}
+{{include file="field_input.tpl" field=$converse_width}}
+{{include file="field_input.tpl" field=$font_size}}
+{{include file="field_checkbox.tpl" field=$advanced_theming}}
+{{if $expert}}
+	{{include file="field_colorinput.tpl" field=$nav_bg}}
+	{{include file="field_colorinput.tpl" field=$nav_icon_colour}}
+	{{include file="field_colorinput.tpl" field=$nav_active_icon_colour}}
+	{{include file="field_colorinput.tpl" field=$banner_colour}}
+	{{include file="field_colorinput.tpl" field=$bgcolour}}
+	{{include file="field_colorinput.tpl" field=$background_image}}
+	{{include file="field_colorinput.tpl" field=$item_colour}}
+	{{include file="field_colorinput.tpl" field=$comment_item_colour}}
+	{{*include file="field_colorinput.tpl" field=$comment_border_colour*}}
+	{{*include file="field_input.tpl" field=$comment_indent*}}
+	{{include file="field_colorinput.tpl" field=$font_colour}}
+	{{include file="field_colorinput.tpl" field=$link_colour}}
+	{{include file="field_input.tpl" field=$radius}}
+	{{include file="field_input.tpl" field=$shadow}}
+	{{include file="field_input.tpl" field=$top_photo}}
+	{{include file="field_input.tpl" field=$reply_photo}}
+
+<script>
+	$(function(){
+		$('#id_ussrbasicright_nav_bg, #id_ussrbasicright_nav_icon_colour, #id_ussrbasicright_nav_active_icon_colour, #id_ussrbasicright_banner_colour').colorpicker({format: 'rgba'});
+		$('#id_ussrbasicright_link_colour,#id_ussrbasicright_background_colour').colorpicker();
+		$('#id_ussrbasicright_toolicon_colour,#id_ussrbasicright_toolicon_activecolour,#id_ussrbasicright_font_colour').colorpicker();
+		$('#id_ussrbasicright_item_colour,#id_ussrbasicright_comment_item_colour,#id_ussrbasicright_comment_border_colour').colorpicker({format: 'rgba'});
+	});
+</script>
+{{/if}}
+<div class="settings-submit-wrapper" >
+	<button type="submit" name="ussrbasicright-settings-submit" class="btn btn-primary">{{$submit}}</button>
+</div>
diff --git a/ussrbasictwopanel/php/config.php b/ussrbasictwopanel/php/config.php
deleted file mode 100644
index f2819be..0000000
--- a/ussrbasictwopanel/php/config.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-
-namespace Zotlabs\Theme;
-
-class UssrbasictwopanelConfig {
-
-	function get_schemas() {
-		$files = glob('view/theme/ussrbasictwopanel/schema/*.php');
-
-		$scheme_choices = [];
-
-		if($files) {
-
-			if(in_array('view/theme/ussrbasictwopanel/schema/default.php', $files)) {
-				$scheme_choices['---'] = t('Default');
-				$scheme_choices['focus'] = t('Focus (Hubzilla default)');
-			}
-			else {
-				$scheme_choices['---'] = t('Focus (Hubzilla default)');
-			}
-
-			foreach($files as $file) {
-				$f = basename($file, ".php");
-				if($f != 'default') {
-					$scheme_name = $f;
-					$scheme_choices[$f] = $scheme_name;
-				}
-			}
-		}
-
-		return $scheme_choices;
-	}
-
-	function get() {
-		if(! local_channel()) { 
-			return;
-		}
-
-		$arr = array();
-		$arr['narrow_navbar'] = get_pconfig(local_channel(),'ussrbasictwopanel', 'narrow_navbar' );
-		$arr['nav_bg'] = get_pconfig(local_channel(),'ussrbasictwopanel', 'nav_bg' );
-		$arr['nav_icon_colour'] = get_pconfig(local_channel(),'ussrbasictwopanel', 'nav_icon_colour' );
-		$arr['nav_active_icon_colour'] = get_pconfig(local_channel(),'ussrbasictwopanel', 'nav_active_icon_colour' );
-		$arr['link_colour'] = get_pconfig(local_channel(),'ussrbasictwopanel', 'link_colour' );
-		$arr['banner_colour'] = get_pconfig(local_channel(),'ussrbasictwopanel', 'banner_colour' );
-		$arr['bgcolour'] = get_pconfig(local_channel(),'ussrbasictwopanel', 'background_colour' );
-		$arr['background_image'] = get_pconfig(local_channel(),'ussrbasictwopanel', 'background_image' );
-		$arr['item_colour'] = get_pconfig(local_channel(),'ussrbasictwopanel', 'item_colour' );
-		$arr['comment_item_colour'] = get_pconfig(local_channel(),'ussrbasictwopanel', 'comment_item_colour' );
-		$arr['font_size'] = get_pconfig(local_channel(),'ussrbasictwopanel', 'font_size' );
-		$arr['font_colour'] = get_pconfig(local_channel(),'ussrbasictwopanel', 'font_colour' );
-		$arr['radius'] = get_pconfig(local_channel(),'ussrbasictwopanel', 'radius' );
-		$arr['shadow'] = get_pconfig(local_channel(),'ussrbasictwopanel', 'photo_shadow' );
-		$arr['converse_width']=get_pconfig(local_channel(),"ussrbasictwopanel","converse_width");
-		$arr['top_photo']=get_pconfig(local_channel(),"ussrbasictwopanel","top_photo");
-		$arr['reply_photo']=get_pconfig(local_channel(),"ussrbasictwopanel","reply_photo");
-		$arr['advanced_theming'] = get_pconfig(local_channel(), 'ussrbasictwopanel', 'advanced_theming');
-		return $this->form($arr);
-	}
-
-	function post() {
-		if(!local_channel()) { 
-			return;
-		}
-
-		if (isset($_POST['ussrbasictwopanel-settings-submit'])) {
-			set_pconfig(local_channel(), 'ussrbasictwopanel', 'narrow_navbar', $_POST['ussrbasictwopanel_narrow_navbar']);
-			set_pconfig(local_channel(), 'ussrbasictwopanel', 'nav_bg', $_POST['ussrbasictwopanel_nav_bg']);
-			set_pconfig(local_channel(), 'ussrbasictwopanel', 'nav_icon_colour', $_POST['ussrbasictwopanel_nav_icon_colour']);
-			set_pconfig(local_channel(), 'ussrbasictwopanel', 'nav_active_icon_colour', $_POST['ussrbasictwopanel_nav_active_icon_colour']);
-			set_pconfig(local_channel(), 'ussrbasictwopanel', 'link_colour', $_POST['ussrbasictwopanel_link_colour']);
-			set_pconfig(local_channel(), 'ussrbasictwopanel', 'background_colour', $_POST['ussrbasictwopanel_background_colour']);
-			set_pconfig(local_channel(), 'ussrbasictwopanel', 'banner_colour', $_POST['ussrbasictwopanel_banner_colour']);
-			set_pconfig(local_channel(), 'ussrbasictwopanel', 'background_image', $_POST['ussrbasictwopanel_background_image']);
-			set_pconfig(local_channel(), 'ussrbasictwopanel', 'item_colour', $_POST['ussrbasictwopanel_item_colour']);
-			set_pconfig(local_channel(), 'ussrbasictwopanel', 'comment_item_colour', $_POST['ussrbasictwopanel_comment_item_colour']);
-			set_pconfig(local_channel(), 'ussrbasictwopanel', 'font_size', $_POST['ussrbasictwopanel_font_size']);
-			set_pconfig(local_channel(), 'ussrbasictwopanel', 'font_colour', $_POST['ussrbasictwopanel_font_colour']);
-			set_pconfig(local_channel(), 'ussrbasictwopanel', 'radius', $_POST['ussrbasictwopanel_radius']);
-			set_pconfig(local_channel(), 'ussrbasictwopanel', 'photo_shadow', $_POST['ussrbasictwopanel_shadow']);
-			set_pconfig(local_channel(), 'ussrbasictwopanel', 'converse_width', $_POST['ussrbasictwopanel_converse_width']);
-			set_pconfig(local_channel(), 'ussrbasictwopanel', 'top_photo', $_POST['ussrbasictwopanel_top_photo']);
-			set_pconfig(local_channel(), 'ussrbasictwopanel', 'reply_photo', $_POST['ussrbasictwopanel_reply_photo']);
-			set_pconfig(local_channel(), 'ussrbasictwopanel', 'advanced_theming', $_POST['ussrbasictwopanel_advanced_theming']);
-		}
-	}
-
-	function form($arr) {
-
-		if(get_pconfig(local_channel(), 'ussrbasictwopanel', 'advanced_theming'))
-			$expert = 1;
-					
-	  	$o .= replace_macros(get_markup_template('theme_settings.tpl'), array(
-			'$submit' => t('Submit'),
-			'$baseurl' => z_root(),
-			'$theme' => \App::$channel['channel_theme'],
-			'$expert' => $expert,
-			'$title' => t("Theme settings"),
-			'$narrow_navbar' => array('ussrbasictwopanel_narrow_navbar',t('Narrow navbar'),$arr['narrow_navbar'], '', array(t('No'),t('Yes'))),
-			'$nav_bg' => array('ussrbasictwopanel_nav_bg', t('Navigation bar background color'), $arr['nav_bg']),
-			'$nav_icon_colour' => array('ussrbasictwopanel_nav_icon_colour', t('Navigation bar icon color '), $arr['nav_icon_colour']),	
-			'$nav_active_icon_colour' => array('ussrbasictwopanel_nav_active_icon_colour', t('Navigation bar active icon color '), $arr['nav_active_icon_colour']),
-			'$link_colour' => array('ussrbasictwopanel_link_colour', t('Link color'), $arr['link_colour'], '', $link_colours),
-			'$banner_colour' => array('ussrbasictwopanel_banner_colour', t('Set font-color for banner'), $arr['banner_colour']),
-			'$bgcolour' => array('ussrbasictwopanel_background_colour', t('Set the background color'), $arr['bgcolour']),
-			'$background_image' => array('ussrbasictwopanel_background_image', t('Set the background image'), $arr['background_image']),	
-			'$item_colour' => array('ussrbasictwopanel_item_colour', t('Set the background color of items'), $arr['item_colour']),
-			'$comment_item_colour' => array('ussrbasictwopanel_comment_item_colour', t('Set the background color of comments'), $arr['comment_item_colour']),
-			'$font_size' => array('ussrbasictwopanel_font_size', t('Set font-size for the entire application'), $arr['font_size'], t('Examples: 1rem, 100%, 16px')),
-			'$font_colour' => array('ussrbasictwopanel_font_colour', t('Set font-color for posts and comments'), $arr['font_colour']),
-			'$radius' => array('ussrbasictwopanel_radius', t('Set radius of corners'), $arr['radius'], t('Example: 4px')),
-			'$shadow' => array('ussrbasictwopanel_shadow', t('Set shadow depth of photos'), $arr['shadow']),
-			'$converse_width' => array('ussrbasictwopanel_converse_width',t('Set maximum width of content region in pixel'),$arr['converse_width'], t('Leave empty for default width')),
-			'$top_photo' => array('ussrbasictwopanel_top_photo', t('Set size of conversation author photo'), $arr['top_photo']),
-			'$reply_photo' => array('ussrbasictwopanel_reply_photo', t('Set size of followup author photos'), $arr['reply_photo']),
-			'$advanced_theming' => ['ussrbasictwopanel_advanced_theming', t('Show advanced settings'), $arr['advanced_theming'], '', [t('No'), t('Yes')]]
-			));
-
-		return $o;
-	}
-
-}
-
-
-
-
-
-