Merge https://github.com/friendica/friendica into pull

1 files changed, 775 insertions, 729 deletions

diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css
index 20f5c5898..9743800bf 100644
--- a/view/theme/dispy-dark/style.css
+++ b/view/theme/dispy-dark/style.css
@@ -51,20 +51,23 @@ body, button, input, select, textarea {
     background-color: #2e2f2e;
 }
 select {
-	border: 1px #555 dotted;
-	padding: 3px;
-	margin: 2px;
-	color: #eec;
-	background: #2e2f2e;
+    border: 1px #555 dotted;
+    padding: 3px;
+    margin: 3px;
+    color: #eec;
+    background: #2e2f2e;
 }
 option {
-	padding: 3px;
-	vertical-align: middle;
-	color: #eec;
-	background: #2e2f2e;
+    padding: 3px;
+    color: #eec;
+    background: #2e2f2e;
+}
+option[selected="selected"] {
+	color: #2e2f2e;
+	background: #eec;
 }
 ul, ol {
-	padding: 0;
+    padding: 0;
 }
 /* remember to define focus styles! */
 :focus {
@@ -134,7 +137,7 @@ a:hover img {
 }
 blockquote {
     background: #444;
-	color: #eec;
+    color: #eec;
     text-indent: 5px;
     padding: 5px;
     border: 1px #aaa solid;
@@ -158,36 +161,25 @@ a:hover {
 .fakelink:hover {
     color: #729fcf;
 }
-input[type=submit] {
-    background-color: #eee;
-	color: #2e302e;
-	font-weight: bold;
-    margin-top: 10px;
-    height: 22px;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-    border: 0;
-}
 .smalltext {
     font-size: 0.7em;
 }
 #panel {
-	position: absolute;
-	font-size: 0.8em;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	border: 1px solid #fff;
-	background-color: #2e302e;
-	color: #eeeeec;
-	padding: 1em;
+    position: absolute;
+    font-size: 0.8em;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    border: 1px solid #fff;
+    background-color: #2e302e;
+    color: #eeeeec;
+    padding: 1em;
 }
 .pager {
-	margin-top: 60px;
-	display: block;
-	clear: both;
-	text-align: center;
+    margin-top: 60px;
+    display: block;
+    clear: both;
+    text-align: center;
 }
 .pager span {
     padding: 4px;
@@ -204,25 +196,25 @@ input[type=submit] {
  */
 /* .tool .action */
 .action {
-	margin: 5px 0;
+    margin: 5px 0;
 }
 .tool {
-	margin: 5px 0;
-	list-style: none;
+    margin: 5px 0;
+    list-style: none;
 }
 #articlemain {
-	width: 100%;
-	height: 100%;
-	margin: 0 auto;
+    width: 100%;
+    height: 100%;
+    margin: 0 auto;
 }
 
 
 /**
- * 	login
+ * login
  */
 #asidemain .field {
-	overflow: hidden;
-	width: 200px;
+    overflow: hidden;
+    width: 200px;
 }
 #login-extra-links {
     overflow: auto !important;
@@ -237,34 +229,34 @@ input[type=submit] {
     float: none !important;
     height: 100% !important;
     position: relative !important;
-	width: 100% !important;
+    width: 100% !important;
 }
 #login_standard .field label {
-	width: 200px !important;
+    width: 200px !important;
 }
 #login_standard input, #login_standard input[type="text"] {
-	margin: 0 0 8px !important;
+    margin: 0 0 8px !important;
     width: 210px !important;
 }
 #login-submit-wrapper {
-	margin: 0 !important;
+    margin: 0 !important;
 }
 #login-submit-button {
     margin-left: 0px !important;
 }
 #asidemain #login_openid {
-	position: relative !important;
-	float: none !important;
-	margin-left: 0px !important;
-	height: auto !important;
-	width: 200px !important;
+    position: relative !important;
+    float: none !important;
+    margin-left: 0px !important;
+    height: auto !important;
+    width: 200px !important;
 }
 #login_openid #id_openid_url {
-	width: 180px !important;
-	overflow: hidden !important;
+    width: 180px !important;
+    overflow: hidden !important;
 }
 #login_openid label {
-	width: 180px !important;
+    width: 180px !important;
 }
 
 
@@ -272,77 +264,77 @@ input[type=submit] {
  * nav
  */
 nav {
-	height: 60px;
-	background-color: #1d1f1d;
-	color: #eeeeec;
-	position: relative;
-	padding: 20px 20px 10px 95px;
+    height: 60px;
+    background-color: #1d1f1d;
+    color: #eeeeec;
+    position: relative;
+    padding: 20px 20px 10px 95px;
 }
 nav a {
-	text-decoration: none;
-	color: #eeeeec;
-	border: 0px;
+    text-decoration: none;
+    color: #eeeeec;
+    border: 0px;
 }
 nav a:hover {
-	text-decoration: none;
-	color: #eeeeec;
+    text-decoration: none;
+    color: #eeeeec;
     border: 0px;
 }
 nav #banner {
-	display: block;
-	position: absolute;
-	left: 51px;
-	top: 25px;
+    display: block;
+    position: absolute;
+    left: 51px;
+    top: 25px;
 }
 nav #banner #logo-text a {
-	font-size: 40px;
-	font-weight: bold;
-	margin-left: 3px;
+    font-size: 40px;
+    font-weight: bold;
+    margin-left: 3px;
 }
 ul#user-menu-popup {
-	display: none;
-	position: absolute;
-	background-color: #555753;
-	width: 100%;
+    display: none;
+    position: absolute;
+    background-color: #555753;
+    width: 100%;
     padding: 10px 0px;
     margin: 0px;
-	top: 20px;
-	left: 0;
-	-webkit-border-radius: 0 0 5px 5px;
-	-moz-border-radius: 0 0 5px 5px;
-	border-radius: 0 0 5px 5px;
-	box-shadow: 5px 10px 10px 0 #111;
-	z-index: 10000;
+    top: 20px;
+    left: 0;
+    -webkit-border-radius: 0 0 5px 5px;
+    -moz-border-radius: 0 0 5px 5px;
+    border-radius: 0 0 5px 5px;
+    box-shadow: 5px 10px 10px 0 #111;
+    z-index: 10000;
 }
 ul#user-menu-popup li {
-	display: block;
+    display: block;
 }
 ul#user-menu-popup li a {
-	display: block;
-	padding: 5px;
+    display: block;
+    padding: 5px;
 }
 ul#user-menu-popup li a:hover {
-	color: #2e302e;
-	background-color: #eeeeec;
+    color: #2e302e;
+    background-color: #eeeeec;
 }
 ul#user-menu-popup li a.nav-sep {
-	border-top: 1px solid #eeeeec;
+    border-top: 1px solid #eeeeec;
 }
 nav .nav-link {
-	float: right;
-	display: block;
-	width: 22px;
-	height: 22px;
-	overflow: hidden;
-	margin: 0px 5px 5px;
-	text-indent: 50px;
-	background: transparent url(icons.png) 0 0 no-repeat;
+    float: right;
+    display: block;
+    width: 22px;
+    height: 22px;
+    overflow: hidden;
+    margin: 0px 5px 5px;
+    text-indent: 50px;
+    background: transparent url(icons.png) 0 0 no-repeat;
 }
 #nav-apps-link {
-	background-position: 0 -66px;
+    background-position: 0 -66px;
 }
 #nav-apps-link:hover {
-	background-position: -22px -66px;
+    background-position: -22px -66px;
 }
 #nav-community-link {
     background-position: 0 -22px;
@@ -357,16 +349,16 @@ nav .nav-link {
     background-position: -22px -22px;
 }
 #nav-directory-link {
-	background-position: -44px -154px;
+    background-position: -44px -154px;
 }
 #nav-directory-link:hover {
-	background-position: -66px -154px;
+    background-position: -66px -154px;
 }
 #nav-help-link {
-	background-position: 0 -110px;
+    background-position: 0 -110px;
 }
 #nav-help-link:hover {
-	background-position: -22px -110px;
+    background-position: -22px -110px;
 }
 #nav-home-link {
     background-position: -44px -132px;
@@ -375,22 +367,22 @@ nav .nav-link {
     background-position: -66px -132px;
 }
 #nav-intro-link {
-	background-position: 0px -190px;
+    background-position: 0px -190px;
 }
 #nav-intro-link:hover {
-	background-position: -44px -190px;
+    background-position: -44px -190px;
 }
 #nav-login-link {
-	background-position: 0 -88px;
+    background-position: 0 -88px;
 }
 #nav-login-link:hover {
-	background-position: -22px -88px;
+    background-position: -22px -88px;
 }
 #nav-logout-link {
-	background-position: 0 -88px;
+    background-position: 0 -88px;
 }
 #nav-logout-link:hover {
-	background-position: -22px -88px;
+    background-position: -22px -88px;
 }
 #nav-messages-link {
     background-position: -44px -88px;
@@ -411,10 +403,10 @@ nav .nav-link {
     background-position: -22px -177px;
 }
 #nav-search-link {
-	background-position: 0 -44px;
+    background-position: 0 -44px;
 }
 #nav-search-link:hover {
-	background-position: -22px -44px;
+    background-position: -22px -44px;
 }
 #profile-link,
 #profile-title, 
@@ -477,18 +469,19 @@ div.jGrowl div.info {
     color: black;
     text-decoration: underline;
 }
-nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-linkmenu.selected .icon.s22.notify {
-  background-image: url("../../../images/icons/22/notify_on.png");
+nav #nav-notifications-linkmenu.on .icon.s22.notify,
+nav #nav-notifications-linkmenu.selected .icon.s22.notify {
+    background-image: url("../../../images/icons/22/notify_on.png");
 }
 .show {
     display: block;
 }
 #notifications {
-	height: 20px;
-	width: 170px;
-	position: absolute;
-	top: -19px;
-	left: 7px;
+    height: 20px;
+    width: 170px;
+    position: absolute;
+    top: -19px;
+    left: 7px;
 }
 #nav-floater {
     position: fixed;
@@ -496,132 +489,133 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     right: 1%;
     padding: 5px;
     background: #1d1f1d;
-	color: transparent;
+    color: transparent;
     border-radius: 5px;
     z-index: 100;
-	width: 300px;
-	height: 60px;
+    width: 300px;
+    height: 60px;
 }
 #nav-buttons {
     clear: both;
-	list-style: none;
-	padding: 0px;
-	margin: 0 7px 0 0;
-	height: 25px;
+    list-style: none;
+    padding: 0px;
+    margin: 0 7px 0 0;
+    height: 25px;
 }
 #nav-buttons li {
-	padding: 0;
+    padding: 0;
 }
 .floaterflip {
-	display: block;
+    display: block;
     position: fixed;
     z-index: 110;
     top: 56px;
     right: 19px;
-	width: 22px;
-	height: 22px;
-	overflow: hidden;
-	margin: 0px;
-	background: transparent url(icons.png) -190px -60px no-repeat;
+    width: 22px;
+    height: 22px;
+    overflow: hidden;
+    margin: 0px;
+    background: transparent url(icons.png) -190px -60px no-repeat;
 }
 .search-box {
-	display: inline-block;
-	margin: 5px;
-	position: fixed;
-	right: 0px;
-	bottom: 0px;
-	z-index: 100;
-	background: #1d1f1d;
-	border-radius: 5px;
+    display: inline-block;
+    margin: 5px;
+    position: fixed;
+    right: 0px;
+    bottom: 0px;
+    z-index: 100;
+    background: #1d1f1d;
+    border-radius: 5px;
 }
 #search-text {
-	border: 1px #eec solid;
-	background: #2e2f2e;
-	color: #eec;
+    border: 1px #eec solid;
+    background: #2e2f2e;
+    color: #eec;
 }
 .search-box #search-text {
-	margin: 8px;
-	width: 10em;
-	color: #eec;
+    margin: 8px;
+    width: 10em;
+    height: 14px;
+    color: #eec;
 }
 #scrollup {
-	position: fixed;
-	right: 5px;
-	bottom: 40px;
-	z-index: 100;
+    position: fixed;
+    right: 5px;
+    bottom: 40px;
+    z-index: 100;
 }
 #scrollup a:hover {
-	text-decoration: none;
-	border: 0;
+    text-decoration: none;
+    border: 0;
 }
 #user-menu {
-	box-shadow: 5px 0 10px 0 #111;
+    box-shadow: 5px 0 10px 0 #111;
     display: block;	
     width: 75%;
     margin: 3px 0 0 0;
     position: relative;
-	background-color: #555753;
+    background-color: #555753;
     -webkit-border-radius: 5px;
     -moz-border-radius: 5px;
     border-radius: 5px;
     background: #555753 url("menu-user-pin.jpg") 98% center no-repeat;
     clear: both;
-	top: 4px;
-	left: 10px;
-	padding: 2px;
+    top: 4px;
+    left: 10px;
+    padding: 2px;
 }
 #user-menu > a {
-	vertical-align: top;
+    vertical-align: top;
 }
 #user-menu-label {
-   	font-size: 12px;
+    font-size: 12px;
     padding: 3px 20px 9px 5px;
     height: 10px;
 }
 .nav-ajax-update, .nav-ajax-left {
-	width: 30px;
-	height: 19px;
-	background: transparent url(notifications.png) 0 0 no-repeat;
-	color: #222;
-	font-weight: bold;
-	font-size: 0.8em;
-	padding-top: 0.2em;
-	text-align: center;
-	float: left;
-	margin: 0 -1px 0 3px;
-	display: block;
-	visibility: hidden;
+    width: 30px;
+    height: 19px;
+    background: transparent url(notifications.png) 0 0 no-repeat;
+    color: #222;
+    font-weight: bold;
+    font-size: 0.8em;
+    padding-top: 0.2em;
+    text-align: center;
+    float: left;
+    margin: 0 -1px 0 3px;
+    display: block;
+    visibility: hidden;
 }
 .nav-ajax-update.show, .nav-ajax-left.show {
     visibility: visible;
 }
 #net-update {
-	background-position: 0px 0px;
+    background-position: 0px 0px;
 }
 #mail-update {
-	background-position: -30px 0;
+    background-position: -30px 0;
 }
 #notify-update {
-	background-position: -60px 0px;
+    background-position: -60px 0px;
 }
 #home-update {
-	background-position: -90px 0px;
+    background-position: -90px 0px;
 }
 #intro-update {
-	background-position: -120px 0px;
+    background-position: -120px 0px;
 }
 #lang-select-icon {
-	cursor: pointer;
-	position: fixed;
-	left: 28px;
-	bottom: 6px;
-	z-index: 10;
+    cursor: pointer;
+    position: fixed;
+    left: 28px;
+    bottom: 6px;
+    z-index: 10;
 }
 #language-selector {
     position: fixed;
     bottom: 2px;
     left: 52px;
-	z-index: 10;
+    z-index: 10;
 }
 .menu-popup {
     position: absolute;
@@ -683,133 +677,135 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 }
 
 
-/** sysmsg **/
+/**
+ * sysmsg
+ */
 #sysmsg_info {
-	position: fixed;
-	bottom: 0;
-	-moz-box-shadow: 3px 3px 3px 10px 0 #000;
-	-webkit-box-shadow: 3px 3px 10px 0 #000;
-	box-shadow: 3px 3px 10px 0 #000;
+    position: fixed;
+    bottom: 0;
+    -moz-box-shadow: 3px 3px 3px 10px 0 #000;
+    -webkit-box-shadow: 3px 3px 10px 0 #000;
+    box-shadow: 3px 3px 10px 0 #000;
     padding: 10px;
-	background-color: #fcaf3e;
-	border:2px solid #f8911b;
-	border-bottom: 0;
-	padding-bottom: 50px;
-	z-index: 1000;
+    background-color: #fcaf3e;
+    border:2px solid #f8911b;
+    border-bottom: 0;
+    padding-bottom: 50px;
+    z-index: 1000;
 }
 #sysmsg {
-	position: fixed;
-	bottom: 0;
-	-moz-box-shadow: 3px 3px 10px 0 #000;
-	-webkit-box-shadow: 3px 3px 10px 0 #000;
-	box-shadow: 3px 3px 10px 0 #000;
+    position: fixed;
+    bottom: 0;
+    -moz-box-shadow: 3px 3px 10px 0 #000;
+    -webkit-box-shadow: 3px 3px 10px 0 #000;
+    box-shadow: 3px 3px 10px 0 #000;
     padding: 10px;
-	background-color: #fcaf3e;
-	border: 2px solid #f8911b;
-	border-bottom: 0;
-	padding-bottom: 50px;
-	z-index: 1000;
+    background-color: #fcaf3e;
+    border: 2px solid #f8911b;
+    border-bottom: 0;
+    padding-bottom: 50px;
+    z-index: 1000;
 }
 #sysmsg_info br,
 #sysmsg br {
-	display: block;
-	margin: 2px 0px;
-	border-top: 1px solid #ccccce;
+    display: block;
+    margin: 2px 0px;
+    border-top: 1px solid #ccccce;
 }
 
 
 /**
-* aside
-**/
+ * aside
+ */
 #asidemain {
-	float: left;
+    float: left;
     font-size: smaller;
     margin: 20px 0 20px 35px;
     width: 25%;
-	display: inline;
+    display: inline;
 }
 /* for now, disappear these */
 #asideright, #asideleft {
-	display: none;
+    display: none;
 }
 .vcard .fn {
-	font-size: 1.7em;
-	font-weight: bold;
-	border-bottom: 1px solid #729fcf;
-	padding-bottom: 3px;
+    font-size: 1.7em;
+    font-weight: bold;
+    border-bottom: 1px solid #729fcf;
+    padding-bottom: 3px;
 }
 .vcard #profile-photo-wrapper {
-	margin: 20px;
+    margin: 20px;
 }
 /* http://css-tricks.com/snippets/css/css-box-shadow/
- * box-shadow:
- * 1. The horizontal offset of the shadow, positive means
- * the shadow will be on the right of the box, a negative
- * offset will put the shadow on the left of the box.
- * 2. The vertical offset of the shadow, a negative one
- * means the box-shadow will be above the box, a
- * positive one means the shadow will be below the box.
- * 3. The blur radius (optional), if set to 0 the shadow
- * will be sharp, the higher the number, the more blurred
- * it will be.
- * 4. The spread radius (optional), positive values increase
- * the size of the shadow, negative values decrease the size.
- * Default is 0 (the shadow is same size as blur).
- * 5. Colo[u]r
- */
+* box-shadow:
+* 1. The horizontal offset of the shadow, positive means
+* the shadow will be on the right of the box, a negative
+* offset will put the shadow on the left of the box.
+* 2. The vertical offset of the shadow, a negative one
+* means the box-shadow will be above the box, a
+* positive one means the shadow will be below the box.
+* 3. The blur radius (optional), if set to 0 the shadow
+* will be sharp, the higher the number, the more blurred
+* it will be.
+* 4. The spread radius (optional), positive values increase
+* the size of the shadow, negative values decrease the size.
+* Default is 0 (the shadow is same size as blur).
+* 5. Colo[u]r
+*/
 .vcard #profile-photo-wrapper img {
-	box-shadow: 3px 3px 10px 0 #000;
+    box-shadow: 3px 3px 10px 0 #000;
 }
 #asidemain h4 {
-	font-size: 1.2em;
+    font-size: 1.2em;
 }
 #asidemain #viewcontacts {
-	text-align: right;
+    text-align: right;
 }
 .aprofile dt {
-	background: #eec;
-	color: #2e2f2e;
-	font-weight: bold;
+    background: #eec;
+    color: #2e2f2e;
+    font-weight: bold;
     box-shadow: 1px 1px 5px 0 #000;
     margin: 15px 0 5px;
     padding-left: 5px;
 }
 #profile-extra-links ul {
-	margin-left: 0px;
+    margin-left: 0px;
     padding-left: 0px;
     list-style: none;
 }
 #dfrn-request-link {
-	background: #3465A4 url(connect.png) no-repeat 95% center;
-	border-radius: 5px 5px 5px 5px;
-	color: #eec;
-	display: block;
-	font-size: 1.2em;
-	padding: 0.2em 0.5em;
+    background: #3465A4 url(connect.png) no-repeat 95% center;
+    border-radius: 5px 5px 5px 5px;
+    color: #eec;
+    display: block;
+    font-size: 1.2em;
+    padding: 0.2em 0.5em;
 }
 #wallmessage-link {
-	/*background: #3465A4 url(connect.png) no-repeat 95% center;*/
-	/*border-radius: 5px 5px 5px 5px;*/
-	color: #eee;
-	display: block;
-	font-size: 1.2em;
-	padding: 0.2em 0.5em;
+    /*background: #3465A4 url(connect.png) no-repeat 95% center;*/
+    /*border-radius: 5px 5px 5px 5px;*/
+    color: #eee;
+    display: block;
+    font-size: 1.2em;
+    padding: 0.2em 0.5em;
 }
 #netsearch-box {
-	margin: 20px 0px 30px;
+    margin: 20px 0px 30px;
     width: 150px;
 }
 #netsearch-box #search-submit {
     margin: 5px 5px 0px 0px;
 }
 .ttright {
-	margin: 0px 0px 0px 0px;
+    margin: 0px 0px 0px 0px;
 }
 
 
 /**
-* contacts block
-*/
+ * contacts block
+ */
 .contact-block-div {
     width: 50px;
     height: 50px;
@@ -827,20 +823,20 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 
 /**
  * jot
- **/
+ */
 #jot {
-  /*width: 785px;*/
-  margin: 10px 0 20px 0px;
-  width: 100%;
+/*width: 785px;*/
+margin: 10px 0 20px 0px;
+width: 100%;
 }
 #jot #jot-tools {
-  margin: 0px;
-  padding: 0px;
-  height: 35px;
-  overflow: none;
-  width: 100%;
-  /*background-color: #0e232e;*/
-  /*border-bottom: 2px solid #9eabb0;*/
+margin: 0px;
+padding: 0px;
+height: 35px;
+overflow: none;
+width: 100%;
+/*background-color: #0e232e;*/
+/*border-bottom: 2px solid #9eabb0;*/
 }
 #jot #jot-tools span {
     float: left;
@@ -866,67 +862,67 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     margin-top: 10px;
 }
 #jot #jot-title {
-	border: 1px solid #ccc;
+    border: 1px solid #ccc;
     margin: 0 0 5px;
     height: 20px;
     width: 90%;
     font-weight: bold;
     border-radius: 5px;
-	vertical-align: middle;
+    vertical-align: middle;
 }
 #jot-category {
-	margin: 5px 0;
-	border-radius: 5px;
-	border: 1px #999 solid;
-	color: #aaa;
-	font-size: smaller;
+    margin: 5px 0;
+    border-radius: 5px;
+    border: 1px #999 solid;
+    color: #aaa;
+    font-size: smaller;
 }
 #jot-category:focus {
-	color: #eee;
+    color: #eee;
 }
 #jot #character-counter {
-	width: 6%;
-	float: right;
-	text-align: right;
-	height: 15px;
-	line-height: 20px;
-	padding: 2px 20px 5px 0;
+    width: 6%;
+    float: right;
+    text-align: right;
+    height: 15px;
+    line-height: 20px;
+    padding: 2px 20px 5px 0;
 }
 #profile-jot-text_parent {
-	/*border-radius: 10px;*/
-	box-shadow: 5px 0 10px 0 #111;
+    /*border-radius: 10px;*/
+    box-shadow: 5px 0 10px 0 #111;
 }
 #profile-jot-text_tbl {
-	margin-bottom: 10px;
-	/*border-radius: 10px;*/
-	background: #888;
+    margin-bottom: 10px;
+    /*border-radius: 10px;*/
+    background: #888;
 }
 #profile-jot-text_ifr {
-	width:99.900002% !important;
+    width:99.900002% !important;
 }
 #profile-jot-text_toolbargroup {
-	background: #888;
+    background: #888;
 }
 .mceCenter table tr {
-	background: #888;
+    background: #888;
 }
 [id$="jot-text_ifr"] {
-	width: 99.900002% !important;
-	color: #2e2f2e;
-	background: #eec;
+    width: 99.900002% !important;
+    color: #2e2f2e;
+    background: #eec;
 }
 [id$="jot-text_ifr"] .mceContentBody {
-	color: #2e2f2e;
-	background: #eec;
+    color: #2e2f2e;
+    background: #eec;
 }
 .mceFirst tr {
-	background: #888;
+    background: #888;
 }
 .mceFirst td {
-	/*border-radius: 10px 10px 0px 0px;*/
+    /*border-radius: 10px 10px 0px 0px;*/
 }
 .mceLast td {
-	/*border-radius: 0 0 10px 10px;*/
+    /*border-radius: 0 0 10px 10px;*/
 }
 #profile-attach-wrapper,
 #profile-audio-wrapper,
@@ -937,58 +933,58 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 #profile-upload-wrapper,
 #profile-video-wrapper {
     float: left;
-	margin: 0 20px 0 0;
+    margin: 0 20px 0 0;
 }
 #profile-rotator-wrapper {
-	float: right; 
+    float: right; 
 }
 #profile-jot-tools-end,
 #profile-jot-banner-end {
-	clear: both;
+    clear: both;
 }
 #profile-jot-email-wrapper {
-	margin:10px 10% 0;
-	border:1px solid #555753;
-	border-bottom:0;
+    margin:10px 10% 0;
+    border:1px solid #555753;
+    border-bottom:0;
 }
 #profile-jot-email-label {
-	background-color:#555753;
-	color:#ccccce;
-	padding:5px;
+    background-color:#555753;
+    color:#ccccce;
+    padding:5px;
 }
 #profile-jot-email {
-	width:90%;
-	margin:5px;
+    width:90%;
+    margin:5px;
 }
 #profile-jot-networks {
-	margin: 0 10%;
-	border: 1px solid #555753;
-	border-top: 0;
-	border-bottom: 0;
-	padding: 5px;
+    margin: 0 10%;
+    border: 1px solid #555753;
+    border-top: 0;
+    border-bottom: 0;
+    padding: 5px;
 }
 #profile-jot-net {
-	margin: 5px 0;
+    margin: 5px 0;
 }
 #jot-preview-link {
     margin: 0 0 0 10px;
     border: 0;
     text-decoration: none;
-	float: right;
+    float: right;
 }
 .icon-text-preview {
-	margin: 0 0 -18px 0;
-	display: block;
+    margin: 0 0 -18px 0;
+    display: block;
     width: 20px;
     height: 20px;
     background: url(icons.png) no-repeat -128px -40px;
     border: 0;
     text-decoration: none;
-	float: right;
-	cursor: pointer;
+    float: right;
+    cursor: pointer;
 }
 #profile-jot-perms { 
-	float: right;
+    float: right;
     background-color: #555753;
     height: 22px;
     width: 20px;
@@ -1000,103 +996,108 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     margin: 0 10px 0 10px;
 }
 #profile-jot-plugin-wrapper {
-	width: 1px;
-	margin: 10px 0 0 0;
-	float: right;
+    width: 1px;
+    margin: 10px 0 0 0;
+    float: right;
 }
 #profile-jot-submit-wrapper {
-	float: right;
-	width: 100%;
-	list-style: none;
-	margin: 10px 0 0 0;
-	padding: 0;
+    float: right;
+    width: 100%;
+    list-style: none;
+    margin: 10px 0 0 0;
+    padding: 0;
 }
 #profile-jot-submit {
-	height: 22px;
-	background-color: #555753;
-	color: #eeeeec;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	border: 0;
-	margin: 0;
-	float: right;
+    height: auto;
+    background-color: #555753;
+    color: #eeeeec;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    border: 2px outset #222420;
+    margin: 0;
+    float: right;
+    text-shadow: 1px 1px #111;
+    width: auto;
+}
+#profile-jot-submit:active {
+    box-shadow: 0 0 0 0;
 }
 #jot-perms-icon {
-	height: 22px;
-	width: 20px;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	overflow: hidden;
-	border: 0;
+    height: 22px;
+    width: 20px;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    overflow: hidden;
+    border: 0;
 }
 #profile-jot-acl-wrapper {
-	margin: 0 10px;
-	border: 1px solid #555753;
-	border-top: 0;
-	display: block !important;
+    margin: 0 10px;
+    border: 1px solid #555753;
+    border-top: 0;
+    display: block !important;
 }
 #group_allow_wrapper,
 #group_deny_wrapper,
 #acl-permit-outer-wrapper {
-	width:47%;
-	float:left;
+    width:47%;
+    float:left;
 }
 #contact_allow_wrapper,
 #contact_deny_wrapper,
 #acl-deny-outer-wrapper {
-	width:47%;
-	float:right;
+    width:47%;
+    float:right;
 }
 #acl-permit-text {
-	background-color: #555753;
-	color: #ccccce;
-	padding: 5px;
-	float: left;
+    background-color: #555753;
+    color: #ccccce;
+    padding: 5px;
+    float: left;
 }
 #jot-public {
-	background-color: #555753;
-	color: #ff0000;
-	padding: 5px;
-	float: left;
+    background-color: #555753;
+    color: #ff0000;
+    padding: 5px;
+    float: left;
 }
 #acl-deny-text {
-	background-color: #555753;
-	color: #ccccce;
-	padding: 5px;
-	float: left;
+    background-color: #555753;
+    color: #ccccce;
+    padding: 5px;
+    float: left;
 }
 #acl-permit-text-end,
 #acl-deny-text-end {
-	clear: both;
+    clear: both;
 }
 #jot-title-desc {
-	color: #ccc;
+    color: #ccc;
 }
 #profile-jot-desc {
-	color: #ff2000;
-	margin: 5px 0;
+    color: #ff2000;
+    margin: 5px 0;
 }
 #jot-title-wrapper {
-	margin-bottom: 5px;
+    margin-bottom: 5px;
 }
 #jot-title-display {
-	font-weight: bold;
+    font-weight: bold;
 }
 .jothidden {
     display: none;
 }
 #jot-preview-content {
     background-color: #3e3f3e;
-	color: #eec;
+    color: #eec;
     border: 1px #eec solid;
     border-radius: 5px;
     padding: 3px 3px 6px 10px;
 }
 #jot-preview-content .wall-item-outside-wrapper {
-	border: 0;
-	border-radius: 0px;
+    border: 0;
+    border-radius: 0px;
 }
 
 
@@ -1106,13 +1107,15 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 #sectionmain {
     margin: 20px;
     font-size: 0.8em;
-	min-width: 475px;
-	width: 67%;
-	float: left;
-	display: inline;
+    min-width: 475px;
+    width: 67%;
+    float: left;
+    display: inline;
 }
 
-/** tabs **/
+/**
+ * tabs
+ */
 .tabs {
     list-style: none;
     margin: 10px 0;
@@ -1120,12 +1123,12 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 }
 .tabs li {
     display: inline;
-	font-size: smaller;
-	font-weight: bold;
+    font-size: smaller;
+    font-weight: bold;
 }
 .tab {
     border: 1px solid #729fcf;
-	padding: 4px;
+    padding: 4px;
 }
 .tab:hover, .tab.active:hover {
     background: #88a9d2;
@@ -1136,60 +1139,60 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     color: #2e2f2e;
 }
 .tab.active {
-	background: #88a9d2;
+    background: #88a9d2;
     color: #2e2f2e;
 }
 .tab.active a {
-	color: #2e2f2e;
+    color: #2e2f2e;
 }
 .tab a {
-	border: 0;
-	text-decoration: none;
+    border: 0;
+    text-decoration: none;
 }
 
 
 /**
- * 	items
+ * items
  */
 .wall-item-outside-wrapper {
-	border: 1px solid #aaa;
-	border-radius: 5px;
-	box-shadow: 5px 0 10px 0 #111;
+    border: 1px solid #aaa;
+    border-radius: 5px;
+    box-shadow: 5px 0 10px 0 #111;
 }
 .wall-item-outside-wrapper.comment {
-	margin-top: 5px;
+    margin-top: 5px;
 }
 .wall-item-outside-wrapper-end {
     clear: both;
 }
 .wall-item-content-wrapper {
     position: relative;
-	padding: 10px;
-	width: auto;
+    padding: 10px;
+    width: auto;
 }
 .wall-item-outside-wrapper .wall-item-comment-wrapper {
     /*margin-left: 90px;*/
 }
 .shiny {
     background: #2e3436;
-	border-radius: 5px;
+    border-radius: 5px;
 }
 .wall-outside-wrapper .shiny {
-	border-radius: 5px;
+    border-radius: 5px;
 }
 .heart {
-	color: red;
+    color: red;
 }
 .wall-item-content {
-	overflow-x: auto;
-	margin: 0px 15px 0px 5px;
+    overflow-x: auto;
+    margin: 0px 15px 0px 5px;
 }
 /* removing it from here, vs. putting it in .wall-item-content
- * might break things for people. we shall see ;) */
+* might break things for people. we shall see ;) */
 [id^="tread-wrapper"], [class^="tread-wrapper"] {
     margin: 15px 0 0 0;
     padding: 0px;
-	/*overflow-x: auto;*/
+    /*overflow-x: auto;*/
 }
 .wall-item-photo-menu {
     display: none;
@@ -1223,7 +1226,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     border-radius: 5px;
 }
 [class^="wall-item-tools"] > *, [class^="wall-item-tools"] > * > * {
-	/*margin: 0 0 5px 0;*/
+    /*margin: 0 0 5px 0;*/
 }
 .wall-item-tools {
     float: right;
@@ -1259,41 +1262,41 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     width: 25px;
 }
 .wall-item-title {
-	font-size: 1.2em;
-	font-weight: bold;
+    font-size: 1.2em;
+    font-weight: bold;
     margin-bottom: 1em;
 }
 .wall-item-body {
-	margin: 20px 20px 10px 0px;
+    margin: 20px 20px 10px 0px;
     text-align: left;
-	overflow-x: auto;
+    overflow-x: auto;
 }
 .wall-item-lock-wrapper {
-	float: right;
+    float: right;
     height: 22px;
     margin: 0 -5px 0 0;
     width: 22px;
-	opacity: 1;
+    opacity: 1;
 }
 .wall-item-dislike,
 .wall-item-like {
-	clear: left;
-	font-size: 0.8em;
-	color: #878883;
-	margin: 5px 0 5px 120px;
+    clear: left;
+    font-size: 0.8em;
+    color: #878883;
+    margin: 5px 0 5px 120px;
 }
 .wall-item-author, .wall-item-actions-author {
-	clear: left;
-	font-size: 0.8em;
-	color: #878883;
-	margin: 20px 20px 0 110px;
+    clear: left;
+    font-size: 0.8em;
+    color: #878883;
+    margin: 20px 20px 0 110px;
 }
 .wall-item-ago {
-	display: inline;
-	padding-left: 10px;
+    display: inline;
+    padding-left: 10px;
 }
 .wall-item-wrapper-end {
-	clear:both;
+    clear:both;
 }
 .wall-item-location {
     margin-top: 15px;
@@ -1342,17 +1345,17 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     z-index: 10002;
 }
 .wall-item-photo-menu {
-	min-width: 92px;
-	border: 2px solid #FFFFFF;
-	border-top: 0px;
-	background: #555753;
-	position: absolute;
-	left: -2px; top: 101px;
-	display: none;
-	z-index: 10003;
-	-webkit-border-radius: 0px 5px 5px 5px;
-	-moz-border-radius: 0px 5px 5px 5px;
-	border-radius: 0px 5px 5px 5px;
+    min-width: 92px;
+    border: 2px solid #FFFFFF;
+    border-top: 0px;
+    background: #555753;
+    position: absolute;
+    left: -2px; top: 101px;
+    display: none;
+    z-index: 10003;
+    -webkit-border-radius: 0px 5px 5px 5px;
+    -moz-border-radius: 0px 5px 5px 5px;
+    border-radius: 0px 5px 5px 5px;
 }
 .wall-item-photo-menu ul {
     margin:0px;
@@ -1374,27 +1377,27 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     width: 100%;
 }
 #connect-services-header {
-	margin: 5px 0 0 0;
+    margin: 5px 0 0 0;
 }
 #connect-services {
-	margin: 5px 0 0 0;
+    margin: 5px 0 0 0;
 }
 #extra-help-header {
-	margin: 5px 0 0 0;
+    margin: 5px 0 0 0;
 }
 #extra-help {
-	margin: 5px 0 0 0;
+    margin: 5px 0 0 0;
 }
 #postit-header {
-	margin: 5px 0 0 0;
+    margin: 5px 0 0 0;
 }
 #postit {
-	margin: 5px 0 0 0;
+    margin: 5px 0 0 0;
 }
 
 
 /**
- * 	comment
+ * comment
  */
 .ccollapse-wrapper {
     font-size: 0.9em;
@@ -1413,7 +1416,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     height: 40px;
 }
 .wall-item-outside-wrapper.comment .wall-item-photo-menu-button {
-	width: 50px;
+    width: 50px;
     top: 45px;
     background-position: 35px center;
 }
@@ -1439,12 +1442,12 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 }
 .comment-wwedit-wrapper img,
 .comment-edit-wrapper img {
-	width: 20px;
-	height: 20px;
+    width: 20px;
+    height: 20px;
 }
 .comment-edit-photo-link, .comment-edit-photo {
-	float: left;
-	margin-left: 10px;
+    float: left;
+    margin-left: 10px;
 }
 .my-comment-photo {
     width: 40px;
@@ -1456,32 +1459,32 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     width: 84.5%;
 }
 .comment-edit-text-empty {
-	height: 20px;
-	border: 2px #c8bebe solid;
-	border-radius: 5px;
-	color: #c8bebe;
-	-webkit-transition: all 0.5s ease-in-out;
-	-moz-transition: all 0.5s ease-in-out;
-	-o-transition: all 0.5s ease-in-out;
-	-ms-transition: all 0.5s ease-in-out;
-	transition: all 0.5s ease-in-out;	
+    height: 20px;
+    border: 2px #c8bebe solid;
+    border-radius: 5px;
+    color: #c8bebe;
+    -webkit-transition: all 0.5s ease-in-out;
+    -moz-transition: all 0.5s ease-in-out;
+    -o-transition: all 0.5s ease-in-out;
+    -ms-transition: all 0.5s ease-in-out;
+    transition: all 0.5s ease-in-out;	
 }
 .comment-edit-text-empty:hover {
-	color: #999999;
+    color: #999999;
 }
 .comment-edit-text-full {
-	height: 10em;
+    height: 10em;
     border-radius: 5px;
-	-webkit-transition: all 0.5s ease-in-out;
-	-moz-transition: all 0.5s ease-in-out;
-	-o-transition: all 0.5s ease-in-out;
-	-ms-transition: all 0.5s ease-in-out;
-	transition: all 0.5s ease-in-out;	
+    -webkit-transition: all 0.5s ease-in-out;
+    -moz-transition: all 0.5s ease-in-out;
+    -o-transition: all 0.5s ease-in-out;
+    -ms-transition: all 0.5s ease-in-out;
+    transition: all 0.5s ease-in-out;	
 }
 .comment-edit-submit-wrapper {
-	width: 90%;
-	margin: 5px 5px 10px 50px;
-	text-align: right;
+    width: 90%;
+    margin: 5px 5px 10px 50px;
+    text-align: right;
 }
 .comment-edit-submit {
     height: 22px;
@@ -1496,22 +1499,22 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 
 /**
  * item text style
- **/
+ */
 .wall-item-body code {
-	display: block;
-	padding: 0 0 10px 5px;
-	border-color: #ccc;
-	border-style: solid;
-	border-width: 1px 1px 1px 10px;
-	background: #eee;
-	color: #2e2f2e;
-	width: 95%;
+    display: block;
+    padding: 0 0 10px 5px;
+    border-color: #ccc;
+    border-style: solid;
+    border-width: 1px 1px 1px 10px;
+    background: #eee;
+    color: #2e2f2e;
+    width: 95%;
 }
 
 
 /**
  * profile
- **/
+ */
 div[id$="text"] {
     font-weight: bold;
     border-bottom: 1px solid #ccc;
@@ -1530,10 +1533,10 @@ div[id$="wrapper"] br {
 
 /**
  * photos
- **/
+ */
 .photos {
-	height: auto;
-	overflow: auto;
+    height: auto;
+    overflow: auto;
 }
 #photo-top-links {
     margin-bottom: 30px;
@@ -1545,7 +1548,7 @@ div[id$="wrapper"] br {
     -webkit-box-shadow: 3px 3px 10px 0 #000;
     box-shadow: 3px 3px 10px 0 #000;
     background-color: #222;
-	color: #2e2f2e;
+    color: #2e2f2e;
     -webkit-border-radius: 5px;
     -moz-border-radius: 5px;
     border-radius: 5px;
@@ -1581,8 +1584,8 @@ div[id$="wrapper"] br {
     margin: 0 5px;
 }
 #photo-photo {
-	position: relative;
-	float:left;
+    position: relative;
+    float:left;
 }
 #photo-photo-end {
     clear: both;
@@ -1659,10 +1662,10 @@ div[id$="wrapper"] br {
     margin-bottom: 15px;
 }
 #photo-edit-caption {
-	width: 100%;
+    width: 100%;
 }
 #photo-edit-newtag {
-	width: 100%;
+    width: 100%;
 }
 #photo-like-div {
     margin-bottom: 25px;
@@ -1684,15 +1687,15 @@ div[id$="wrapper"] br {
 }
 
 /**
- * 	message
+ * message
  */
 .prvmail-text {
     width: 100%;
 }
 #prvmail-subject {
     width: 100%;
-	color: #2e2f2e;
-	background: #eec;
+    color: #2e2f2e;
+    background: #eec;
 }
 #prvmail-submit-wrapper {
     margin-top: 10px;
@@ -1716,7 +1719,7 @@ div[id$="wrapper"] br {
 }
 .mail-list-sender-name {
     display: inline;
-	font-size: 1.1em;
+    font-size: 1.1em;
 }
 .mail-list-date {
     display: inline;
@@ -1724,7 +1727,7 @@ div[id$="wrapper"] br {
     padding-left: 10px;
 }
 .mail-list-sender-name, .mail-list-date {
-	font-style: italic;
+    font-style: italic;
 }
 .mail-list-subject {
     font-size: 1.2em;
@@ -1734,7 +1737,7 @@ div[id$="wrapper"] br {
 }
 .mail-list-outside-wrapper-end {
     clear: both;
-	border-bottom: 1px #eec dotted;
+    border-bottom: 1px #eec dotted;
 }
 .mail-conv-sender {
     float: left;
@@ -1764,15 +1767,15 @@ div[id$="wrapper"] br {
 
 
 /**
- * 	contacts
+ * contacts
  */
 .view-contact-wrapper,
 .contact-entry-wrapper {
     float: left;
     margin: 0 5px 40px 0;
     width: 120px;
-	height: 120px;
-	padding: 3px;
+    height: 120px;
+    padding: 3px;
     position: relative;
 }
 .contact-direction-wrapper {
@@ -1787,7 +1790,7 @@ div[id$="wrapper"] br {
 
 }
 .contact-entry-photo {
-	margin-left: 20px;
+    margin-left: 20px;
 }
 .contact-entry-name {
     width: 120px;
@@ -1795,7 +1798,7 @@ div[id$="wrapper"] br {
     /*overflow: hidden;*/
 }
 .contact-entry-photo {
-	position: relative;
+    position: relative;
 }
 .contact-entry-edit-links .icon {
     border: 1px solid #babdb6;
@@ -1838,7 +1841,7 @@ div[id$="wrapper"] br {
     margin-left:5px;
 }
 #contact-edit-nav-wrapper .icon {
-	border: 1px solid #babdb6;
+    border: 1px solid #babdb6;
     -webkit-border-radius: 3px;
     -moz-border-radius: 3px;
     border-radius: 3px;	
@@ -1883,7 +1886,7 @@ div[id$="wrapper"] br {
     width: auto;
     border: 2px solid #444;
     background: #2e2f2e;
-	color: #eec;
+    color: #eec;
     position: absolute;
     left: 0px; top: 90px;
     display: none;
@@ -1906,7 +1909,7 @@ div[id$="wrapper"] br {
 
 
 /**
- * 	register, settings & profile forms
+ * register, settings & profile forms
  */
 .openid {
 
@@ -1923,7 +1926,7 @@ div[id$="wrapper"] br {
     -moz-border-radius: 5px;
     border-radius: 5px;
     padding: 5px;
-	color: #111;
+    color: #111;
 }
 #settings-default-perms {
     margin-bottom: 20px;
@@ -1932,7 +1935,15 @@ div[id$="wrapper"] br {
 #profile-edit-form div {
     clear: both;
 }
-
+.settings-block {
+    
+}
+.settings-block label {
+    clear: left;
+}
+.settings-block input {
+    margin: 10px 5px;
+}
 /*#register-form label,     */
 /*#profile-edit-form label {*/
 /*    width: 300px;         */
@@ -1946,23 +1957,23 @@ div[id$="wrapper"] br {
 /*    margin-bottom: 20px; */
 /*}                        */
 #profile-edit-marital-label span {
-	margin: -4px;
+    margin: -4px;
 }
 .settings-submit-wrapper,
 .profile-edit-submit-wrapper {
     margin: 30px 0px;
 }
 .profile-edit-side-div {
-	display: none;
+    display: none;
 }
 /*.profile-edit-side-div:hover {
-	display: block;
+    display: block;
 }
 .profile-edit-side-link {
-	margin: 3px 0px 0px 70px;
+    margin: 3px 0px 0px 70px;
 }*/
 #profiles-menu-trigger {
-	margin: 0px 0px 0px 25px;
+    margin: 0px 0px 0px 25px;
 }
 .profile-listing {
     float: left;
@@ -1971,16 +1982,16 @@ div[id$="wrapper"] br {
 .icon-profile-edit {
     background: url("icons.png") -150px 0px no-repeat;
     border: 0;
-	cursor: pointer;
+    cursor: pointer;
     display: block;
     float: right;
-	width: 20px;
+    width: 20px;
     height: 20px;
     margin: 0 0 -18px;
-	position: absolute;
+    position: absolute;
     text-decoration: none;
-	top: 113px;
-	right: 260px;
+    top: 113px;
+    right: 260px;
 }
 #profile-edit-links ul {
     margin: 20px 0;
@@ -1988,26 +1999,32 @@ div[id$="wrapper"] br {
     list-style: none;
 }
 .marital {
-	margin-top: 5px;
+    margin-top: 5px;
 }
 #register-sitename {
     display: inline;
     font-weight: bold;
 }
 #advanced-expire-popup {
-	background: #2e2f2e;
-	color: #eec;
+    background: #2e2f2e;
+    color: #eec;
 }
 #id_ssl_policy {
-	width: 374px;
+    width: 374px;
+}
+#theme-preview {
+
+}
+#theme-preview img {
+    margin: 10px 10px 10px 288px;
 }
 
 
 /**
- * 	contacts selector
+ * contacts selector
  */
 .group-delete-wrapper {
-	margin: -31px 50px 0 0;
+    margin: -31px 50px 0 0;
     float: right;
 }
 /*.group-delete-icon {
@@ -2130,70 +2147,70 @@ div[id$="wrapper"] br {
 
 /**
  * events
- **/
+ */
 .clear { clear: both; }
 .eventcal {
     float:left;
     font-size:20px;
 }
 .event {
-	background: #2e2f2e;
+    background: #2e2f2e;
 }
 .vevent {
     border:1px solid #ccc;
 }
 .vevent .event-description, .vevent .event-location {
-	margin-left: 10px;
-	margin-right: 10px;
+    margin-left: 10px;
+    margin-right: 10px;
 }
 .vevent .event-start {
-	margin-left: 10px;
-	margin-right: 10px;
+    margin-left: 10px;
+    margin-right: 10px;
 }
 #new-event-link {
-	margin-bottom: 10px;
+    margin-bottom: 10px;
 }
 .edit-event-link, .plink-event-link {
-	/*float: left;      */
-	/*margin-top: 4px;  */
-	/*margin-right: 4px;*/
-	/*margin-bottom: 15px;*/
+    /*float: left;      */
+    /*margin-top: 4px;  */
+    /*margin-right: 4px;*/
+    /*margin-bottom: 15px;*/
 }
 .event-description:before {
-	content: url('../../../images/calendar.png');
-	margin-right: 15px;
+    content: url('../../../images/calendar.png');
+    margin-right: 15px;
 }
 .event-start, .event-end {
-	margin-left: 10px;
-	width: 330px;
-	font-size: smaller;
+    margin-left: 10px;
+    width: 330px;
+    font-size: smaller;
 }
 .event-start .dtstart, .event-end .dtend {
-	float: right;
+    float: right;
 }
 .event-list-date {
-	margin-bottom: 10px;
+    margin-bottom: 10px;
 }
 .prevcal, .nextcal {
-	float: left;
-	margin-left: 32px;
-	margin-right: 32px;
-	margin-top: 64px;
+    float: left;
+    margin-left: 32px;
+    margin-right: 32px;
+    margin-top: 64px;
 }
 .event-calendar-end {
-	clear: both;
+    clear: both;
 }
 .calendar {
     font-family: monospace;
 }
 .today {
-	font-weight: bold;
-	color: #FF0000;
+    font-weight: bold;
+    color: #FF0000;
 } 
 #event-start-text, 
 #event-finish-text {
-	margin-top: 10px;
-	margin-bottom: 5px;
+    margin-top: 10px;
+    margin-bottom: 5px;
 }
 #event-nofinish-checkbox,
 #event-nofinish-text,
@@ -2203,69 +2220,69 @@ div[id$="wrapper"] br {
     float:left;
 }
 #event-datetime-break {
-	margin-bottom: 10px;
+    margin-bottom: 10px;
 }
 #event-nofinish-break,
 #event-adjust-break,
 #event-share-break {
-	clear: both;
+    clear: both;
 }
 #event-desc-text, 
 #event-location-text {
-	margin-top: 10px;
-	margin-bottom: 5px;
+    margin-top: 10px;
+    margin-bottom: 5px;
 }
 #event-submit {
-	margin-top: 10px;
+    margin-top: 10px;
 }
 .body-tag {
-	margin: 10px 0;
-	opacity: 0.5;
-	filter:alpha(opacity=50);
+    margin: 10px 0;
+    opacity: 0.5;
+    filter:alpha(opacity=50);
 }
 .body-tag:hover {
-	opacity: 1.0 !important;
-	filter:alpha(opacity=100) !important;
+    opacity: 1.0 !important;
+    filter:alpha(opacity=100) !important;
 }
 .filesavetags, .categorytags {
-	margin: 20px 0;
-	opacity: 0.5;
-	filter:alpha(opacity=50);
+    margin: 20px 0;
+    opacity: 0.5;
+    filter:alpha(opacity=50);
 }
 .filesavetags:hover, .categorytags:hover {
-	margin: 20px 0;
-	opacity: 1.0 !important;
-	filter:alpha(opacity=100) !important;
+    margin: 20px 0;
+    opacity: 1.0 !important;
+    filter:alpha(opacity=100) !important;
 }
 .item-select {
-	opacity: 0.1;
-	filter:alpha(opacity=10);
-	float: right;
-	margin-right: 5px;
+    opacity: 0.1;
+    filter:alpha(opacity=10);
+    float: right;
+    margin-right: 5px;
 }
 .item-select:hover, .checkeditem {
-	opacity: 1;
-	filter:alpha(opacity=100);
+    opacity: 1;
+    filter:alpha(opacity=100);
 }
 #item-delete-selected {
-	margin-top: 30px;
+    margin-top: 30px;
 }
 /* was tired of having no way of moving it around, so
- * here's a little 'hook' to do so */
+* here's a little 'hook' to do so */
 .delete-checked {
-	position: absolute;
-	left: 35px;
-	margin-top: 20px;
+    position: absolute;
+    left: 35px;
+    margin-top: 20px;
 }
 #item-delete-selected-end {
-	clear: both;
+    clear: both;
 }
 #item-delete-selected-icon, #item-delete-selected-desc {
-	float: left;
-	margin-right: 5px;
+    float: left;
+    margin-right: 5px;
 }
 #item-delete-selected-desc:hover {
-	text-decoration: underline;
+    text-decoration: underline;
 }
 .fc-state-highlight {
     background: #eec;
@@ -2274,15 +2291,15 @@ div[id$="wrapper"] br {
 
 
 /**
- * 	directory
+ * directory
  */
 .directory-item {
     float: left;
-	/*margin: 50px 50px 0px 0px;*/
-	margin: 0 5px 4px 0;
-	padding: 3px;
-	width: 180px;
-	height: 250px;
+    /*margin: 50px 50px 0px 0px;*/
+    margin: 0 5px 4px 0;
+    padding: 3px;
+    width: 180px;
+    height: 250px;
     position: relative;
 }
 
@@ -2295,12 +2312,12 @@ div[id$="wrapper"] br {
 }
 .group-selected, .nets-selected, .fileas-selected {
     padding: 3px;
-	color: #2e2f2e;
+    color: #2e2f2e;
     background: #88a9d2;
     font-weight: bold;
 }
 .group-selected:hover, .nets-selected:hover, .fileas-selected:hover {
-	color: #2e2f2e;
+    color: #2e2f2e;
 }
 .groupsideedit {
     margin-right: 10px;
@@ -2331,7 +2348,7 @@ div[id$="wrapper"] br {
     text-align: center;
 }
 #peoplefind-sidebar form {
-	margin-bottom: 10px;
+    margin-bottom: 10px;
 }
 #sidebar-new-group:hover {
     /*background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );*/
@@ -2346,14 +2363,14 @@ div[id$="wrapper"] br {
 #side-peoplefind-url {
     background-color: #2e2f2e;
     color: #eec;
-	border: 1px 999 solid;
-	margin-right: 3px;
-	width: 75%;
+    border: 1px 999 solid;
+    margin-right: 3px;
+    width: 75%;
 }
 #side-peoplefind-url:hover, #side-peoplefind-url:focus {
     background-color: #efefef;
     color: #222;
-	border: 1px 333 solid;
+    border: 1px 333 solid;
 }
 .nets-ul {
     list-style-type: none;
@@ -2379,7 +2396,7 @@ div[id$="wrapper"] br {
 
 
 /**
- * ADMIN
+ * admin
  */
 #pending-update {
     float:right;
@@ -2395,10 +2412,10 @@ div[id$="wrapper"] br {
     list-style-position: inside;
 }
 #adminpage {
-	color: #eec;
-	background: #2e2f2e;
-	margin: 5px;
-	padding: 10px;
+    color: #eec;
+    background: #2e2f2e;
+    margin: 5px;
+    padding: 10px;
 }
 #adminpage dl {
     clear:left;
@@ -2412,14 +2429,14 @@ div[id$="wrapper"] br {
     font-weight: bold;
 }
 #adminpage dd {
-	margin-left: 250px;
+    margin-left: 250px;
 }
 #adminpage h3 {
     border-bottom:1px solid #ccc;
 }
 
 #adminpage .submit {
-	clear:left;
+    clear:left;
 }
 #adminpage #pluginslist {
     margin: 0;
@@ -2434,8 +2451,8 @@ div[id$="wrapper"] br {
     clear: left;
 }
 #adminpage .toggleplugin {
-	float:left;
-	margin-right: 1em;
+    float:left;
+    margin-right: 1em;
 }
 #adminpage table {
     width: 100%;
@@ -2452,46 +2469,67 @@ div[id$="wrapper"] br {
     width: 16px; height: 16px;
 }
 #adminpage table tr:hover {
-	color: #2e2f2e;
+    color: #2e2f2e;
     background-color: #eec;
 }
 #adminpage .selectall {
     text-align: right;
 }
 #adminpage #users a {
-	color: #eec;
-	text-decoration: underline;
+    color: #eec;
+    text-decoration: underline;
 }
 #users .name {
-	color: #eec;
+    color: #eec;
 }
 
 
 /**
- * Form fields
+ * form fields
  */
 .field {
-	/*margin-bottom: 10px;*/
-	/*padding-bottom: 10px;*/
-	overflow: auto;
+    /*margin-bottom: 10px;*/
+    /*padding-bottom: 10px;*/
+    overflow: auto;
     width: 100%;
 }
 .field label, label {
-    float: left;
-    width: 275px;
-	display: block;
-	font-size: 1.077em;
-	margin: 0 10px 0.5em 0;
-	border: 1px #2e2f2e solid;
-	padding: 5px;
-	background: #eec;
-	vertical-align: middle;
-	color: #111;
+    width: 38%;
+    display: inline-block;
+    font-size: 1.077em;
+    margin: 0 10px 1em 0;
+    border: 1px #2e2f2e solid;
+    padding: 5px;
+    background: #eec;
+    color: #111;
+}
+input,
+input[type="text"],
+input[type="password"],
+input[type="search"] {
+    width: 250px;
+    height: 25px;
+    border: 1px #999 solid;
+}
+input[type="checkbox"], input[type="radio"] {
+    border: 1px #999 solid;
+    margin: 0 0 0 0;
 }
-.field input, input[type="text"] {
-	width: 250px;
-	height: 25px;
-	border: 1px #999 solid;
+input[type="submit"], input[type="button"] {
+    background-color: #eee;
+    border: 2px outset #aaa;
+    border-radius: 5px;
+    box-shadow: 1px 3px 4px 0 #111;
+    color: #2e302e;
+    cursor: pointer;
+    font-weight: bold;
+    width: auto;
+    text-shadow: 1px 1px #000;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+}
+input[type="submit"]:active, input[type="button"]:active {
+    box-shadow: 0 0 0 0;
 }
 .field textarea {
     width: 80%;
@@ -2514,12 +2552,12 @@ div[id$="wrapper"] br {
     text-decoration: none;
 }
 .field .onoff .on {
-	background: url("../../../images/onoff.jpg") no-repeat 42px 1px #999;
+    background: url("../../../images/onoff.jpg") no-repeat 42px 1px #999;
     color: #111;
     text-align: left;
 }
 .field .onoff .off {
-	background: url("../../../images/onoff.jpg") no-repeat 2px 1px #ccc;
+    background: url("../../../images/onoff.jpg") no-repeat 2px 1px #ccc;
     color: #333;
     text-align: right;
 }
@@ -2532,34 +2570,34 @@ div[id$="wrapper"] br {
 
 
 /*
- * UPDATE
+ * update
  */
 .popup { 	
-	width: 100%;
+    width: 100%;
     height: 100%;
-	top: 0px;
+    top: 0px;
     left: 0px;
-	position: absolute;
-	display: none;
+    position: absolute;
+    display: none;
 }
 .popup .background {
-	background-color: rgba(0,0,0,128);
-	opacity: 0.5;
-	width: 100%;
+    background-color: rgba(0,0,0,128);
+    opacity: 0.5;
+    width: 100%;
     height: 100%;
-	position: absolute;
-	top:0px;
+    position: absolute;
+    top:0px;
     left:0px;
 }
 .popup .panel {
-	top: 25%;
+    top: 25%;
     left: 25%;
     width: 50%;
     height: 50%;
-	padding: 1em;
-	position: absolute;
-	border: 4px solid #000000;
-	background-color: #FFFFFF;
+    padding: 1em;
+    position: absolute;
+    border: 4px solid #000000;
+    background-color: #FFFFFF;
 }
 #panel {
     z-index: 100;
@@ -2608,32 +2646,32 @@ div[id$="wrapper"] br {
  * OAuth
  */
 .oauthapp {
-	height: auto;
+    height: auto;
     overflow: auto;
-	border-bottom: 2px solid #cccccc;
-	padding-bottom: 1em;
-	margin-bottom: 1em;	
+    border-bottom: 2px solid #cccccc;
+    padding-bottom: 1em;
+    margin-bottom: 1em;	
 }
 .oauthapp img {
-	float: left;
-	width: 48px; height: 48px;
-	margin: 10px;
+    float: left;
+    width: 48px; height: 48px;
+    margin: 10px;
 }
 .oauthapp img.noicon {
-	background-image: url("../../../images/icons/48/plugin.png");
-	background-position: center center;
-	background-repeat: no-repeat;
+    background-image: url("../../../images/icons/48/plugin.png");
+    background-position: center center;
+    background-repeat: no-repeat;
 }
 .oauthapp a {
-	float: left;
+    float: left;
 }
 
 
 /**
- * ICONS
+ * icons
  */
 .iconspacer {
-	display: block;
+    display: block;
     width: 16px;
     height: 16px;
 }
@@ -2644,7 +2682,7 @@ div[id$="wrapper"] br {
     background: url(icons.png) no-repeat;
     border: 0;
     text-decoration: none;
-	border-radius: 5px;
+    border-radius: 5px;
 }
 .icon:hover {
     border: 0;
@@ -2653,15 +2691,15 @@ div[id$="wrapper"] br {
 .icon.drop,
 .icon.drophide, .icon.delete {
     float: left;
-	margin: 0 2px;
+    margin: 0 2px;
 }
 .icon.s22.delete {
-	display: block;
-	background-position: -110px 0;
+    display: block;
+    background-position: -110px 0;
 }
 .icon.s22.text {
-	padding: 10px 0px 0px 25px;
-	width: 200px;
+    padding: 10px 0px 0px 25px;
+    width: 200px;
 }
 .icon.text {
     text-indent: 0px;
@@ -2677,118 +2715,118 @@ div[id$="wrapper"] br {
     margin: 0px 5px;    
 }
 .article {
-	background-position: -50px 0;
+    background-position: -50px 0;
 }
 .audio {
-	background-position: -70px 0;
+    background-position: -70px 0;
 }
 .block {
-	background-position: -90px 0px;
+    background-position: -90px 0px;
 }
 .drop, .delete {
-	background-position: -110px 0;
+    background-position: -110px 0;
 }
 .drophide {
-	background-position: -130px 0;
+    background-position: -130px 0;
 }
 .edit {
-	background-position: -150px 0;
+    background-position: -150px 0;
 }
 .camera {
-	background-position: -170px 0;
+    background-position: -170px 0;
 }
 .dislike {
-	background-position: -190px 0;
+    background-position: -190px 0;
 }
 .file-as {
-	background-position: -230px -60px;
+    background-position: -230px -60px;
 }
 .like {
-	background-position: -211px 0;
+    background-position: -211px 0;
 }
 .link {
-	background-position: -230px 0;
+    background-position: -230px 0;
 }
 .globe, .location {
-	background-position: -50px -20px;
+    background-position: -50px -20px;
 }
 .noglobe, .nolocation {
-	background-position: -70px -20px;
+    background-position: -70px -20px;
 }
 .no {
-	background-position: -90px -20px;
+    background-position: -90px -20px;
 }
 .pause {
-	background-position: -110px -20px;
+    background-position: -110px -20px;
 }
 .play {
-	background-position: -130px -20px;
+    background-position: -130px -20px;
 }
 .pencil {
-	background-position: -151px -18px;
+    background-position: -151px -18px;
 }
 .small-pencil {
-	background-position: -170px -20px;
+    background-position: -170px -20px;
 }
 .recycle {
-	background-position: -190px -20px;
+    background-position: -190px -20px;
 }
 .remote-link {
-	background-position: -210px -20px;
+    background-position: -210px -20px;
 }
 .share {
-	background-position: -230px -20px;
+    background-position: -230px -20px;
 }
 .tools {
-	background-position: -50px -40px;
+    background-position: -50px -40px;
 }
 .lock {
-	background-position: -70px -40px;
+    background-position: -70px -40px;
 }
 .unlock {
-	background-position: -88px -40px;
+    background-position: -88px -40px;
 }
 .video {
-	background-position: -110px -40px;
+    background-position: -110px -40px;
 }
 .attach {
-	background-position: -190px -40px;
+    background-position: -190px -40px;
 }
 .language {
-	background-position: -210px -40px;
+    background-position: -210px -40px;
 }
 .starred {
-	background-position: -130px -60px;
+    background-position: -130px -60px;
 }
 .unstarred {
-	background-position: -150px -60px;
+    background-position: -150px -60px;
 }
 .tagged {
-	background-position: -170px -60px;
+    background-position: -170px -60px;
 }
 .on {
-	background-position: -50px  -60px;
+    background-position: -50px  -60px;
 }
 .off {
-	background-position: -70px  -60px;
+    background-position: -70px  -60px;
 }
 .prev {
-	background-position: -90px  -60px;
+    background-position: -90px  -60px;
 }
 .next {
-	background-position: -110px  -60px;
+    background-position: -110px  -60px;
 }
 .icon.dim {
-	opacity: 0.3;
-	filter: alpha(opacity=30);
+    opacity: 0.3;
+    filter: alpha(opacity=30);
 }
 #pause {
-	position: fixed;
-	bottom: 40px;
-	right: 30px;
+    position: fixed;
+    bottom: 40px;
+    right: 30px;
 }
 .border, .border:hover {
-	border: 1px solid #babdb6;
+    border: 1px solid #babdb6;
     -webkit-border-radius: 5px;
     -moz-border-radius: 5px;
     border-radius: 5px;	
@@ -2817,7 +2855,7 @@ div[id$="wrapper"] br {
 
 
 /**
- * 	footer
+ * footer
  */
 .cc-license {
     margin-top: 100px;
@@ -2825,7 +2863,7 @@ div[id$="wrapper"] br {
 }
 footer {
     display: block;
-	/*margin: 50px 20%;*/
+    /*margin: 50px 20%;*/
     clear: both;
 }
 #profile-jot-text {
@@ -2837,24 +2875,26 @@ footer {
 }
 
 
-/** acl **/
+/**
+ * acl
+ */
 #photo-edit-perms-select,
 #photos-upload-permissions-wrapper,
 #profile-jot-acl-wrapper {
     display: block !important;
-	background: #2e2f2e;
-	color: #eec;
+    background: #2e2f2e;
+    color: #eec;
 }
 #acl-wrapper {
     width: 660px;
-	margin: 0 auto;
+    margin: 0 auto;
 }
 #acl-search {
     float: right;
     background: #fff url("../../../images/search_18.png") no-repeat right center;
     padding-right: 20px;
-	margin: 6px;
-	color: #111;
+    margin: 6px;
+    color: #111;
 }
 #acl-showall {
     float: left;
@@ -2867,7 +2907,7 @@ footer {
     -moz-border-radius: 5px;
     border-radius: 5px;
     color: #999;
-	margin: 5px 0;
+    margin: 5px 0;
 }
 #acl-showall.selected {
     color: #000;
@@ -2883,7 +2923,7 @@ footer {
 /*#acl-list-content {
 }*/
 .acl-list-item {
-	border: 1px solid #eec;
+    border: 1px solid #eec;
     display: block;
     float: left;
     height: 110px;
@@ -2907,29 +2947,29 @@ footer {
     -webkit-border-radius: 2px;
     -moz-border-radius: 2px;
     border-radius: 2px;
-	clear: both;
+    clear: both;
     font-size: 10px;
     display: block;
     width: 55px;
     height: 20px;
     color: #2e2f2e;
     margin: 5px auto 0;
-	padding: 0 3px;
-	text-align: center;
-	vertical-align: middle;
+    padding: 0 3px;
+    text-align: center;
+    vertical-align: middle;
 }
 #acl-wrapper a:hover {
     text-decoration: none;
     color: #2e2f2e;
-	border: 0;
+    border: 0;
 }
 .acl-button-show {
     background-image: url('../../../images/show_off.png');
-	margin: 0 auto;
+    margin: 0 auto;
 }
 .acl-button-hide {
     background-image: url('../../../images/hide_off.png');
-	margin: 0 auto;
+    margin: 0 auto;
 }
 .acl-button-show.selected {
     color: #2e2f2e;
@@ -2952,25 +2992,25 @@ footer {
 
 /* autocomplete popup */
 .acpopup {
-	max-height: 175px;
+    max-height: 175px;
     max-width: 42%;
-	background-color: #555753;
-	color: #fff;
-	overflow: auto;
-	z-index: 100000;
-	border: 1px solid #cccccc;
+    background-color: #555753;
+    color: #fff;
+    overflow: auto;
+    z-index: 100000;
+    border: 1px solid #cccccc;
 }
 .acpopupitem {
-	background-color: #555753;
+    background-color: #555753;
     padding: 4px;
-	clear: left;
+    clear: left;
 }
 .acpopupitem img {
-	float: left;
-	margin-right: 4px;
+    float: left;
+    margin-right: 4px;
 }
 .acpopupitem.selected {
-	color: #2e302e;
+    color: #2e302e;
     background-color: #eeeeec;
 }
 .qcomment-wrapper {
@@ -2978,12 +3018,12 @@ footer {
     margin: 5px 5px 5px 81%;
 }
 .qcomment {
-	opacity: 0.5;
-	filter:alpha(opacity=50);
+    opacity: 0.5;
+    filter:alpha(opacity=50);
 }
 .qcomment:hover {
-	opacity: 1.0;
-	filter:alpha(opacity=100);
+    opacity: 1.0;
+    filter:alpha(opacity=100);
 }
 #network-star-link {
     margin-top: 10px;
@@ -2996,32 +3036,38 @@ footer {
     display: inline-block;
 }
 #fileas-sidebar {
-	
+    
 }
 .fileas-ul {
-	padding: 0;
+    padding: 0;
 }
 
 
 
 /*
- * ADDONS THEMING
+ * addons theming
  */
 
 #sidebar-page-list {
-	
+    
 }
 #sidebar-page-list ul {
-	padding: 0;
-	margin: 5px 0;
+    padding: 0;
+    margin: 5px 0;
 }
 #sidebar-page-list li {
-	list-style: none;
+    list-style: none;
+}
+#jappix_mini {
+    margin-left: 130px;
+    position: fixed;
+    bottom: 0;
+    right: 175px !important; /* override the jappix css */
+    z-index: 999;
 }
-
 
 @media handheld {
-	body {
-		font-size: 15pt;
-	}
+    body {
+        font-size: 15pt;
+    }
 }