Merge branch 'master' of git://github.com/friendica/friendica

view/admin_summary.tpl

@@ -1,6 +1,10 @@
 <div id='adminpage'>
 	<h1>$title - $page</h1>
 
+	<dl>
+		<dt>$queues.label</dt>
+		<dd>$queues.deliverq - $queues.queue</dd>
+	</dl>
 	<dl>
 		<dt>$pending.0</dt>
 		<dd>$pending.1</dt>

view/de/friend_complete_eml.tpl

@@ -4,15 +4,15 @@ Hallo $[username],
 	Großartige Neuigkeiten... '$[fn]' auf '$[dfrn_url]' hat 
 deine Kontaktanfrage auf '$[sitename]' bestätigt.
 
-Ihr seit nun beidseitige Freunde und könnt Statusmitteilungen, Bilder und Emails
-ohne einschränkungen austauschen.
+Ihr seid nun beidseitige Freunde und könnt Statusmitteilungen, Bilder und Emails
+ohne Einschränkungen austauschen.
 
-Rufe deine 'Kontakte' Seite auf $[sitename] auf wenn du 
+Rufe deine 'Kontakte' Seite auf $[sitename] auf, wenn du 
 Änderungen an diesem Kontakt vornehmen willst. 
 
 $[siteurl]
 
-[Du könntest z.B. ein spezielles Profil anlegen, das Informationen enthällt
+[Du könntest z.B. ein spezielles Profil anlegen, das Informationen enthält,
 die nicht für die breite Öffentlichkeit sichtbar sein sollen und es für '$[fn]' zum Betrachten freigeben].
 
 Beste Grüße,

view/de/intro_complete_eml.tpl

@@ -1,19 +1,19 @@
 
 Hallo $[username],
 
-	'$[fn]' auf '$[dfrn_url]' wurde akzeptiert 
-Deine Verbindungsanfrage auf '$[sitename]'.
+	'$[fn]' auf '$[dfrn_url]' hat deine Verbindungsanfrage 
+auf '$[sitename]' akzeptiert.
 
-	'$[fn]' hat entschieden Dich als "Fan" zu akzeptieren, was ein 
-paar Formen der Kommunikation einschränkt - wie das schreiben von privaten Nachrichten und einige Profil
-Interaktionen. Wenn das ein Promi-Konto oder eine Forum-Seite ist, werden die Einstellungen
-automatisch angewendet.
+	'$[fn]' hat entschieden Dich als "Fan" zu akzeptieren, was zu einigen 
+Einschränkungen bei der Kommunikation führt - wie zB das Schreiben von privaten Nachrichten und einige Profil
+Interaktionen. Sollte dies ein Promi-Konto oder eine Forum-Seite sein, werden die Einstellungen
+automatisch angewandt.
 
 	'$[fn]' kann wählen, ob die Freundschaft in eine beidseitige oder alles erlaubende 
 Beziehung in der Zukunft erweitert wird. 
 
-	Du empfängst jetzt die öffentlichen Beiträge von '$[fn]', 
-welche auf der "Netzwerk" Seite erscheinen werden  
+	Du empfängst ab sofort die öffentlichen Beiträge von '$[fn]', 
+auf deiner "Netzwerk" Seite.  
 
 $[siteurl]
 

view/de/register_open_eml.tpl

@@ -1,32 +1,32 @@
 
 Hallo $[username],
 	Danke für deine Anmeldung auf $[sitename]. Dein Account wurde angelegt. 
-Die Login Details sind die folgenden:
+Hier die Login Details:
 
 
 Adresse der Seite:	$[siteurl]
 Login Name:	$[email]
 Passwort:	$[password]
 
-Du kannst das Passwort in den "Einstellungen" zu deinem Account ändern 
-nachdem du dich eingeloggt hast.
+Du kannst und solltest das Passwort in den "Einstellungen" zu deinem Account ändern, 
+nachdem du dich erstmalig eingeloggt hast.
 
-Bitte nimm dir einige Augenblicke Zeit um die anderen Einstellungen auf der Seite zu überprüfen.
+Bitte nimm dir einige Augenblicke Zeit, um die anderen Einstellungen auf der Seite kennenzulernen und zu überprüfen.
 
-Eventuell möchtest du außerdem einige grundlegenden Informationen in dein Standart-Profil eintragen 
-(auf der "Profile" Seite) damit andere Leute dich einfacher finden können.
+Eventuell möchtest du außerdem einige grundlegende Informationen in deinem Standardprofil (auf der "Profile" Seite) eintragen, 
+damit andere Leute dich einfacher finden können.
 
-Wir empfehlen den kompletten Namen anzugeben, ein eigenes Profil-Foto,
-ein paar "Profil-Schlüsselwörter" anzugeben (damit man leichter Gleichinteressierte finden kann) - und 
-natürlich in welchen Land Du lebst; wenn Du es nicht genauer angeben möchtest
-dann das.
+Wir empfehlen den kompletten Namen anzugeben, ein eigenes Profilbild hochzuladen,
+sowie ein paar "Profil-Schlüsselwörter" einzutragen (um leichter Menschen mit gleichen Interessen zu finden) - und 
+vielleicht auch in welchen Land du lebst; falls du nicht konkreter
+werden möchtest.
 
-Wir respektieren Ihr Recht auf Privatsphäre, und keines dieser Elemente sind notwendig. 
-Wenn Du hier neu bist und keinen kennst, wird man Dir helfen
-ein paar neue und interessante Freunde zu  finden.  
+Wir respektieren dein Recht auf Privatsphäre und keine dieser Angaben ist notwendig. 
+Wenn du ganz neu bei Friendica bist und niemanden kennst, werden sie dir aber helfen
+ein paar neue und interessante Freunde zu finden.  
 
 
-Danke dir und willkommen auf $[sitename].
+Danke und willkommen auf $[sitename].
 
 Beste Grüße,
 	$[sitename] Administrator

view/de/strings.php

@@ -10,7 +10,7 @@ $a->strings["Contact settings applied."] = "Einstellungen zum Kontakt angewandt.
 $a->strings["Contact update failed."] = "Konnte den Kontakt nicht aktualisieren.";
 $a->strings["Permission denied."] = "Zugriff verweigert.";
 $a->strings["Contact not found."] = "Kontakt nicht gefunden.";
-$a->strings["Repair Contact Settings"] = "Kontakt-Einstellungen reparieren";
+$a->strings["Repair Contact Settings"] = "Kontakteinstellungen reparieren";
 $a->strings["<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working."] = "<strong>ACHTUNG: Das sind Experten-Einstellungen!</strong> Wenn Du etwas Falsches eingibst, funktioniert die Kommunikation mit diesem Kontakt evtl. nicht mehr.";
 $a->strings["Please use your browser 'Back' button <strong>now</strong> if you are uncertain what to do on this page."] = "Bitte nutze den Zurück-Button deines Browsers <strong>jetzt</strong>, wenn du dir unsicher bist, was du tun willst.";
 $a->strings["Return to contact editor"] = "Zurück zum Kontakteditor";
@@ -33,7 +33,7 @@ $a->strings["File upload failed."] = "Hochladen der Datei fehlgeschlagen.";
 $a->strings["Friend suggestion sent."] = "Kontaktvorschlag gesendet.";
 $a->strings["Suggest Friends"] = "Kontakte vorschlagen";
 $a->strings["Suggest a friend for %s"] = "Schlage %s einen Kontakt vor";
-$a->strings["Event description and start time are required."] = "Ereignis Beschreibung und Startzeit sind erforderlich.";
+$a->strings["Event description and start time are required."] = "Ereignisbeschreibung und Startzeit sind erforderlich.";
 $a->strings["l, F j"] = "l, F j";
 $a->strings["Edit event"] = "Veranstaltung bearbeiten";
 $a->strings["link to source"] = "Link zum Originalbeitrag";
@@ -98,6 +98,7 @@ $a->strings["Private Message"] = "Private Nachricht";
 $a->strings["View Full Size"] = "Betrachte Originalgröße";
 $a->strings["Tags: "] = "Tags: ";
 $a->strings["[Remove any tag]"] = "[Tag entfernen]";
+$a->strings["Rotate CW"] = "Im Uhrzeigersinn rotieren";
 $a->strings["New album name"] = "Name des neuen Albums";
 $a->strings["Caption"] = "Bildunterschrift";
 $a->strings["Add a Tag"] = "Tag hinzufügen";
@@ -117,7 +118,7 @@ $a->strings["Community"] = "Gemeinschaft";
 $a->strings["No results."] = "Keine Ergebnisse.";
 $a->strings["This is Friendica, version"] = "Dies ist Friendica, Version";
 $a->strings["running at web location"] = "die unter folgender Webadresse zu finden ist";
-$a->strings["Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn more about the Friendica project."] = "Bitte besuche <a href=\"http://friendica.com\">Friendica.com</a> um mehr über das Friendica Projekt zu erfahren.";
+$a->strings["Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn more about the Friendica project."] = "Bitte besuche <a href=\"http://friendica.com\">Friendica.com</a>, um mehr über das Friendica Projekt zu erfahren.";
 $a->strings["Bug reports and issues: please visit"] = "Probleme oder Fehler gefunden? Bitte besuche";
 $a->strings["Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - dot com"] = "Vorschläge, Lob, Spenden usw.: E-Mail an \"Info\" at Friendica - dot com";
 $a->strings["Installed plugins/addons/apps:"] = "Installierte Plugins/Erweiterungen/Apps";
@@ -166,6 +167,7 @@ $a->strings["Failed to update contact record."] = "Aktualisierung der Kontaktdat
 $a->strings["Your introduction has been sent."] = "Deine Kontaktanfrage wurde gesendet.";
 $a->strings["Please login to confirm introduction."] = "Bitte melde dich an, um die Kontaktanfrage zu bestätigen.";
 $a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "Momentan bist du mit einer anderen Identität angemeldet. Bitte melde Dich mit <strong>diesem</strong> Profil an.";
+$a->strings["Hide this contact"] = "Verberge diese Kontakt";
 $a->strings["Welcome home %s."] = "Willkommen zurück %s.";
 $a->strings["Please confirm your introduction/connection request to %s."] = "Bitte bestätige deine Kontaktanfrage bei %s.";
 $a->strings["Confirm"] = "Bestätigen";
@@ -185,18 +187,14 @@ $a->strings[" - please do not use this form.  Instead, enter %s into your Diaspo
 $a->strings["Your Identity Address:"] = "Adresse deines Profils:";
 $a->strings["Submit Request"] = "Anfrage abschicken";
 $a->strings["Friendica Social Communications Server - Setup"] = "Friendica-Server für soziale Netzwerke – Setup";
-$a->strings["Database connection"] = "Datenbank-Verbindung";
 $a->strings["Could not connect to database."] = "Verbindung zur Datenbank gescheitert";
 $a->strings["Could not create table."] = "Konnte Tabelle nicht erstellen.";
 $a->strings["Your Friendica site database has been installed."] = "Die Datenbank deiner Friendica Seite wurde installiert.";
-$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "WICHTIG: Du musst [manuell] einen Cronjob (o.ä.) für den Poller einrichten.";
-$a->strings["Please see the file \"INSTALL.txt\"."] = "Lies bitte die \"INSTALL.txt\".";
-$a->strings["Proceed to registration"] = "Mit der Registrierung fortfahren";
-$a->strings["Proceed with Installation"] = "Mit der Installation fortfahren";
 $a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Möglicherweise musst du die Datei \"database.sql\" manuell mit phpmyadmin oder mysql importieren.";
-$a->strings["Database import failed."] = "Import der Datenbank schlug fehl.";
+$a->strings["Please see the file \"INSTALL.txt\"."] = "Lies bitte die \"INSTALL.txt\".";
 $a->strings["System check"] = "Systemtest";
 $a->strings["Check again"] = "Noch einmal testen";
+$a->strings["Database connection"] = "Datenbankverbindung";
 $a->strings["In order to install Friendica we need to know how to connect to your database."] = "Um Friendica installieren zu können, müssen wir wissen, wie wir zu deiner Datenbank Kontakt aufnehmen können.";
 $a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Bitte kontaktiere den Hosting Provider oder den Administrator der Seite, falls du Fragen zu diesen Einstellungen haben solltest.";
 $a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Die Datenbank, die du unten angibst, sollte bereits existieren. Ist dies noch nicht der Fall, erzeuge sie bitte bevor du mit der Installation fortfährst.";
@@ -209,8 +207,9 @@ $a->strings["Your account email address must match this in order to use the web
 $a->strings["Please select a default timezone for your website"] = "Bitte wähle die Standardzeitzone deiner Webseite";
 $a->strings["Site settings"] = "Server-Einstellungen";
 $a->strings["Could not find a command line version of PHP in the web server PATH."] = "Konnte keine Kommandozeilenversion von PHP im PATH des Servers finden.";
+$a->strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron. See <a href='http://friendica.com/node/27'>'Activating scheduled tasks'</a>"] = "Wenn du keine Kommandozeilen Version von PHP auf deinem Server installiert hast, kannst du keine Hintergrundprozesse via cron starten. Siehe <a href='http://friendica.com/node/27'>'Activating scheduled tasks'</a>";
 $a->strings["PHP executable path"] = "Pfad zu PHP";
-$a->strings["Enter full path to php executable"] = "Kompletter Pfad zum PHP-Executable";
+$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Gib den kompletten Pfad zur ausführbaren Datei von PHP an. Du kannst diesen Feld auch frei lassen und mit der Installation fortfahren.";
 $a->strings["Command line PHP"] = "Kommandozeilen-PHP";
 $a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "Die Kommandozeilenversion von PHP auf deinem System hat \"register_argc_argv\" nicht aktiviert.";
 $a->strings["This is required for message delivery to work."] = "Dies wird für die Auslieferung von Nachrichten benötigt.";
@@ -232,11 +231,15 @@ $a->strings["Error: mysqli PHP module required but not installed."] = "Fehler: D
 $a->strings["Error: mb_string PHP module required but not installed."] = "Fehler: mb_string PHP Module wird benötigt ist aber nicht installiert.";
 $a->strings["The web installer needs to be able to create a file called \".htconfig.php\ in the top folder of your web server and it is unable to do so."] = "Der Installationswizard muss in der Lage sein, eine Datei im Stammverzeichnis deines Webservers anzulegen, ist allerdings derzeit nicht in der Lage, dies zu tun.";
 $a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "In den meisten Fällen ist dies ein Problem mit den Schreibrechten, der Webserver könnte keine Schreiberlaubnis haben, selbst wenn du sie hast.";
-$a->strings["Please check with your site documentation or support people to see if this situation can be corrected."] = "Bitte überprüfe die Einstellungen und frage im Zweifelsfall dein Support Team, um diese Situation zu beheben.";
-$a->strings["If not, you may be required to perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Sollte dies nicht möglich sein, musst du die Installation manuell durchführen. Lies dazu bitte in der Datei \"INSTALL.txt\".";
+$a->strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Friendica top folder."] = "Nachdem du alles ausgefüllt hast, erhältst du einen Text, den du in eine Datei namens .htconfig.php in deinem Friendica-Wurzelverzeichnis kopieren musst.";
+$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Alternativ kannst du diesen Schritt aber auch überspringen und die Installation manuell durchführen. Eine Anleitung dazu (Englisch) findest du in der Datei INSTALL.txt.";
 $a->strings[".htconfig.php is writable"] = "Schreibrechte auf .htconfig.php";
-$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Die Konfigurationsdatei \".htconfig.php\" konnte nicht angelegt werden. Bitte verwende den angefügten Text um die Datei im Stammverzeichnis deiner Friendica-Installation zu erzeugen.";
+$a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "Umschreiben der URLs in der .htaccess funktioniert nicht. Überprüfe die Konfiguration des Servers.";
+$a->strings["Url rewrite is working"] = "URL rewrite funktioniert";
+$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Die Konfigurationsdatei \".htconfig.php\" konnte nicht angelegt werden. Bitte verwende den angefügten Text, um die Datei im Stammverzeichnis deiner Friendica-Installation zu erzeugen.";
 $a->strings["Errors encountered creating database tables."] = "Fehler aufgetreten während der Erzeugung der Datenbanktabellen.";
+$a->strings["<h1>What next</h1>"] = "<h1>Wie geht es weiter?</h1>";
+$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "WICHTIG: Du musst [manuell] einen Cronjob (o.ä.) für den Poller einrichten.";
 $a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
 $a->strings["Time Conversion"] = "Zeitumrechnung";
 $a->strings["Friendika provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica bietet diese Funktion an, um das Teilen von Events mit den Kontakten zu vereinfachen, deren Zeitzone nicht ermittelt werden kann.";
@@ -288,8 +291,8 @@ $a->strings["%s created a new post"] = "%s hat einen neuen Beitrag erstellt";
 $a->strings["%s commented on %s's post"] = "%s hat %ss Beitrag kommentiert";
 $a->strings["No more network notifications."] = "Keine weiteren Netzwerk-Benachrichtigungen.";
 $a->strings["Network Notifications"] = "Netzwerk Benachrichtigungen";
-$a->strings["No more system notifications."] = "Keine weiteren System Benachrichtigungen.";
-$a->strings["System Notifications"] = "System Benachrichtigungen";
+$a->strings["No more system notifications."] = "Keine weiteren Systembenachrichtigungen.";
+$a->strings["System Notifications"] = "Systembenachrichtigungen";
 $a->strings["No more personal notifications."] = "Keine weiteren persönlichen Benachrichtigungen";
 $a->strings["Personal Notifications"] = "Persönliche Benachrichtigungen";
 $a->strings["No more home notifications."] = "Keine weiteren Pinnwand-Benachrichtigungen";
@@ -320,7 +323,7 @@ $a->strings["%d contact in common"] = array(
 $a->strings["View all contacts"] = "Alle Kontakte anzeigen";
 $a->strings["Unblock"] = "Entsperren";
 $a->strings["Block"] = "Sperren";
-$a->strings["Toggle Blocked status"] = "Geblockt-Sttaus ein-/ausschalten";
+$a->strings["Toggle Blocked status"] = "Geblockt-Status ein-/ausschalten";
 $a->strings["Unignore"] = "Ignorieren aufheben";
 $a->strings["Toggle Ignored status"] = "Ignoriert-Status ein-/ausschalten";
 $a->strings["Unarchive"] = "Unarchivieren";
@@ -329,7 +332,7 @@ $a->strings["Toggle Archive status"] = "Archiviert-Status ein-/ausschalten";
 $a->strings["Repair"] = "Reparieren";
 $a->strings["Advanced Contact Settings"] = "Fortgeschrittene Kontakteinstellungen";
 $a->strings["Contact Editor"] = "Kontakt Editor";
-$a->strings["Profile Visibility"] = "Profil Anzeige";
+$a->strings["Profile Visibility"] = "Profil-Sichtbarkeit";
 $a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Bitte wähle eines deiner Profile das angezeigt werden soll, wenn %s dein Profil aufruft.";
 $a->strings["Contact Information / Notes"] = "Kontakt Informationen / Notizen";
 $a->strings["Edit contact notes"] = "Notizen zum Kontakt bearbiten";
@@ -383,8 +386,8 @@ $a->strings["Forgot your Password?"] = "Hast du dein Passwort vergessen?";
 $a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Gib deine Email-Adresse an und fordere ein neues Passwort an. Es werden dir dann weitere Informationen per Mail zugesendet.";
 $a->strings["Nickname or Email: "] = "Spitzname oder Email:";
 $a->strings["Reset"] = "Zurücksetzen";
-$a->strings["Account settings"] = "Account Einstellungen";
-$a->strings["Display settings"] = "Anzeige Einstellungen";
+$a->strings["Account settings"] = "Account-Einstellungen";
+$a->strings["Display settings"] = "Anzeige-Einstellungen";
 $a->strings["Connector settings"] = "Connector-Einstellungen";
 $a->strings["Plugin settings"] = "Plugin-Einstellungen";
 $a->strings["Connected apps"] = "Verbundene Programme";
@@ -403,6 +406,8 @@ $a->strings[" Please use a shorter name."] = " Bitte verwende einen kürzeren Na
 $a->strings[" Name too short."] = " Name ist zu kurz.";
 $a->strings[" Not valid email."] = " Keine gültige E-Mail.";
 $a->strings[" Cannot change to that email."] = "Ändern der E-Mail nicht möglich. ";
+$a->strings["Private forum has no privacy permissions. Using default privacy group."] = "Für das private Forum sind keine Zugriffsrechte eingestellt. Die voreingestellte Gruppe für neue Kontakte wird benutzt.";
+$a->strings["Private forum has no privacy permissions and no default privacy group."] = "Für das private Forum sind keine Zugriffsrechte eingestellt, und es gibt keine voreingestellte Gruppe für neue Kontakte.";
 $a->strings["Settings updated."] = "Einstellungen aktualisiert.";
 $a->strings["Add application"] = "Programm hinzufügen";
 $a->strings["Consumer Key"] = "Consumer Key";
@@ -411,7 +416,7 @@ $a->strings["Redirect"] = "Umleiten";
 $a->strings["Icon url"] = "Icon URL";
 $a->strings["You can't edit this application."] = "Du kannst dieses Programm nicht bearbeiten.";
 $a->strings["Connected Apps"] = "Verbundene Programme";
-$a->strings["Client key starts with"] = "Anwender Schlüssel beginnt mit";
+$a->strings["Client key starts with"] = "Anwenderschlüssel beginnt mit";
 $a->strings["No name"] = "Kein Name";
 $a->strings["Remove authorization"] = "Autorisierung entziehen";
 $a->strings["No Plugin settings configured"] = "Keine Plugin-Einstellungen konfiguriert";
@@ -437,21 +442,23 @@ $a->strings["Action after import:"] = "Aktion nach Import:";
 $a->strings["Mark as seen"] = "Als gelesen markieren";
 $a->strings["Move to folder"] = "In einen Ordner verschieben";
 $a->strings["Move to folder:"] = "In diesen Ordner verschieben:";
-$a->strings["Display Settings"] = "Anzeige Einstellungen";
+$a->strings["Display Settings"] = "Anzeige-Einstellungen";
 $a->strings["Display Theme:"] = "Theme:";
 $a->strings["Update browser every xx seconds"] = "Browser alle xx Sekunden aktualisieren";
 $a->strings["Minimum of 10 seconds, no maximum"] = "Minimal 10 Sekunden, kein Maximum";
 $a->strings["Number of items to display on the network page:"] = "Zahl der Beiträge, die pro Netzwerkseite angezeigt werden sollen: ";
 $a->strings["Maximum of 100 items"] = "Maximal 100 Beiträge";
 $a->strings["Don't show emoticons"] = "Keine Smilies anzeigen";
-$a->strings["Normal Account"] = "Normaler Account";
+$a->strings["Normal Account Page"] = "Normale Account Seite";
 $a->strings["This account is a normal personal profile"] = "Dieser Account ist ein normales persönliches Profil";
-$a->strings["Soapbox Account"] = "Sandkasten-Account";
+$a->strings["Soapbox Page"] = "Sandkasten Seite";
 $a->strings["Automatically approve all connection/friend requests as read-only fans"] = "Kontaktanfragen werden automatisch als Nurlese-Fans akzeptiert";
-$a->strings["Community/Celebrity Account"] = "Gemeinschafts/Promi-Account";
+$a->strings["Community Forum/Celebrity Account"] = "Gemeinschafts Forum / Promi Konto";
 $a->strings["Automatically approve all connection/friend requests as read-write fans"] = "Kontaktanfragen werden automatisch als Lese-und-Schreib-Fans akzeptiert";
-$a->strings["Automatic Friend Account"] = "Automatischer Freundesaccount";
+$a->strings["Automatic Friend Page"] = "Automatische Freunde Seite";
 $a->strings["Automatically approve all connection/friend requests as friends"] = "Kontaktanfragen werden automatisch als Freund akzeptiert";
+$a->strings["Private Forum [Experimental]"] = "Privates Forum [Versuchsstadium]";
+$a->strings["Private forum - approved members only"] = "Privates Forum - Ausschließlich für Mitglieder";
 $a->strings["OpenID:"] = "OpenID:";
 $a->strings["(Optional) Allow this OpenID to login to this account."] = "(Optional) Erlaube die Anmeldung für diesen Account mit dieser OpenID.";
 $a->strings["Publish your default profile in your local site directory?"] = "Veröffentliche dein Standardprofil im Verzeichnis der lokalen Seite?";
@@ -473,6 +480,7 @@ $a->strings["Expire posts:"] = "Beiträge verfallen lassen:";
 $a->strings["Expire personal notes:"] = "Persönliche Notizen verfallen lassen:";
 $a->strings["Expire starred posts:"] = "Markierte Beiträge verfallen lassen:";
 $a->strings["Expire photos:"] = "Fotos verfallen lassen:";
+$a->strings["Only expire posts by others:"] = "Nur Beiträge anderer verfallen";
 $a->strings["Account Settings"] = "Account-Einstellungen";
 $a->strings["Password Settings"] = "Passwort-Einstellungen";
 $a->strings["New Password:"] = "Neues Passwort:";
@@ -491,7 +499,7 @@ $a->strings["Default Post Permissions"] = "Standard-Zugriffsrechte für Beiträg
 $a->strings["(click to open/close)"] = "(klicke zum öffnen/schließen)";
 $a->strings["Maximum private messages per day from unknown people:"] = "Maximale Anzahl von privaten Nachrichten, die dir unbekannte Personen pro Tag senden dürfen:";
 $a->strings["Notification Settings"] = "Benachrichtigungseinstellungen";
-$a->strings["By default post a status message when:"] = "Standardmäßig eine Status-Nachricht posten wenn:";
+$a->strings["By default post a status message when:"] = "Standardmäßig eine Statusnachricht posten, wenn:";
 $a->strings["accepting a friend request"] = "– du eine Kontaktanfrage akzeptierst";
 $a->strings["joining a forum/community"] = "– du einem Forum/einer Gemeinschaftsseite beitrittst";
 $a->strings["making an <em>interesting</em> profile change"] = "– du eine <em>interessante</em> Änderung an deinem Profil durchführst";
@@ -503,7 +511,8 @@ $a->strings["Someone writes a followup comment"] = "– jemand auch einen Kommen
 $a->strings["You receive a private message"] = "– du eine private Nachricht erhältst";
 $a->strings["You receive a friend suggestion"] = "- du eine Empfehlung erhältst";
 $a->strings["You are tagged in a post"] = "- du in einem Beitrag erwähnt wurdest";
-$a->strings["Advanced Page Settings"] = "Erweiterte Seiten-Einstellungen";
+$a->strings["Advanced Account/Page Type Settings"] = "";
+$a->strings["Change the behaviour of this account for special situations"] = "Ändere das Verhalten deines Accounts für spezielle Situationen.";
 $a->strings["Manage Identities and/or Pages"] = "Verwalte Identitäten und/oder Seiten";
 $a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "Wechsle zwischen verschiedenen Identitäten oder Gemeinschafts-/Gruppen-Seiten, die deine Zugangsdetails teilen oder zu denen du \"Manage\" Befugnisse bekommen hast.";
 $a->strings["Select an identity to manage: "] = "Wähle eine Identität zum Verwalten: ";
@@ -562,7 +571,7 @@ $a->strings["Edit your <strong>default</strong> profile to your liking. Review t
 $a->strings["Set some public keywords for your default profile which describe your interests. We may be able to find other people with similar interests and suggest friendships."] = "Trage ein paar öffentliche Stichwörter in dein Standardprofil ein, die deine Interessen beschreiben. Eventuell sind wir in der Lage Leute zu finden, die deine Interessen teilen und können dir dann Kontakte vorschlagen.";
 $a->strings["Your Contacts page is your gateway to managing friendships and connecting with friends on other networks. Typically you enter their address or site URL in the <em>Add New Contact</em> dialog."] = "Die Kontakte-Seite ist die Einstiegsseite, von der aus du Kontakte verwalten und dich mit Freunden in anderen Netzwerken verbinden kannst. Normalerweise gibst du dazu einfach ihre Adresse oder die URL der Seite im Kasten <em>Neuen Kontakt hinzufügen</em> ein.";
 $a->strings["The Directory page lets you find other people in this network or other federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on their profile page. Provide your own Identity Address if requested."] = "Über die Verzeichnisseite kannst du andere Personen auf diesem Server oder anderen verknüpften Seiten finden. Halte nach einem <em>Verbinden</em> oder <em>Folgen</em> Link auf deren Profilseiten Ausschau und gib deine eigene Profiladresse an, falls du danach gefragt wirst.";
-$a->strings["On the side panel of the Contacts page are several tools to find new friends. We can match people by interest, look up people by name or interest, and provide suggestions based on network relationships. On a brand new site, friend suggestions will usually begin to be populated within 24 hours."] = "Im seitlichen Bedienfeld der Kontakte-Seite gibt es diverse Werkzeuge, um neue Freunde zu finden. Wir können Menschen mit den gleichen Interessen finden, anhand von Namen oder Interessen suchen oder aber aufgrund vorhandener Kontakte neue Freunde vorschlagen.\nAuf einer brandneuen - soeben erstellten - Seite starten die Kontaktvorschläge innerhalb von 24 Stunden.";
+$a->strings["On the side panel of the Contacts page are several tools to find new friends. We can match people by interest, look up people by name or interest, and provide suggestions based on network relationships. On a brand new site, friend suggestions will usually begin to be populated within 24 hours."] = "Im seitlichen Bedienfeld der Kontakteseite gibt es diverse Werkzeuge, um neue Freunde zu finden. Wir können Menschen mit den gleichen Interessen finden, anhand von Namen oder Interessen suchen oder aber aufgrund vorhandener Kontakte neue Freunde vorschlagen.\nAuf einer brandneuen - soeben erstellten - Seite starten die Kontaktvorschläge innerhalb von 24 Stunden.";
 $a->strings["Once you have made some friends, organize them into private conversation groups from the sidebar of your Contacts page and then you can interact with each group privately on your Network page."] = "Sobald du einige Freunde gefunden hast, organisiere sie in Gruppen zur privaten Kommunikation im Seitenmenü der Kontakte-Seite. Du kannst dann mit jeder dieser Gruppen von der Netzwerkseite aus privat interagieren.";
 $a->strings["Our <strong>help</strong> pages may be consulted for detail on other program features and resources."] = "Unsere <strong>Hilfe</strong> Seiten können herangezogen werden, um weitere Einzelheiten zu andern Programm Features zu erhalten.";
 $a->strings["Item not available."] = "Beitrag nicht verfügbar.";
@@ -586,22 +595,6 @@ $a->strings["Visible To"] = "Sichtbar für";
 $a->strings["All Contacts (with secure profile access)"] = "Alle Kontakte (mit gesichertem Profilzugriff)";
 $a->strings["No contacts."] = "Keine Kontakte.";
 $a->strings["View Contacts"] = "Kontakte anzeigen";
-$a->strings["An invitation is required."] = "Du benötigst eine Einladung.";
-$a->strings["Invitation could not be verified."] = "Die Einladung konnte nicht überprüft werden.";
-$a->strings["Invalid OpenID url"] = "Ungültige OpenID URL";
-$a->strings["Please enter the required information."] = "Bitte trage die erforderlichen Informationen ein.";
-$a->strings["Please use a shorter name."] = "Bitte verwende einen kürzeren Namen.";
-$a->strings["Name too short."] = "Der Name ist zu kurz.";
-$a->strings["That doesn't appear to be your full (First Last) name."] = "Das scheint nicht dein kompletter Name (Vor- und Nachname) zu sein.";
-$a->strings["Your email domain is not among those allowed on this site."] = "Die Domain deiner E-Mail Adresse ist auf dieser Seite nicht erlaubt.";
-$a->strings["Not a valid email address."] = "Keine gültige E-Mail-Adresse.";
-$a->strings["Cannot use that email."] = "Konnte diese E-Mail-Adresse nicht verwenden.";
-$a->strings["Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and must also begin with a letter."] = "Dein Spitzname darf nur aus Buchstaben und Zahlen (\"a-z\",\"0-9\", \"_\" und \"-\") bestehen, außerdem muss er mit einem Buchstaben beginnen.";
-$a->strings["Nickname is already registered. Please choose another."] = "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen.";
-$a->strings["Nickname was once registered here and may not be re-used. Please choose another."] = "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen.";
-$a->strings["SERIOUS ERROR: Generation of security keys failed."] = "FATALER FEHLER: Sicherheitsschlüssel konnten nicht erzeugt werden.";
-$a->strings["An error occurred during registration. Please try again."] = "Wärend der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal.";
-$a->strings["An error occurred creating your default profile. Please try again."] = "Bei der Erstellung des Standard-Profils ist ein Fehler aufgetreten. Bitte versuche es noch einmal.";
 $a->strings["Registration details for %s"] = "Details der Registration von %s";
 $a->strings["Registration successful. Please check your email for further instructions."] = "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an dich gesendet.";
 $a->strings["Failed to send email message. Here is the message that failed."] = "Konnte die E-Mail nicht versenden. Hier ist die Nachricht, die nicht gesendet werden konnte.";
@@ -678,15 +671,19 @@ $a->strings["No secure communications available. You <strong>may</strong> be abl
 $a->strings["Send Reply"] = "Antwort senden";
 $a->strings["Friends of %s"] = "Freunde von %s";
 $a->strings["No friends to display."] = "Keine Freunde zum Anzeigen.";
-$a->strings["Theme settings updated."] = "Themen Einstellungen aktualisiert.";
+$a->strings["Theme settings updated."] = "Themeneinstellungen aktualisiert.";
 $a->strings["Site"] = "Seite";
 $a->strings["Users"] = "Nutzer";
 $a->strings["Plugins"] = "Plugins";
 $a->strings["Themes"] = "Themen";
 $a->strings["DB updates"] = "DB Updates";
-$a->strings["Software Update"] = "Software Update";
 $a->strings["Logs"] = "Protokolle";
 $a->strings["User registrations waiting for confirmation"] = "Nutzeranmeldungen die auf Bestätigung warten";
+$a->strings["Normal Account"] = "Normaler Account";
+$a->strings["Soapbox Account"] = "Sandkasten-Account";
+$a->strings["Community/Celebrity Account"] = "Gemeinschafts-/Promi-Account";
+$a->strings["Automatic Friend Account"] = "Automatischer Freundesaccount";
+$a->strings["Message queues"] = "Nachrichten-Warteschlangen";
 $a->strings["Administration"] = "Administration";
 $a->strings["Summary"] = "Zusammenfassung";
 $a->strings["Registered users"] = "Registrierte Nutzer";
@@ -714,7 +711,7 @@ $a->strings["Maximum image size"] = "Maximale Größe von Bildern";
 $a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Maximale Upload-Größe von Bildern in Bytes. Standard ist 0, d.h. ohne Limit.";
 $a->strings["Register policy"] = "Registrierungsmethode";
 $a->strings["Register text"] = "Registrierungstext";
-$a->strings["Will be displayed prominently on the registration page."] = "Wird gut sichtbar auf der Registrierungs-Seite angezeigt.";
+$a->strings["Will be displayed prominently on the registration page."] = "Wird gut sichtbar auf der Registrierungsseite angezeigt.";
 $a->strings["Accounts abandoned after x days"] = "Accounts gelten nach x Tagen als unbenutzt";
 $a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Accounts nicht mehr benutzt werden. 0 eingeben für kein Limit.";
 $a->strings["Allowed friend domains"] = "Erlaubte Domains für Kontakte";
@@ -744,15 +741,17 @@ $a->strings["Provide built-in Diaspora network compatibility."] = "Verwende die
 $a->strings["Only allow Friendica contacts"] = "Nur Friendica-Kontakte erlauben";
 $a->strings["All contacts must use Friendica protocols. All other built-in communication protocols disabled."] = "Alle Kontakte müssen das Friendica Protokoll nutzen. Alle anderen Kommunikationsprotokolle werden deaktiviert.";
 $a->strings["Verify SSL"] = "SSL Überprüfen";
-$a->strings["If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."] = "Wenn gewollt, kann man hier eine strenge Zertifikat Kontrolle einstellen. Das bedeutet, dass man zu keinen Seiten mit selbst unterzeichnetem SSL eine Verbindung herstellen kann.";
+$a->strings["If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."] = "Wenn gewollt, kann man hier eine strenge Zertifikatkontrolle einstellen. Das bedeutet, dass man zu keinen Seiten mit selbst unterzeichnetem SSL eine Verbindung herstellen kann.";
 $a->strings["Proxy user"] = "Proxy Nutzer";
 $a->strings["Proxy URL"] = "Proxy URL";
 $a->strings["Network timeout"] = "Netzwerk Wartezeit";
 $a->strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = "Der Wert ist in Sekunden. Setze 0 für unbegrenzt (nicht empfohlen).";
 $a->strings["Delivery interval"] = "Zustellungsintervall";
-$a->strings["Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers."] = "Verzögere im Hintergrund laufende Auslieferungsprozesse um die angegebene Anzahl an Sekunden um die Systemlast zu verringern. Empfehlungen: 4-5 für Shared-Hosts, 2-3 für VPS, 0-1 für große dedizierte Server.";
+$a->strings["Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers."] = "Verzögere im Hintergrund laufende Auslieferungsprozesse um die angegebene Anzahl an Sekunden, um die Systemlast zu verringern. Empfehlungen: 4-5 für Shared-Hosts, 2-3 für VPS, 0-1 für große dedizierte Server.";
+$a->strings["Poll interval"] = "Abfrageintervall";
+$a->strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "Verzögere Hintergrundprozesse, um diese Anzahl an Sekunden um die Systemlast zu reduzieren. Bei 0 Sekunden wird das Auslieferungsintervall verwendet.";
 $a->strings["Maximum Load Average"] = "Maximum Load Average";
-$a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "";
+$a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Maximale Systemlast bevor Verteil- und Empfangsprozesse verschoben werden - Standard 50";
 $a->strings["Update has been marked successful"] = "Update wurde als erfolgreich markiert";
 $a->strings["Executing %s failed. Check system logs."] = "Ausführung von %s schlug fehl. Systemprotokolle prüfen.";
 $a->strings["Update %s was successfully applied."] = "Update %s war erfolgreich.";
@@ -776,7 +775,7 @@ $a->strings["User '%s' unblocked"] = "Nutzer '%s' entsperrt";
 $a->strings["User '%s' blocked"] = "Nutzer '%s' gesperrt";
 $a->strings["select all"] = "Alle auswählen";
 $a->strings["User registrations waiting for confirm"] = "Neuanmeldungen, die auf deine Bestätigung warten";
-$a->strings["Request date"] = "Anfrage Datum";
+$a->strings["Request date"] = "Anfragedatum";
 $a->strings["Email"] = "Email";
 $a->strings["No registrations."] = "Keine Neuanmeldungen.";
 $a->strings["Deny"] = "Verwehren";
@@ -824,13 +823,15 @@ $a->strings["{0} mentioned you in a post"] = "{0} hat dich in einem Beitrag erw
 $a->strings["Contacts who are not members of a group"] = "Kontakte, die keiner Gruppe zugewiesen sind";
 $a->strings["OpenID protocol error. No ID returned."] = "OpenID Protokollfehler. Keine ID zurückgegeben.";
 $a->strings["Account not found and OpenID registration is not permitted on this site."] = "Account wurde nicht gefunden und OpenID Registrierung auf diesem Server nicht gestattet.";
-$a->strings["Login failed."] = "Annmeldung fehlgeschlagen.";
+$a->strings["Login failed."] = "Anmeldung fehlgeschlagen.";
 $a->strings["Connect URL missing."] = "Connect-URL fehlt";
 $a->strings["This site is not configured to allow communications with other networks."] = "Diese Seite ist so konfiguriert, dass keine Kommunikation mit anderen Netzwerken erfolgen kann.";
 $a->strings["No compatible communication protocols or feeds were discovered."] = "Es wurden keine kompatiblen Kommunikationsprotokolle oder Feeds gefunden.";
 $a->strings["The profile address specified does not provide adequate information."] = "Die angegebene Profiladresse liefert unzureichende Informationen.";
 $a->strings["An author or name was not found."] = "Es wurde kein Autor oder Name gefunden.";
 $a->strings["No browser URL could be matched to this address."] = "Zu dieser Adresse konnte keine passende Browser URL gefunden werden.";
+$a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "Konnte die @-Adresse mit keinem der bekannten Protokolle oder Email-Kontakte abgleichen.";
+$a->strings["Use mailto: in front of address to force email check."] = "Verwende mailto: vor der Email Adresse um eine Überprüfung der Email Adresse zu erzwingen.";
 $a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "Die Adresse dieses Profils gehört zu einem Netzwerk, mit dem die Kommunikation auf dieser Seite ausgeschaltet wurde.";
 $a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Eingeschränktes Profil. Diese Person wird keine direkten/privaten Nachrichten von dir erhalten können.";
 $a->strings["Unable to retrieve contact information."] = "Konnte die Kontaktinformationen nicht empfangen.";
@@ -840,7 +841,7 @@ $a->strings["No contacts in common."] = "Keine gemeinsamen Kontakte.";
 $a->strings["Item has been removed."] = "Eintrag wurde entfernt.";
 $a->strings["Applications"] = "Anwendungen";
 $a->strings["No installed applications."] = "Keine Applikationen installiert.";
-$a->strings["Search This Site"] = "Diese Seite durchsuchen";
+$a->strings["Search"] = "Suche";
 $a->strings["Profile not found."] = "Profil nicht gefunden.";
 $a->strings["Profile Name is required."] = "Profilname ist erforderlich.";
 $a->strings["Marital Status"] = "Familienstand";
@@ -852,11 +853,13 @@ $a->strings["Gender"] = "Geschlecht";
 $a->strings["Sexual Preference"] = "Sexuelle Vorlieben";
 $a->strings["Homepage"] = "Webseite";
 $a->strings["Interests"] = "Interessen";
+$a->strings["Address"] = "Adresse";
 $a->strings["Location"] = "Wohnort";
 $a->strings["Profile updated."] = "Profil aktualisiert.";
 $a->strings[" and "] = " und ";
 $a->strings["public profile"] = "öffentliches Profil";
 $a->strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s hat %2\$s geändert auf &ldquo;%3\$s&rdquo;";
+$a->strings[" - Visit %1\$s's %2\$s"] = " – %1\$ss %2\$s besuchen";
 $a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s hat folgendes aktualisiert %2\$s, verändert wurde %3\$s.";
 $a->strings["Profile deleted."] = "Profil gelöscht.";
 $a->strings["Profile-"] = "Profil-";
@@ -881,6 +884,7 @@ $a->strings["Region/State:"] = "Region/Bundesstaat:";
 $a->strings["<span class=\"heart\">&hearts;</span> Marital Status:"] = "<span class=\"heart\">&hearts;</span> Beziehungsstatus:";
 $a->strings["Who: (if applicable)"] = "Wer: (falls anwendbar)";
 $a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Beispiele: cathy123, Cathy Williams, cathy@example.com";
+$a->strings["Since [date]:"] = "Seit [Datum]:";
 $a->strings["Sexual Preference:"] = "Sexuelle Vorlieben:";
 $a->strings["Homepage URL:"] = "Adresse der Homepage:";
 $a->strings["Political Views:"] = "Politische Ansichten:";
@@ -888,7 +892,7 @@ $a->strings["Religious Views:"] = "Religiöse Ansichten:";
 $a->strings["Public Keywords:"] = "Öffentliche Schlüsselwörter:";
 $a->strings["Private Keywords:"] = "Private Schlüsselwörter:";
 $a->strings["Example: fishing photography software"] = "Beispiel: Fischen Fotografie Software";
-$a->strings["(Used for suggesting potential friends, can be seen by others)"] = "(Wird verwendet um potentielle Freunde zu finden, könnte von Fremden eingesehen werden)";
+$a->strings["(Used for suggesting potential friends, can be seen by others)"] = "(Wird verwendet, um potentielle Freunde zu finden, könnte von Fremden eingesehen werden)";
 $a->strings["(Used for searching profiles, never shown to others)"] = "(Wird für die Suche nach Profilen verwendet und niemals veröffentlicht)";
 $a->strings["Tell us about yourself..."] = "Erzähle uns ein bisschen von dir …";
 $a->strings["Hobbies/Interests"] = "Hobbies/Interessen";
@@ -972,8 +976,8 @@ $a->strings["Install Facebook connector for this account."] = "Facebook-Connecto
 $a->strings["Remove Facebook connector"] = "Facebook-Connector entfernen";
 $a->strings["Re-authenticate [This is necessary whenever your Facebook password is changed.]"] = "Neu authentifizieren [Das ist immer dann nötig, wenn Du Dein Facebook-Passwort geändert hast.]";
 $a->strings["Post to Facebook by default"] = "Veröffentliche standardmäßig bei Facebook";
-$a->strings["Facebook friend linking has been disabled on this site. The following settings will have no effect."] = "";
-$a->strings["Facebook friend linking has been disabled on this site. If you disable it, you will be unable to re-enable it."] = "";
+$a->strings["Facebook friend linking has been disabled on this site. The following settings will have no effect."] = "Das Verlinken von Facebookkontakten wurde auf dieser Seite deaktiviert. Die folgenden Einstellungen haben keinen Effekt.";
+$a->strings["Facebook friend linking has been disabled on this site. If you disable it, you will be unable to re-enable it."] = "Das Verlinken von Facebookkontakten wurde auf dieser Seite deaktiviert. Wenn du es ausgeschaltet hast, kannst du es nicht wieder aktivieren.";
 $a->strings["Link all your Facebook friends and conversations on this website"] = "All meine Facebook-Kontakte und -Konversationen hier auf diese Website importieren";
 $a->strings["Facebook conversations consist of your <em>profile wall</em> and your friend <em>stream</em>."] = "Facebook-Konversationen bestehen aus deinen Beiträgen auf deiner<em>Pinnwand</em>, sowie den Beiträgen deiner Freunde <em>Stream</em>.";
 $a->strings["On this website, your Facebook friend stream is only visible to you."] = "Hier auf dieser Webseite kannst nur du die Beiträge Deiner Facebook-Freunde (Stream) sehen.";
@@ -981,7 +985,7 @@ $a->strings["The following settings determine the privacy of your Facebook profi
 $a->strings["On this website your Facebook profile wall conversations will only be visible to you"] = "Meine Facebook-Pinnwand hier auf dieser Webseite nur für mich sichtbar machen";
 $a->strings["Do not import your Facebook profile wall conversations"] = "Facebook-Pinnwand nicht importieren";
 $a->strings["If you choose to link conversations and leave both of these boxes unchecked, your Facebook profile wall will be merged with your profile wall on this website and your privacy settings on this website will be used to determine who may see the conversations."] = "Wenn Du Facebook-Konversationen importierst und diese beiden Häkchen nicht setzt, wird Deine Facebook-Pinnwand mit der Pinnwand hier auf dieser Webseite vereinigt. Die Privatsphäre-Einstellungen für Deine Pinnwand auf dieser Webseite geben dann an, wer die Konversationen sehen kann.";
-$a->strings["Comma separated applications to ignore"] = "Komma separiert Anwendungen, die ignoriert werden sollen";
+$a->strings["Comma separated applications to ignore"] = "Kommaseparierte Anwendungen, die ignoriert werden sollen";
 $a->strings["Problems with Facebook Real-Time Updates"] = "Probleme mit Facebook Echtzeit-Updates";
 $a->strings["Facebook"] = "Facebook";
 $a->strings["Facebook Connector Settings"] = "Facebook-Verbindungseinstellungen";
@@ -992,9 +996,9 @@ $a->strings["The given API Key seems to work correctly."] = "Der angegebene API
 $a->strings["The correctness of the API Key could not be detected. Somthing strange's going on."] = "Die Echtheit des API Schlüssels konnte nicht überprüft werden. Etwas Merkwürdiges ist hier im Gange.";
 $a->strings["App-ID / API-Key"] = "App-ID / API-Key";
 $a->strings["Application secret"] = "Anwendungs-Geheimnis";
-$a->strings["Polling Interval in minutes (minimum %1\$s minutes)"] = "Abfrage-Intervall in Minuten (min %1\$s Minuten)";
-$a->strings["Synchronize comments (no comments on Facebook are missed, at the cost of increased system load)"] = "Kommentare synchronisieren (Kein Kommentar von Facebook geht verlohren, verursacht höhere Last auf dem Server)";
-$a->strings["Real-Time Updates"] = "Echt-Zeit Aktualisierungen";
+$a->strings["Polling Interval in minutes (minimum %1\$s minutes)"] = "Abfrageintervall in Minuten (min %1\$s Minuten)";
+$a->strings["Synchronize comments (no comments on Facebook are missed, at the cost of increased system load)"] = "Kommentare synchronisieren (Kein Kommentar von Facebook geht verloren, verursacht höhere Last auf dem Server)";
+$a->strings["Real-Time Updates"] = "Echtzeit Aktualisierungen";
 $a->strings["Real-Time Updates are activated."] = "Echtzeit-Updates sind aktiviert.";
 $a->strings["Deactivate Real-Time Updates"] = "Echtzeit-Updates deaktivieren";
 $a->strings["Real-Time Updates not activated."] = "Echtzeit-Updates nicht aktiviert.";
@@ -1038,7 +1042,7 @@ $a->strings["LiveJournal username"] = "LiveJournal Benutzername";
 $a->strings["LiveJournal password"] = "LiveJournal Passwort";
 $a->strings["Post to LiveJournal by default"] = "Standardmäßig bei LiveJournal veröffentlichen";
 $a->strings["Not Safe For Work (General Purpose Content Filter) settings"] = "Not Safe for Work (allg. Filter für ungewollte Inhalte) Einstellungen:";
-$a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW.  This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Dieses Plugin sucht in Beiträgen nach Wörtern oder Textbauteilen die du weiter unten eingibst, findet es diese Bausteine, dann wird der entsprechende Beitrag zusammengefaltet dargestellt. Auf diese Weise wird verhindert, dass Inhalte, wie z.B. sexuelle Anspielungen, in unpassenden Momenten angezeigt werden. Du solltest den #NSFW Tag für Beiträge verwenden von denen du ausgehen kannst, dass andere sie anstößig finden könnten. Su kannst beliebige Wörter in der Filterliste angeben und ihn so als allgemeinen Filter verwenden.";
+$a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW.  This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Dieses Plugin sucht in Beiträgen nach Wörtern oder Textbauteilen die du weiter unten eingibst, findet es diese Bausteine, dann wird der entsprechende Beitrag zusammengefaltet dargestellt. Auf diese Weise wird verhindert, dass Inhalte, wie z.B. sexuelle Anspielungen, in unpassenden Momenten angezeigt werden. Du solltest den #NSFW Tag für Beiträge verwenden von denen du ausgehen kannst, dass andere sie anstößig finden könnten. Du kannst beliebige Wörter in der Filterliste angeben und ihn so als allgemeinen Filter verwenden.";
 $a->strings["Enable Content filter"] = "Aktiviere den Inhaltsfilter";
 $a->strings["Comma separated list of keywords to hide"] = "Durch Komma getrennte Liste von Schlüsselwörtern die verborgen werden sollen";
 $a->strings["Use /expression/ to provide regular expressions"] = "Verwende /expression/ um reguläre Ausdrücke zu verwenden";
@@ -1090,9 +1094,15 @@ $a->strings["Drupal site URL"] = "URL der Drupal Seite";
 $a->strings["Drupal site uses clean URLS"] = "Drupal Seite verwendet bereinigte URLs";
 $a->strings["Post to Drupal by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei Drupal";
 $a->strings["Post from Friendica"] = "Beitrag via Friendica";
+$a->strings["Startpage Settings"] = "Startseiten-Einstellungen";
+$a->strings["Home page to load after login  - leave blank for profile wall"] = "Seite, die nach dem Anmelden geladen werden soll. Leer = Pinnwand";
+$a->strings["Examples: &quot;network&quot; or &quot;notifications/system&quot;"] = "Beispiele: network, notifications/system";
 $a->strings["Geonames settings updated."] = "Geonames Einstellungen aktualisiert";
 $a->strings["Geonames Settings"] = "Geonames Einstellungen";
 $a->strings["Enable Geonames Plugin"] = "Geonames Plugin aktivieren";
+$a->strings["Your account on %s will expire in a few days."] = "Dein Konto auf %s wird in ein paar Tagen verfallen.";
+$a->strings["Your Friendica account is about to expire."] = "Dein Friendica-Account wird in Kürze auslaufen.";
+$a->strings["Hi %1\$s,\n\nYour account on %2\$s will expire in less than five days. You may keep your account by logging in at least once every 30 days"] = "Hallo %1\$s,\n\ndein Account auf %2\$s wird in weniger als fünf Tagen auslaufen. Du kannst das verhindern, indem du dich mindestens einmal alle 30 Tage anmeldest.";
 $a->strings["Upload a file"] = "Datei hochladen";
 $a->strings["Drop files here to upload"] = "Ziehe Dateien hierher, um sie hochzuladen";
 $a->strings["Failed"] = "Fehlgeschlagen";
@@ -1108,13 +1118,13 @@ $a->strings["Site Owner"] = "Betreiber der Seite";
 $a->strings["Email Address"] = "Email Adresse";
 $a->strings["Postal Address"] = "Postalische Anschrift";
 $a->strings["The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon."] = "Das Impressums-Plugin muss noch konfiguriert werden.<br />Bitte gebe mindestens den <tt>Betreiber</tt> in der Konfiguration an. Alle weiteren Parameter werden in der README-Datei des Addons erläutert.";
-$a->strings["The page operators name."] = "Name des Server-Administrators";
+$a->strings["The page operators name."] = "Name des Serveradministrators";
 $a->strings["Site Owners Profile"] = "Profil des Seitenbetreibers";
-$a->strings["Profile address of the operator."] = "Profil-Adresse des Server-Administrators";
+$a->strings["Profile address of the operator."] = "Profil-Adresse des Serveradministrators";
 $a->strings["How to contact the operator via snail mail. You can use BBCode here."] = "Kontaktmöglichkeiten zum Administrator via Schneckenpost. Du kannst BBCode verwenden.";
 $a->strings["Notes"] = "Hinweise";
 $a->strings["Additional notes that are displayed beneath the contact information. You can use BBCode here."] = "Zusätzliche Informationen die neben den Kontaktmöglichkeiten angezeigt werden. Du kannst BBCode verwenden.";
-$a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "Wie erreichts man den Betreiber per Email. (Adresse wird verschleiert dargestellt)";
+$a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "Wie man den Betreiber per Email erreicht. (Adresse wird verschleiert dargestellt)";
 $a->strings["Footer note"] = "Fußnote";
 $a->strings["Text for the footer. You can use BBCode here."] = "Text für die Fußzeile. Du kannst BBCode verwenden.";
 $a->strings["Report Bug"] = "Fehlerreport erstellen";
@@ -1129,14 +1139,14 @@ $a->strings[":-)"] = ":-)";
 $a->strings[":-("] = ":-(";
 $a->strings["lol"] = "lol";
 $a->strings["Quick Comment Settings"] = "Schnell-Kommentar Einstellungen";
-$a->strings["Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies."] = "Kurz-Kommentare findet man in der Nähe der Kommentar-Boxen. Ein Klick darauf erstellt einfache Antworten.";
+$a->strings["Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies."] = "Kurzkommentare findet man in der Nähe der Kommentarboxen. Ein Klick darauf erstellt einfache Antworten.";
 $a->strings["Enter quick comments, one per line"] = "Gib einen Schnell-Kommentar pro Zeile ein";
 $a->strings["Quick Comment settings saved."] = "Schnell-Kommentare Einstellungen gespeichert";
 $a->strings["Tile Server URL"] = "Tile Server URL";
 $a->strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "Eine Liste <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">öffentlicher Tile Server</a>";
 $a->strings["Default zoom"] = "Standard Zoom";
 $a->strings["The default zoom level. (1:world, 18:highest)"] = "Standard Zoomlevel (1: Welt; 18: höchstes)";
-$a->strings["The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail."] = "Mit dem MathJax Addon können mathematische Formeln, die mit LaTeX geschrieben wurden, dargestellt werden. Die Formel wird mit den üblichen $$ oder einem eqnarray Block gekennzeichnet. Formeln werden in allen Beiträgen auf deiner Pinnwand, dem Netzwerk-Stream sowie privaten Nachrichten gerendert.";
+$a->strings["The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail."] = "Mit dem MathJax Addon können mathematische Formeln, die mit LaTeX geschrieben wurden, dargestellt werden. Die Formel wird mit den üblichen $$ oder einem eqnarray Block gekennzeichnet. Formeln werden in allen Beiträgen auf deiner Pinnwand, dem Netzwerkstream sowie privaten Nachrichten gerendert.";
 $a->strings["Use the MathJax renderer"] = "MathJax verwenden";
 $a->strings["MathJax Base URL"] = "MathJax Basis-URL";
 $a->strings["The URL for the javascript file that should be included to use MathJax. Can be either the MathJax CDN or another installation of MathJax."] = "Die URL der MathJax Javascript-Datei, die verwendet werden soll. Diese kann entweder aus der MathJax CDN oder einer anderen Quelle stammen.";
@@ -1153,7 +1163,6 @@ $a->strings["Select default avatar image if none was found at Gravatar. See READ
 $a->strings["Rating of images"] = "Bildbewertung";
 $a->strings["Select the appropriate avatar rating for your site. See README"] = "Wähle eine angemessene Bildbewertung für Deinen Server. Schaue auch sonst im README nach.";
 $a->strings["Gravatar settings updated."] = "Gravatar Einstellungen aktualisiert.";
-$a->strings["Your account on %s will expire in a few days."] = "Dein Konto auf %s wird in ein paar Tagen verfallen.";
 $a->strings["Your Friendica test account is about to expire."] = "Dein Friendica Test Konto wird bald verfallen.";
 $a->strings["Hi %1\$s,\n\nYour test account on %2\$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at http://dir.friendica.com/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."] = "Hallo %1\$s,\n\ndein Test-Konto auf %2\$s wird in weniger als fünf Tagen verfallen. Wir hoffen, dass dir dieser Testlauf gefallen hat, so dass du die Gelegenheit nutzt und dir eine feste Friendica-Site für deine integrierte Social-Network-Kommunikation suchst. Eine Liste öffentlicher Sites findest du auf http://dir.friendica.com/siteinfo. Um mehr Information darüber zu bekommen, wie man einen eigenen Friendica-Server aufsetzt, kannst du auch einen Blick auf die Friendica Projektseite werfen: http://friendica.com";
 $a->strings["\"pageheader\" Settings"] = "\"pageheader\"-Einstellungen";
@@ -1188,7 +1197,7 @@ $a->strings["If enabled all your <strong>public</strong> postings can be posted
 $a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Hinweis</strong>: Aufgrund deiner Privatsphären-Einstellungen (<em>Profil-Details vor unbekannten Betrachtern verbergen?</em>) wird der Link, der eventuell an deinen StatusNet Account angehängt wird, um auf den original Artikel zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde.";
 $a->strings["Allow posting to StatusNet"] = "Veröffentlichung bei StatusNet erlauben";
 $a->strings["Send public postings to StatusNet by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei StatusNet";
-$a->strings["Send #tag links to StatusNet"] = "#Tags nach StatusNet senden";
+$a->strings["Send linked #-tags and @-names to StatusNet"] = "Sende verlinkte #-Tags und @-Namen nach StatusNet";
 $a->strings["Clear OAuth configuration"] = "OAuth-Konfiguration löschen";
 $a->strings["API URL"] = "API-URL";
 $a->strings["Post to Tumblr"] = "Bei Tumblr veröffentlichen";
@@ -1212,6 +1221,8 @@ $a->strings["WordPress username"] = "WordPress-Benutzername";
 $a->strings["WordPress password"] = "WordPress-Passwort";
 $a->strings["WordPress API URL"] = "WordPress-API-URL";
 $a->strings["Post to WordPress by default"] = "Standardmäßig auf WordPress veröffentlichen";
+$a->strings["Provide a backlink to the Friendica post"] = "Einen zurück zum Friendica-Beitrag hinzufügen";
+$a->strings["Read the original post and comment stream on Friendica"] = "Den Original-Beitrag samt Kommentaren bei Friendica lesen";
 $a->strings["\"Show more\" Settings"] = "\"Mehr zeigen\" Einstellungen";
 $a->strings["Enable Show More"] = "Aktiviere \"Mehr zeigen\"";
 $a->strings["Cutting posts after how much characters"] = "Begrenze Beiträge nach einer bestimmten Anzahl an Buchstaben";
@@ -1234,7 +1245,7 @@ $a->strings["If enabled all your <strong>public</strong> postings can be posted
 $a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Hinweis</strong>: Aufgrund deiner Privatsphären-Einstellungen (<em>Profil-Details vor unbekannten Betrachtern verbergen?</em>) wird der Link, der eventuell an an deinen Twitter Account angehängt wird, um auf den original Artikel zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde.";
 $a->strings["Allow posting to Twitter"] = "Veröffentlichung bei Twitter erlauben";
 $a->strings["Send public postings to Twitter by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei Twitter";
-$a->strings["Send #tag links to Twitter"] = "#Tags nach Twitter senden";
+$a->strings["Send linked #-tags and @-names to Twitter"] = "Sende verlinkte #-Tags und @-Namen nach Twitter";
 $a->strings["Consumer key"] = "Consumer Key";
 $a->strings["Consumer secret"] = "Consumer Secret";
 $a->strings["IRC Settings"] = "IRC Einstellungen";
@@ -1255,8 +1266,10 @@ $a->strings["Posterous Post Settings"] = "Posterous Beitrags-Einstellungen";
 $a->strings["Enable Posterous Post Plugin"] = "Posterous-Plugin aktivieren";
 $a->strings["Posterous login"] = "Posterous-Anmeldename";
 $a->strings["Posterous password"] = "Posterous-Passwort";
+$a->strings["Posterous site ID"] = "Posterous site ID";
+$a->strings["Posterous API token"] = "Posterous API token";
 $a->strings["Post to Posterous by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei Posterous";
-$a->strings["Theme settings"] = "Themen Einstellungen";
+$a->strings["Theme settings"] = "Themeneinstellungen";
 $a->strings["Set resize level for images in posts and comments (width and height)"] = "Wähle das Vergrößerungsmaß für Bilder in Beiträgen und Kommentaren (Höhe und Breite)";
 $a->strings["Set font-size for posts and comments"] = "Schriftgröße für Beiträge und Kommentare festlegen";
 $a->strings["Set theme width"] = "Theme Breite festlegen";
@@ -1277,14 +1290,22 @@ $a->strings["Find Friends"] = "Freunde finden";
 $a->strings["Local Directory"] = "Lokales Verzeichnis";
 $a->strings["Similar Interests"] = "Ähnliche Interessen";
 $a->strings["Invite Friends"] = "Freunde einladen";
-$a->strings["Earth View"] = "Earth View";
+$a->strings["Earth Layers"] = "Earth Layers";
+$a->strings["Set zoomfactor for Earth Layers"] = "Zoomfaktor der Earth Layer";
+$a->strings["Set longitude (X) for Earth Layers"] = "Longitude (X) der Earth Layer";
+$a->strings["Set latitude (Y) for Earth Layers"] = "Latitude (Y) der Earth Layer";
 $a->strings["Help or @NewHere ?"] = "Hilfe oder @NewHere";
 $a->strings["Connect Services"] = "Verbinde Dienste";
 $a->strings["Last Tweets"] = "Neueste Tweets";
-$a->strings["Set twitter search term"] = "";
+$a->strings["Set twitter search term"] = "Twitter Suchbegriff";
+$a->strings["don't show"] = "nicht zeigen";
+$a->strings["show"] = "zeigen";
+$a->strings["Show/hide boxes at right-hand column:"] = "Rahmen auf der rechten Seite anzeigen/verbergen";
 $a->strings["Set line-height for posts and comments"] = "Liniengröße für Beiträge und Kommantare festlegen";
 $a->strings["Set resolution for middle column"] = "Auflösung für die Mittelspalte setzen";
 $a->strings["Set color scheme"] = "Wähle Farbschema";
+$a->strings["Set zoomfactor for Earth Layer"] = "Zoomfaktor der Earth Layer";
+$a->strings["Last tweets"] = "Neueste Tweets";
 $a->strings["Alignment"] = "Ausrichtung";
 $a->strings["Left"] = "Links";
 $a->strings["Center"] = "Mitte";
@@ -1295,6 +1316,7 @@ $a->strings["j F"] = "j F";
 $a->strings["Birthday:"] = "Geburtstag:";
 $a->strings["Age:"] = "Alter:";
 $a->strings["Status:"] = "Status:";
+$a->strings["for %1\$d %2\$s"] = "für %1\$d %2\$s";
 $a->strings["Homepage:"] = "Homepage:";
 $a->strings["Tags:"] = "Tags";
 $a->strings["Religion:"] = "Religion:";
@@ -1397,7 +1419,6 @@ $a->strings["%d Contact"] = array(
 	0 => "%d Kontakt",
 	1 => "%d Kontakte",
 );
-$a->strings["Search"] = "Suche";
 $a->strings["Monday"] = "Montag";
 $a->strings["Tuesday"] = "Dienstag";
 $a->strings["Wednesday"] = "Mittwoch";
@@ -1436,6 +1457,7 @@ $a->strings["view full size"] = "Volle Größe anzeigen";
 $a->strings["Embedded content"] = "Eingebetteter Inhalt";
 $a->strings["Embedding disabled"] = "Einbettungen deaktiviert";
 $a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Eine gelöschte Gruppe mit diesem Namen wurde wiederbelebt. Bestehende Berechtigungseinstellungen <strong>könnten</strong> auf diese Gruppe oder zukünftige Mitglieder angewandt werden. Falls du dies nicht möchtest, erstelle bitte eine andere Gruppe mit einem anderen Namen.";
+$a->strings["Default privacy group for new contacts"] = "Voreingestellte Gruppe für neue Kontakte";
 $a->strings["Everybody"] = "Alle Kontakte";
 $a->strings["edit"] = "bearbeiten";
 $a->strings["Groups"] = "Gruppen";
@@ -1458,7 +1480,7 @@ $a->strings["People directory"] = "Nutzerverzeichnis";
 $a->strings["Conversations from your friends"] = "Unterhaltungen deiner Kontakte";
 $a->strings["Friend Requests"] = "Kontaktanfragen";
 $a->strings["See all notifications"] = "Alle Benachrichtigungen anzeigen";
-$a->strings["Mark all system notifications seen"] = "Markiere alle System-Benachrichtigungen als gelesen";
+$a->strings["Mark all system notifications seen"] = "Markiere alle Systembenachrichtigungen als gelesen";
 $a->strings["Private mail"] = "Private Email";
 $a->strings["Inbox"] = "Eingang";
 $a->strings["Outbox"] = "Ausgang";
@@ -1488,7 +1510,7 @@ $a->strings["Saved Folders"] = "Gespeicherte Ordner";
 $a->strings["Everything"] = "Alles";
 $a->strings["Categories"] = "Kategorien";
 $a->strings["Logged out."] = "Abgemeldet.";
-$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Beim versuch dich mit der von dir angegebenen OpenID anzumelden trat ein Problem auf. Bitte überprüfe dass du die OpenID richtig geschrieben hast.";
+$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Beim Versuch dich mit der von dir angegebenen OpenID anzumelden trat ein Problem auf. Bitte überprüfe, dass du die OpenID richtig geschrieben hast.";
 $a->strings["The error message was:"] = "Die Fehlermeldung lautete:";
 $a->strings["Miscellaneous"] = "Verschiedenes";
 $a->strings["year"] = "Jahr";
@@ -1514,8 +1536,6 @@ $a->strings["Image/photo"] = "Bild/Foto";
 $a->strings["Cannot locate DNS info for database server '%s'"] = "Kann die DNS Informationen für den Datenbanken Server '%s' nicht ermitteln.";
 $a->strings["[no subject]"] = "[kein Betreff]";
 $a->strings["Visible to everybody"] = "Für jeden sichtbar";
-$a->strings["show"] = "zeigen";
-$a->strings["don't show"] = "nicht zeigen";
 $a->strings["Friendica Notification"] = "Friendica-Benachrichtigung";
 $a->strings["Thank You,"] = "Danke,";
 $a->strings["%s Administrator"] = "der Administrator von %s";
@@ -1560,15 +1580,31 @@ $a->strings["A new person is sharing with you at "] = "Eine neue Person teilt mi
 $a->strings["You have a new follower at "] = "Du hast einen neuen Kontakt auf ";
 $a->strings["image/photo"] = "Bild/Foto";
 $a->strings["link"] = "Verweis";
+$a->strings["An invitation is required."] = "Du benötigst eine Einladung.";
+$a->strings["Invitation could not be verified."] = "Die Einladung konnte nicht überprüft werden.";
+$a->strings["Invalid OpenID url"] = "Ungültige OpenID URL";
+$a->strings["Please enter the required information."] = "Bitte trage die erforderlichen Informationen ein.";
+$a->strings["Please use a shorter name."] = "Bitte verwende einen kürzeren Namen.";
+$a->strings["Name too short."] = "Der Name ist zu kurz.";
+$a->strings["That doesn't appear to be your full (First Last) name."] = "Das scheint nicht dein kompletter Name (Vor- und Nachname) zu sein.";
+$a->strings["Your email domain is not among those allowed on this site."] = "Die Domain deiner E-Mail Adresse ist auf dieser Seite nicht erlaubt.";
+$a->strings["Not a valid email address."] = "Keine gültige E-Mail-Adresse.";
+$a->strings["Cannot use that email."] = "Konnte diese E-Mail-Adresse nicht verwenden.";
+$a->strings["Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and must also begin with a letter."] = "Dein Spitzname darf nur aus Buchstaben und Zahlen (\"a-z\",\"0-9\", \"_\" und \"-\") bestehen, außerdem muss er mit einem Buchstaben beginnen.";
+$a->strings["Nickname is already registered. Please choose another."] = "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen.";
+$a->strings["Nickname was once registered here and may not be re-used. Please choose another."] = "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen.";
+$a->strings["SERIOUS ERROR: Generation of security keys failed."] = "FATALER FEHLER: Sicherheitsschlüssel konnten nicht erzeugt werden.";
+$a->strings["An error occurred during registration. Please try again."] = "Wärend der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal.";
+$a->strings["An error occurred creating your default profile. Please try again."] = "Bei der Erstellung des Standardprofils ist ein Fehler aufgetreten. Bitte versuche es noch einmal.";
 $a->strings["Welcome "] = "Willkommen ";
 $a->strings["Please upload a profile photo."] = "Bitte lade ein Profilbild hoch.";
 $a->strings["Welcome back "] = "Willkommen zurück ";
-$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Das Sicherheits-Merkmal war nicht korrekt. Das passiert meistens wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden).";
+$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden).";
 $a->strings["stopped following"] = "wird nicht mehr gefolgt";
 $a->strings["View Status"] = "Pinnwand anschauen";
 $a->strings["View Profile"] = "Profil anschauen";
 $a->strings["View Photos"] = "Bilder anschauen";
-$a->strings["Network Posts"] = "Netzwerk-Beiträge";
+$a->strings["Network Posts"] = "Netzwerkbeiträge";
 $a->strings["Edit Contact"] = "Kontakt bearbeiten";
 $a->strings["Send PM"] = "Private Nachricht senden";
 $a->strings["post/item"] = "Nachricht/Beitrag";

view/dfrn_req_confirm.tpl

@@ -11,6 +11,10 @@ $please
 <input type="hidden" name="localconfirm" value="1" />
 $aes_allow
 
+<label id="dfrn-request-homecoming-hide-label" for="dfrn-request-homecoming-hide">$hidethem</label>
+<input type="checkbox" name="hidden-contact" value="1" {{ if $hidechecked }}checked="checked" {{ endif }} />
+
+
 <div id="dfrn-request-homecoming-submit-wrapper" >
 <input id="dfrn-request-homecoming-submit" type="submit" name="submit" value="$submit" />
 </div>

view/diaspora_like_relay.tpl

@@ -5,9 +5,9 @@
       <target_type>$target_type</target_type>
       <parent_guid>$parent_guid</parent_guid>
       <parent_author_signature>$parentsig</parent_author_signature>
-      <author_signature>$authrosig</author_signature>
+      <author_signature>$authorsig</author_signature>
       <positive>$positive</positive>
       <diaspora_handle>$handle</diaspora_handle>
     </like>
   </post>
-</XML>
+</XML>

view/diaspora_relay_retraction.tpl

@@ -0,0 +1,10 @@
+<XML>
+  <post>
+    <relayable_retraction>
+      <target_type>$type</target_type>
+      <target_guid>$guid</target_guid>
+      <target_author_signature>$signature</target_author_signature>
+      <sender_handle>$handle</sender_handle>
+    </relayable_retraction>
+  </post>
+</XML>

view/diaspora_relayable_retraction.tpl

@@ -0,0 +1,11 @@
+<XML>
+  <post>
+    <relayable_retraction>
+      <target_type>$target_type</target_type>
+      <target_guid>$guid</target_guid>
+      <parent_author_signature>$parentsig</parent_author_signature>
+      <target_author_signature>$authorsig</target_author_signature>
+      <sender_handle>$handle</sender_handle>
+    </relayable_retraction>
+  </post>
+</XML>

view/eo/lostpass_eml.tpl

@@ -0,0 +1,32 @@
+
+Kara $[username],
+	$[sitename] ricevis peton por rekomencigi vian pasvorton. 
+Por konfirmi la peton, bonvolu klaki la sekvantan konfirmligilon 
+aŭ alglui ĝin en la adreskampo de via retumilo. 
+
+Se vi NE petis tiun ŝanĝon, bonvolu NE KLAKU la 
+sekvantan ligilon kaj ignoru aŭ forvisu ĉi-mesaĝon. 
+
+Ni ne ŝanĝu vian pasvorton se ni ne povas kontroli ĉu estas vi
+kiu petis lala ŝanĝon. 
+
+Sekvu ĉi tion ligilon por konfirmi vian identecon:
+
+$[reset_link]
+
+Poste, vi ricevos mesaĝon enhavonte la novan pasvorton.
+
+Vi eblas ŝangi la pasvorton ĉe viaj kontdoagordoj paĝo post ensaluti.
+
+La akreditaĵoj estas:
+
+Retejo:»$[siteurl]
+Salutnomo:»$[email]
+
+
+
+
+Salutoj,
+	$[sitename] administranto
+
+ 

view/eo/strings.php

@@ -36,7 +36,7 @@ $a->strings["Suggest a friend for %s"] = "Sugesti amikon por %s";
 $a->strings["Event description and start time are required."] = "Okazo bezonas priskribon kaj startotempon.";
 $a->strings["l, F j"] = "l, F j";
 $a->strings["Edit event"] = "Redakti okazon";
-$a->strings["link to source"] = "ligi al fonto";
+$a->strings["link to source"] = "ligilo al fonto";
 $a->strings["Events"] = "Okazoj";
 $a->strings["Create New Event"] = "Krei novan okazon";
 $a->strings["Previous"] = "antaŭa";
@@ -751,6 +751,10 @@ $a->strings["Network timeout"] = "Reta tempolimo";
 $a->strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = "Valoro en sekundoj. Uzu 0 por mallimitigi (ne rekomendata).";
 $a->strings["Delivery interval"] = "Intervalo de liverado";
 $a->strings["Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers."] = "Malfruigi fonan liveradon dum tiom da sekundoj por malpliigi la ŝargon de la sistemo. Rekomendoj: 4-5 por komunaj serviloj, 2-3 por virtualaj privataj serviloj, 0-1 por grandaj dediĉitaj serviloj.";
+$a->strings["Poll interval"] = "Enketintervalo";
+$a->strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "Malfruigi fonajn enketprocesojn je tiom da sekundoj por malpliigi la ŝargon de la sistemo. Se 0, uzas la liverintervalon.";
+$a->strings["Maximum Load Average"] = "Maksimuma Meza Sistemŝargo";
+$a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Maksimuma sistemŝargo post kiu livero- kaj enketprocesoj estos prokrastinataj. - Defaŭlte 50.";
 $a->strings["Update has been marked successful"] = "Ĝisdatigo estas markita sukcesa";
 $a->strings["Executing %s failed. Check system logs."] = "Ne sukcesis plenumi %s. Kontrolu la sistemprotokolojn.";
 $a->strings["Update %s was successfully applied."] = "Sukcese aplikis la ĝisdatigo %s.";
@@ -829,12 +833,14 @@ $a->strings["No compatible communication protocols or feeds were discovered."] =
 $a->strings["The profile address specified does not provide adequate information."] = "La specifita profiladreso ne enhavas sufiĉe da informoj.";
 $a->strings["An author or name was not found."] = "Ne trovis aŭtoron aŭ nomon.";
 $a->strings["No browser URL could be matched to this address."] = "Neniu retuma URL adreso kongruas al la adreso.";
+$a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "Ne eblas kongrui @-stilan identecon adreson al iu konata protokolo au retpoŝtadreso.";
+$a->strings["Use mailto: in front of address to force email check."] = "Uzu mailto: antaŭ la adreso por devigi la testadon per retpoŝto.";
 $a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "Tiu profila adreso apartenas al retejo kiu estas maŝaltita je ĉi tiu retejo.";
 $a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Profilo limigata. Ĉi persono ne eblos ricevi rektajn/personajn atentigojn de vi. ";
 $a->strings["Unable to retrieve contact information."] = "Ne eblas ricevi kontaktinformojn.";
 $a->strings["following"] = "sekvanta";
 $a->strings["Common Friends"] = "Komunaj Amikoj";
-$a->strings["No friends in common."] = "Neniom da komunaj amikoj.";
+$a->strings["No contacts in common."] = "Neniom da komunaj kontaktoj.";
 $a->strings["Item has been removed."] = "Elemento estas forviŝita.";
 $a->strings["Applications"] = "Programoj";
 $a->strings["No installed applications."] = "Neniom da instalitaj programoj.";
@@ -920,6 +926,7 @@ $a->strings["No entries."] = "Neniom da afiŝoj.";
 $a->strings["Friend Suggestions"] = "Amikosugestoj";
 $a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Neniu sugestoj disponeblas. Se ĉi tiu estas nova retejo, bonvolu reprovi post 24 horoj.";
 $a->strings["Ignore/Hide"] = "Ignori/Kaŝi";
+$a->strings["%s [%s]"] = "%s [%s]";
 $a->strings["Global Directory"] = "Tutmonda Katalogo";
 $a->strings["Find on this site"] = "Trovi en ĉi retejo";
 $a->strings["Site Directory"] = "Reteja Katalogo";
@@ -970,6 +977,8 @@ $a->strings["Install Facebook connector for this account."] = "Instali la Facebo
 $a->strings["Remove Facebook connector"] = "Forigi la Facebook konektilon.";
 $a->strings["Re-authenticate [This is necessary whenever your Facebook password is changed.]"] = "Reaŭtentiĝi [Tio estas bezonata ĉiam kiam vi ŝanĝis vian pasvorton ĉe Facebook.]";
 $a->strings["Post to Facebook by default"] = "Ĉiam afiŝi al Facebook.";
+$a->strings["Facebook friend linking has been disabled on this site. The following settings will have no effect."] = "Ligado kun Facebook amikoj estas malaktivita ĉe tiu retejo. La sekvantaj agordoj do ne havas validecon.";
+$a->strings["Facebook friend linking has been disabled on this site. If you disable it, you will be unable to re-enable it."] = "Ligado kun Facebook amikoj estas malaktivita ĉe tiu retejo. Se vi malŝaltas ĝin, vi ne eblos ree ŝalti ĝin.";
 $a->strings["Link all your Facebook friends and conversations on this website"] = "Alligu ĉiujn viajn Facebook amikojn kaj konversaciojn je ĉi-tiu retejo.";
 $a->strings["Facebook conversations consist of your <em>profile wall</em> and your friend <em>stream</em>."] = "Facebok konversacioj konsistas el via <em>profilmuro</em> kaj la <em>fluo</em> de viaj amikoj.";
 $a->strings["On this website, your Facebook friend stream is only visible to you."] = "Je ĉi-tiu retejo, la fluo de viaj amikoj ĉe Facebook nur videblas al vi.";
@@ -1251,10 +1260,13 @@ $a->strings["Posterous Post Settings"] = "Agordoj pri afiŝoj ĉe Posterous";
 $a->strings["Enable Posterous Post Plugin"] = "Ŝalti la Poserous-afiŝo kromprogramon";
 $a->strings["Posterous login"] = "Posterous salutnomo";
 $a->strings["Posterous password"] = "Posterous pasvorto";
+$a->strings["Posterous site ID"] = "Idento de Posterous retejo";
+$a->strings["Posterous API token"] = "API ĵetono de Posterous retejo";
 $a->strings["Post to Posterous by default"] = "Defaŭlte afiŝi al Posterous";
 $a->strings["Theme settings"] = "Agordoj pri la etoso";
 $a->strings["Set resize level for images in posts and comments (width and height)"] = "Agordi la regrandignivelo por bildoj en afiŝoj kaj komentoj (larĝo kaj alto)";
 $a->strings["Set font-size for posts and comments"] = "Agordi la tiparan grandon por afiŝoj kaj komentoj";
+$a->strings["Set theme width"] = "Agordi la larĝo por la etoso";
 $a->strings["Color scheme"] = "Kolorskemo";
 $a->strings["Your posts and conversations"] = "Viaj afiŝoj kaj komunikadoj";
 $a->strings["Your profile page"] = "Via profilo";
@@ -1272,8 +1284,17 @@ $a->strings["Find Friends"] = "Trovi Amikojn";
 $a->strings["Local Directory"] = "Loka Katalogo";
 $a->strings["Similar Interests"] = "Similaj Interesoj";
 $a->strings["Invite Friends"] = "Inviti amikojn";
+$a->strings["Earth Layers"] = "Tertavoloj (Earth Layers)";
+$a->strings["Set zoomfactor for Earth Layer"] = "Agordi zoman faktoron de Tertavolo";
+$a->strings["Set longitude (X) for Earth Layer"] = "Agordi longitudon (X) de Tertavolo";
+$a->strings["Set latitude (Y) for Earth Layer"] = "Agordi latitudon (Y) de Tertavolo";
 $a->strings["Help or @NewHere ?"] = "Helpu aŭ @NewHere ?";
 $a->strings["Connect Services"] = "Konekti Servojn";
+$a->strings["Last Tweets"] = "Ĵusaj Pepaĵoj";
+$a->strings["Set twitter search term"] = "Agordi Twitter serĉtekston";
+$a->strings["don't show"] = "kaŝi";
+$a->strings["show"] = "montri";
+$a->strings["Show/hide boxes at right-hand coloumn:"] = "Montri/kaŝi kestojn en la desktra kolumno:";
 $a->strings["Set line-height for posts and comments"] = "Agordi la linigrandon por afiŝoj kaj komentoj";
 $a->strings["Set resolution for middle column"] = "Agordi la distingivon por la meza kolumno";
 $a->strings["Set color scheme"] = "Agordi Kolorskemon";
@@ -1410,9 +1431,9 @@ $a->strings["October"] = "Oktobro";
 $a->strings["November"] = "Novembro";
 $a->strings["December"] = "Decembro";
 $a->strings["bytes"] = "bajtoj";
-$a->strings["Categories:"] = "Kategorioj:";
 $a->strings["remove"] = "forviŝi";
 $a->strings["[remove]"] = "[forviŝi]";
+$a->strings["Categories:"] = "Kategorioj:";
 $a->strings["Filed under:"] = "Enarkivigita kiel:";
 $a->strings["Click to open/close"] = "Klaku por malfermi/fermi";
 $a->strings["default"] = "defaŭlta";
@@ -1479,10 +1500,6 @@ $a->strings["All Networks"] = "Ĉiuj Retoj";
 $a->strings["Saved Folders"] = "Konservitaj Dosierujoj";
 $a->strings["Everything"] = "Ĉio";
 $a->strings["Categories"] = "Kategorioj";
-$a->strings["%d friend in common"] = array(
-	0 => "%d komuna amiko",
-	1 => "%d komunaj amikoj",
-);
 $a->strings["Logged out."] = "Elsalutita.";
 $a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Okazis problemo ensalutinta kun via OpenID. Bonvolu kontroli la ID.";
 $a->strings["The error message was:"] = "La erarmesaĝo estis:";
@@ -1510,8 +1527,6 @@ $a->strings["Image/photo"] = "Bildo";
 $a->strings["Cannot locate DNS info for database server '%s'"] = "Ne trovis DNS informojn por datumbaza servilo '%s'.";
 $a->strings["[no subject]"] = "[neniu temo]";
 $a->strings["Visible to everybody"] = "Videbla al ĉiuj";
-$a->strings["show"] = "montri";
-$a->strings["don't show"] = "kaŝi";
 $a->strings["Friendica Notification"] = "Friendica Atentigo";
 $a->strings["Thank You,"] = "Dankon,";
 $a->strings["%s Administrator"] = "%s Administranto";
@@ -1639,7 +1654,7 @@ $a->strings["[today]"] = "[hodiaŭ]";
 $a->strings["Birthday Reminders"] = "Memorigilo pri naskiĝtagoj";
 $a->strings["Birthdays this week:"] = "Naskiĝtagoj ĉi-semajne:";
 $a->strings["[No description]"] = "[Neniu priskribo]";
-$a->strings["Event Reminders"] = "Memorigiloj pri Okazoj";
+$a->strings["Event Reminders"] = "Memorigilo pri Okazoj";
 $a->strings["Events this week:"] = "Okazoj ĉi-semajne:";
 $a->strings["Status Messages and Posts"] = "Ŝtatmesaĝoj kaj Afiŝoj";
 $a->strings["Profile Details"] = "Profildetaloj";

view/eo/update_fail_eml.tpl

@@ -0,0 +1,11 @@
+Saluton! 
+Mi estas $sitename.   
+La programistoj de Frienda eldonis ĝisdatigon $update antaŭ ne longe, 
+sed kiam mi provis instali ĝin, io terure malsukcesis.  
+Tio tuj bezonas riparon kaj mi ne povas fari ĝin sole. Bonvolu kontakti 
+Friendica programistion se vi ne povas helpi vin mem. Mia datumbazo eble ne plu validas. 
+
+La erarmesaĝo estas '$error'.   
+
+Mi bedaŭras, 
+via Friendica servilo ĉe $siteurl

view/generic_links_widget.tpl

@@ -1,4 +1,4 @@
-<div class="widget">
+<div class="widget{{ if $class }} $class{{ endif }}">
 	{{if $title}}<h3>$title</h3>{{endif}}
 	{{if $desc}}<div class="desc">$desc</div>{{endif}}
 	

view/group_selection.tpl

@@ -0,0 +1,8 @@
+<div class="field custom">
+<label for="group-selection" id="group-selection-lbl">$label</label>
+<select name="group-selection" id="group-selection" >
+{{ for $groups as $group }}
+<option value="$group.id" {{ if $group.selected }}selected="selected"{{ endif }} >$group.name</option>
+{{ endfor }}
+</select>
+</div>

view/head.tpl

@@ -29,6 +29,7 @@
 <script>
 
 	var updateInterval = $update_interval;
+	var localUser = {{ if $local_user }}$local_user{{ else }}false{{ endif }};
 
 	function confirmDelete() { return confirm("$delitem"); }
 	function commentOpen(obj,id) {

view/install_checks.tpl

@@ -1,11 +1,11 @@
 <h1>$title</h1>
 <h2>$pass</h2>
-<form  action="$baseurl/install" method="post">
+<form  action="$baseurl/index.php?q=install" method="post">
 <table>
 {{ for $checks as $check }}
-	<tr><td>$check.title </td><td><span class="icon s22 {{if $check.status}}on{{else}}off{{endif}}"></td><td>{{if $check.required}}(required){{endif}}</td></tr>
+	<tr><td>$check.title </td><td><span class="icon s22 {{if $check.status}}on{{else}}{{if$check.required}}off{{else}}yellow{{endif}}{{endif}}"></td><td>{{if $check.required}}(required){{endif}}</td></tr>
 	{{if $check.help }}
-	<tr><td colspan="3">$check.help</td></tr>
+	<tr><td colspan="3"><blockquote>$check.help</blockquote></td></tr>
 	{{endif}}
 {{ endfor }}
 </table>

view/pagetypes.tpl

@@ -1,4 +1,5 @@
 	{{inc field_radio.tpl with $field=$page_normal }}{{endinc}}
-	{{inc field_radio.tpl with $field=$page_soapbox }}{{endinc}}
 	{{inc field_radio.tpl with $field=$page_community }}{{endinc}}
+	{{inc field_radio.tpl with $field=$page_prvgroup }}{{endinc}}
+	{{inc field_radio.tpl with $field=$page_soapbox }}{{endinc}}
 	{{inc field_radio.tpl with $field=$page_freelove }}{{endinc}}

view/photo_album.tpl

@@ -1,6 +1,6 @@
 <div class="photo-album-image-wrapper" id="photo-album-image-wrapper-$id">
 	<a href="$photolink" class="photo-album-photo-link" id="photo-album-photo-link-$id" title="$phototitle">
-		<img src="$imgsrc" alt="$imgalt" title="$phototitle" class="photo-album-photo lframe  resize" id="photo-album-photo-$id" />
+		<img src="$imgsrc" alt="$imgalt" title="$phototitle" class="photo-album-photo lframe resize$twist" id="photo-album-photo-$id" />
 		<p class='caption'>$desc</p>		
 	</a>
 </div>

view/photo_edit.tpl

@@ -17,6 +17,11 @@
 	<input name="newtag" id="photo-edit-newtag" size="84" title="$help_tags" type="text" />
 
 	<div id="photo-edit-tags-end"></div>
+	<div id="photo-edit-rotate-wrapper">
+		<div id="photo-edit-rotate-label">$rotate</div>
+		<input type="checkbox" name="rotate" value="1" />
+	</div>
+	<div id="photo-edit-rotate-end"></div>
 
 	<div id="photo-edit-perms" class="photo-edit-perms" >
 		<a href="#photo-edit-perms-select" id="photo-edit-perms-menu" class="button" title="$permissions"/>

view/photo_top.tpl

@@ -1,7 +1,7 @@
 
-<div class="photo-top-image-wrapper lframe" id="photo-top-image-wrapper-$id">
+<div class="photo-top-image-wrapper lframe" id="photo-top-image-wrapper-$photo.id">
 	<a href="$photo.link" class="photo-top-photo-link" id="photo-top-photo-link-$photo.id" title="$photo.title">
-		<img src="$photo.src" alt="$photo.alt" title="$photo.title" class="photo-top-photo" id="photo-top-photo-$photo.id" />
+		<img src="$photo.src" alt="$photo.alt" title="$photo.title" class="photo-top-photo$photo.twist" id="photo-top-photo-$photo.id" />
 	</a>
 	<div class="photo-top-album-name"><a href="$photo.album.link" class="photo-top-album-link" title="$photo.album.alt" >$photo.album.name</a></div>
 </div>

view/photos_recent.tpl

@@ -8,3 +8,4 @@
 	{{ inc photo_top.tpl }}{{ endinc }}
 {{ endfor }}
 </div>
+<div class="photos-end"></div>

view/profile_advanced.tpl

@@ -29,7 +29,7 @@
 {{ if $profile.marital }}
 <dl id="aprofile-marital" class="aprofile">
  <dt><span class="heart">&hearts;</span>  $profile.marital.0</dt>
- <dd>$profile.marital.1  {{ if $profile.marital.with }}($profile.marital.with){{ endif }}</dd>
+ <dd>$profile.marital.1{{ if $profile.marital.with }} ($profile.marital.with){{ endif }}{{ if $profile.howlong }} $profile.howlong{{ endif }}</dd>
 </dl>
 {{ endif }}
 
@@ -54,6 +54,13 @@
 </dl>
 {{ endif }}
 
+{{ if $profile.hometown }}
+<dl id="aprofile-hometown" class="aprofile">
+ <dt>$profile.hometown.0</dt>
+ <dd>$profile.hometown.1</dd>
+</dl>
+{{ endif }}
+
 {{ if $profile.politic }}
 <dl id="aprofile-politic" class="aprofile">
  <dt>$profile.politic.0</dt>

view/profile_edit.tpl

@@ -97,6 +97,12 @@ $hide_friends
 </div>
 <div id="profile-edit-region-end"></div>
 
+<div id="profile-edit-hometown-wrapper" >
+<label id="profile-edit-hometown-label" for="profile-edit-hometown" >$lbl_hometown </label>
+<input type="text" size="32" name="hometown" id="profile-edit-hometown" value="$hometown" />
+</div>
+<div id="profile-edit-hometown-end"></div>
+
 <div class="profile-edit-submit-wrapper" >
 <input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
 </div>
@@ -108,6 +114,9 @@ $marital
 </div>
 <label id="profile-edit-with-label" for="profile-edit-with" > $lbl_with </label>
 <input type="text" size="32" name="with" id="profile-edit-with" title="$lbl_ex1" value="$with" />
+<label id="profile-edit-howlong-label" for="profile-edit-howlong" > $lbl_howlong </label>
+<input type="text" size="32" name="howlong" id="profile-edit-howlong" title="$lbl_howlong" value="$howlong" />
+
 <div id="profile-edit-marital-end"></div>
 
 <div id="profile-edit-sexual-wrapper" >

view/prv_message.tpl

@@ -17,7 +17,7 @@ $select
 
 
 <div id="prvmail-submit-wrapper" >
-	<input type="submit" id="prvmail-submit" name="submit" value="Submit" tabindex="13" />
+	<input type="submit" id="prvmail-submit" name="submit" value="$submit" tabindex="13" />
 	<div id="prvmail-upload-wrapper" >
 		<div id="prvmail-upload" class="icon border camera" title="$upload" ></div>
 	</div> 

view/settings.tpl

@@ -56,9 +56,12 @@ $suggestme
 
 $unkmail
 
+
 {{inc field_input.tpl with $field=$cntunkmail }}{{endinc}}
 
 {{inc field_input.tpl with $field=$expire.days }}{{endinc}}
+
+
 <div class="field input">
 	<span class="field_help"><a href="#advanced-expire-popup" id="advanced-expire" class='popupbox' title="$expire.advanced">$expire.label</a></span>
 	<div style="display: none;">
@@ -67,6 +70,7 @@ $unkmail
 			{{ inc field_yesno.tpl with $field=$expire.items }}{{endinc}}
 			{{ inc field_yesno.tpl with $field=$expire.notes }}{{endinc}}
 			{{ inc field_yesno.tpl with $field=$expire.starred }}{{endinc}}
+			{{ inc field_yesno.tpl with $field=$expire.network_only }}{{endinc}}
 		</div>
 	</div>
 
@@ -90,23 +94,26 @@ $unkmail
 <br/>
 <div id="settings-default-perms-end"></div>
 
+$group_select
+
 
 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Submit" />
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
 </div>
 
 
 
 <h3 class="settings-heading">$h_not</h3>
+<div id="settings-notifications">
 
-<strong>$activity_options</strong>
+<div id="settings-activity-desc">$activity_options</div>
 
 {{inc field_checkbox.tpl with $field=$post_newfriend }}{{endinc}}
 {{inc field_checkbox.tpl with $field=$post_joingroup }}{{endinc}}
 {{inc field_checkbox.tpl with $field=$post_profilechange }}{{endinc}}
 
 
-<div id="settings-notify-desc"><strong>$lbl_not </strong></div>
+<div id="settings-notify-desc">$lbl_not</div>
 
 <div class="group">
 {{inc field_intcheckbox.tpl with $field=$notify1 }}{{endinc}}
@@ -118,6 +125,7 @@ $unkmail
 {{inc field_intcheckbox.tpl with $field=$notify7 }}{{endinc}}
 </div>
 
+</div>
 
 <div class="settings-submit-wrapper" >
 <input type="submit" name="submit" class="settings-submit" value="$submit" />
@@ -125,6 +133,7 @@ $unkmail
 
 
 <h3 class="settings-heading">$h_advn</h3>
+<div id="settings-pagetype-desc">$h_descadvn</div>
 
 $pagetype
 

view/theme/darkzero-NS/style.css

@@ -22,9 +22,14 @@ div.wall-item-content-wrapper.shiny {  background-image: url('shiny.png'); }
 
 nav #banner #logo-text a { color: #ffffff; }
 
-.wall-item-content-wrapper { border: 1px solid #444444; }
+.wall-item-content-wrapper { 
+border: 1px solid #444444; 
+background: #444;  
+
+}
 .wall-item-tools {	background-color: #444444;   background-image: none;}
-.comment-edit-wrapper{ background-color: #333333; }
+.comment-wwedit-wrapper{ background-color: #333333; }
+.comment-edit-preview{ color: #000000; }
 .wall-item-content-wrapper.comment { background-color: #444444; border: 0px;}
 .photo-top-album-name{ background-color: #333333; }
 .photo-album-image-wrapper .caption { background-color: rgba(51, 51, 51, 0.8); color: #FFFFFF; }
@@ -75,25 +80,77 @@ input#dfrn-url {
 }
 
 
-#jot-title {
+#jot-title, #jot-category {
 	background-color: #333333;
 	border: 1px solid #333333;
 }
 
 #jot-title::-webkit-input-placeholder{ color: #555555!important;}
 #jot-title:-moz-placeholder{color: #555555!important;}
+#jot-category::-webkit-input-placeholder{ color: #555555!important;}
+#jot-category:-moz-placeholder{color: #555555!important;}
 		
 	
 #jot-title:hover,
-#jot-title:focus {
+#jot-title:focus,
+#jot-category:hover,
+#jot-category:focus {
 	border: 1px solid #cccccc; 
 }
+blockquote {
+	background: #ddd;
+	color: #000;
+}
+
+.acl-list-item p, #profile-jot-email-label, div#jot-preview-content, div.profile-jot-net {
+        color: #eec;
+}
+
+input#acl-search {
+        background-color: #aaa;
+}
+
+
+
+.notify-seen {
+  background:#666;
+}
+
+#nav-notifications-menu {
+  background: #2e2e2f;
+}
+
+#nav-notifications-menu li:hover {
+  background: #444;
+}
+
+.acpopupitem{
+  background:#2e2f2e;
+}
+
+code {
+  background:#2e2f2e !important;
+  color:#fff !important;
+}
+
+blockquote {
+  background:#2e2f2e !important;
+  color:#eec !important;
+}
+
+.group-selected, .nets-selected, .fileas-selected, .categories-selected {
+  background:#2e2f2e;
+}
+
+#fancybox-content{
+  background:#444;
+}
 
 .wall-item-content {
 	max-height: 20000px;
 	overflow: none;
 }
-blockquote {
-	background: #ddd;
-	color: #000;
-}
+
+.editicon:hover {
+	background-color: #ccc;
+}

view/theme/darkzero/style.css

@@ -22,7 +22,11 @@ div.wall-item-content-wrapper.shiny {  background-image: url('shiny.png'); }
 
 nav #banner #logo-text a { color: #ffffff; }
 
-.wall-item-content-wrapper { border: 1px solid #444444; }
+.wall-item-content-wrapper { 
+border: 1px solid #444444; 
+background: #444;  
+
+}
 .wall-item-tools {	background-color: #444444;   background-image: none;}
 .comment-wwedit-wrapper{ background-color: #333333; }
 .comment-edit-preview{ color: #000000; }
@@ -99,7 +103,7 @@ blockquote {
 }
 
 .acl-list-item p, #profile-jot-email-label, div#jot-preview-content, div.profile-jot-net {
-        color: #000000;
+        color: #eec;
 }
 
 input#acl-search {
@@ -118,4 +122,31 @@ input#acl-search {
 
 #nav-notifications-menu li:hover {
   background: #444;
+}
+
+.acpopupitem{
+  background:#2e2f2e;
+}
+
+code {
+  background:#2e2f2e !important;
+  color:#fff !important;
+}
+
+blockquote {
+  background:#2e2f2e !important;
+  color:#eec !important;
+}
+
+.group-selected, .nets-selected, .fileas-selected, .categories-selected {
+  background:#2e2f2e;
+}
+
+#fancybox-content{
+  background:#444;
+}
+
+/* This seems okay to me...we might not need a new iconset, lets see how people react */
+.editicon {
+    	background-color: #333;
 }

view/theme/diabook/bottom.tpl

@@ -16,8 +16,13 @@ $(document).ready(function() {
     });
     
     $("div#pause").attr("style", "position: fixed;bottom: 43px;left: 5px;");
-    $(".autocomplete").attr("style", "width: 350px;color: black;background: white;cursor: pointer;text-align: left;max-height: 350px;overflow: auto;");
-
+    $("div#pause").html("<img src='images/pause.gif' alt='pause' title='pause live-updates (ctrl+space)' style='border: 1px solid black;opacity: 0.2;'>");
+    $(document).keydown(function(event) {
+    if (!$("div#pause").html()){
+    $("div#pause").html("<img src='images/pause.gif' alt='pause' title='pause live-updates (ctrl+space)' style='border: 1px solid black;opacity: 0.2;'>");
+		}});  
+    $(".autocomplete").attr("style", "width: 350px;color: black;border: 1px solid #D2D2D2;background: white;cursor: pointer;text-align: left;max-height: 350px;overflow: auto;");
+	 
 	});
 	
 	$(document).ready(function(){
@@ -123,4 +128,6 @@ $(document).ready(function() {
 	function cmtBbClose(id) {
 	$(".comment-edit-bb-" + id).hide();
 	}
+
+	
 </script>

view/theme/diabook/diabook-dark/style-network.css

@@ -464,7 +464,7 @@ code {
   position: absolute;
   width: 12em;
   background: #2e2f2e;
-  color: #2e2f2e;
+  color: #eec;
   margin: 0px;
   padding: 1em;
   list-style: none;
@@ -667,7 +667,7 @@ nav .nav-menu-icon:hover {
 }
 
 nav .nav-menu-icon.selected {
-  background-color: #fff;
+  background-color: #308dbf;
 }
 nav .nav-menu-icon img {
   width: 22px;
@@ -1434,7 +1434,8 @@ transition: all 0.2s ease-in-out;
 }
 .wall-item-comment-wrapper textarea {
   height: 2.0em;
-  width: 100%;
+  /**No idea what's going on here, but at 100%, it's fugly **/
+  width: 98% !important;
   font-size: 10px;
   color: #999999;
   border: 1px solid #2e2e2f;

view/theme/diabook/diabook-dark/style-profile.css

@@ -1216,7 +1216,7 @@ right_aside {
   
   /* background: #F1F1F1; */
 }
-right_aside a{color: #1872A2;}
+right_aside a{color: #88a9d2;}
 right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; 
 margin-top:30px;}
 right_aside .directory-item {	width: 50px; height: 50px; vertical-align: center; text-align: center; }

view/theme/diabook/theme.php

@@ -14,10 +14,15 @@ function diabook_init(&$a) {
 	
 //print diabook-version for debugging
 $diabook_version = "Diabook (Version: 1.027)";
-$a->page['htmlhead'] .= sprintf('<META NAME="theme" CONTENT="%s"/>', $diabook_version);
+$a->page['htmlhead'] .= sprintf('<META NAME=generator CONTENT="%s"/>', $diabook_version);
 
 //init css on network and profilepages
 $cssFile = null;
+
+// Preload config
+load_config("diabook");
+load_pconfig(local_user(), "diabook");
+
 //get statuses of boxes at right-hand-column
 $close_pages = false;
 $site_close_pages = get_config("diabook", "close_pages" );
@@ -167,38 +172,38 @@ if ($color=="dark") $color_path = "/diabook-dark/";
 	//write js-scripts to the head-section:
 	//load jquery.cookie.js
 	$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.cookie.js";
-	$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s"></script>', $cookieJS);
+	$a->page['htmlhead'] .= sprintf('<script type="text/javascript" src="%s"></script>', $cookieJS);
 	//load jquery.ae.image.resize.js
 	$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.ae.image.resize.min.js";
-	$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS);
+	$a->page['htmlhead'] .= sprintf('<script type="text/javascript" src="%s" ></script>', $imageresizeJS);
 	//load jquery.ui.js
 	if($ccCookie != "10") {
 	$jqueryuiJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery-ui-1.8.20.custom.min.js";
-	$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $jqueryuiJS);
+	$a->page['htmlhead'] .= sprintf('<script type="text/javascript" src="%s" ></script>', $jqueryuiJS);
 	$jqueryuicssJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/jquery-ui-1.8.20.custom.css";
 	$a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $jqueryuicssJS);
 	}	
 	//load jquery.twitter.search.js
 	if($close_twitter != "1") {
 	$twitterJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.twitter.search.js";
-	$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $twitterJS);
+	$a->page['htmlhead'] .= sprintf('<script type="text/javascript" src="%s" ></script>', $twitterJS);
 	}
 	//load jquery.mapquery.js
 	if($close_mapquery != "1") {
 	$mqtmplJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.tmpl.js";
-	$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $mqtmplJS);
+	$a->page['htmlhead'] .= sprintf('<script type="text/javascript" src="%s" ></script>', $mqtmplJS);
 	$mapqueryJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.mapquery.core.js";
-	$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $mapqueryJS);
+	$a->page['htmlhead'] .= sprintf('<script type="text/javascript" src="%s" ></script>', $mapqueryJS);
 	$openlayersJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/OpenLayers.js";
-	$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $openlayersJS);
+	$a->page['htmlhead'] .= sprintf('<script type="text/javascript" src="%s" ></script>', $openlayersJS);
 	$mqmouseposJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.mapquery.mqMousePosition.js";
-	$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $mqmouseposJS);
+	$a->page['htmlhead'] .= sprintf('<script type="text/javascript" src="%s" ></script>', $mqmouseposJS);
 	$mousewheelJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.mousewheel.js";
-	$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $mousewheelJS);
+	$a->page['htmlhead'] .= sprintf('<script type="text/javascript" src="%s" ></script>', $mousewheelJS);
    $mqlegendJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.mapquery.legend.js";
-	$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $mqlegendJS);
+	$a->page['htmlhead'] .= sprintf('<script type="text/javascript" src="%s" ></script>', $mqlegendJS);
 	$mqlayermanagerJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.mapquery.mqLayerManager.js";
-	$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $mqlayermanagerJS);
+	$a->page['htmlhead'] .= sprintf('<script type="text/javascript" src="%s" ></script>', $mqlayermanagerJS);
 	}
 	
 	$a->page['htmlhead'] .= '
@@ -236,7 +241,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
 		$a->page['htmlhead'] .= '
 		<script>
 		
-    $(document).ready(function() {
+    $(function() {
     $("#map").mapQuery({
         layers:[{         //add layers to your map; you need to define at least one to be able to see anything on the map
             type:"osm"  //add a layer of the type osm (OpenStreetMap)
@@ -307,13 +312,12 @@ if ($color=="dark") $color_path = "/diabook-dark/";
 	//check if community_home-plugin is activated and change css.. we need this, that the submit-wrapper doesn't overlay the login-panel if communityhome-plugin is active
 	$nametocheck = "communityhome";
 	$r = q("select id from addon where name = '%s' and installed = 1", dbesc($nametocheck));
-	if(count($r) == "1") {
+	if(count($r) == "1" && $a->argv[0] === "home" ) {
 	
 	$a->page['htmlhead'] .= '
 	<script>
-	$(document).ready(function() {
+	$(function() {
 	$("div#login-submit-wrapper").attr("style","padding-top: 120px;");
-	
 	});
 	</script>';	
 	}

view/theme/dispy/communityhome.tpl

@@ -2,7 +2,6 @@
 <div>$page</div>
 {{ endif }}
 
-{{ if $lastusers_title }}
 <h3 id="extra-help-header">Help or '@NewHere'?</h3>
 <div id="extra-help">
 <a href="https://helpers.pyxis.uberspace.de/profile/helpers"
@@ -13,27 +12,24 @@
 	title="Local Friendica" target="_blank">Local Friendica</a><br />
 <a href="http://kakste.com/profile/newhere" title="@NewHere" target="_blank">NewHere</a>
 </div>
-{{ endif }}
 
-{{ if $lastusers_title }}
 <h3 id="connect-services-header">Connectable Services</h3>
-<div id="connect-services">
-<a href="$url/facebook"><img alt="Facebook"
-	src="view/theme/dispy/icons/facebook.png" title="Facebook" /></a>
-<a href="$url/settings/connectors"><img
-	alt="StatusNet" src="view/theme/dispy/icons/StatusNet.png?" title="StatusNet" /></a>
-<a href="$url/settings/connectors"><img
-	alt="LiveJournal" src="view/theme/dispy/icons/livejournal.png?" title="LiveJournal" /></a>
-<a href="$url/settings/connectors"><img
-	alt="Posterous" src="view/theme/dispy/icons/posterous.png?" title="Posterous" /></a><br />
-<a href="$url/settings/connectors"><img
-	alt="Tumblr" src="view/theme/dispy/icons/tumblr.png?" title="Tumblr" /></a>
-<a href="$url/settings/connectors"><img
-	alt="Twitter" src="view/theme/dispy/icons/twitter.png?" title="Twitter" /></a>
-<a href="$url/settings/connectors"><img
-	alt="WordPress" src="view/theme/dispy/icons/wordpress.png?" title="WordPress" /></a>
-<a href="$url/settings/connectors"><img
-	alt="E-Mail" src="view/theme/dispy/icons/email.png?" title="E-Mail" /></a>
-</div>
-{{ endif }}
+<ul id="connect-services">
+<li><a href="$url/facebook"><img alt="Facebook"
+	src="view/theme/dispy/icons/facebook.png" title="Facebook" /></a></li>
+<li><a href="$url/settings/connectors"><img
+	alt="StatusNet" src="view/theme/dispy/icons/StatusNet.png" title="StatusNet" /></a></li>
+<li><a href="$url/settings/connectors"><img
+	alt="LiveJournal" src="view/theme/dispy/icons/livejournal.png" title="LiveJournal" /></a></li>
+<li><a href="$url/settings/connectors"><img
+	alt="Posterous" src="view/theme/dispy/icons/posterous.png" title="Posterous" /></a></li>
+<li><a href="$url/settings/connectors"><img
+	alt="Tumblr" src="view/theme/dispy/icons/tumblr.png" title="Tumblr" /></a></li>
+<li><a href="$url/settings/connectors"><img
+	alt="Twitter" src="view/theme/dispy/icons/twitter.png" title="Twitter" /></a></li>
+<li><a href="$url/settings/connectors"><img
+	alt="WordPress" src="view/theme/dispy/icons/wordpress.png" title="WordPress" /></a></li>
+<li><a href="$url/settings/connectors"><img
+	alt="E-Mail" src="view/theme/dispy/icons/email.png" title="E-Mail" /></a></li>
+</ul>
 

view/theme/dispy/config.php

@@ -41,17 +41,17 @@ function theme_admin_post(&$a) {
 
 function dispy_form(&$a, $font_size, $line_height, $colour) {
 	$line_heights = array(
-		"1.3"=>"1.3",
-		"---"=>"---",
-		"1.6"=>"1.6",				
-		"1.5"=>"1.5",		
-		"1.4"=>"1.4",
-		"1.2"=>"1.2",
-		"1.1"=>"1.1",
+		"1.3" => "1.3",
+		"---" => "---",
+		"1.6" => "1.6",				
+		"1.5" => "1.5",		
+		"1.4" => "1.4",
+		"1.2" => "1.2",
+		"1.1" => "1.1",
 	);	
 	$font_sizes = array(
 		'12' => '12',
-		'14' =>'14',
+		'14' => '14',
 		"---" => "---",
 		"16" => "16",		
 		"15" => "15",

view/theme/dispy/conversation.tpl

@@ -18,6 +18,7 @@
 
 {{ if $dropping }}
 <div class="delete-checked">
-<a href="#" onclick="deleteCheckedItems();return false;"><span class="icon delete"></span><span class="s22 text">$dropping</span></a>
+<a href="#" onclick="deleteCheckedItems();return false;"><span class="icon delete"></span><span class="s22 text" onmouseover="imgbright(this);" onmouseout="imgdull(this);">$dropping</span></a>
 </div>
+<div id="item-delete-selected-end"></div>
 {{ endif }}

view/theme/dispy/dark/_base.less

@@ -17,6 +17,7 @@
 @import "../css/reset";
 
 //* backgrounds */
+@lt_bg_colour: lighten(@bg_colour, 10%);
 @dk_bg_colour: #1d1f1d;
 @bg_colour: #2e2f2e;
 @bg_alt_colour: #2e302e;
@@ -24,8 +25,9 @@
 @menu_bg_colour: #555753;
 
 //* font colour, aka color: */
-@lt_main_colour: #ffff99;
+@lt_main_colour: lighten(@main_colour, 10%);
 @main_colour: #eeeecc;
+@dk_main_colour: darken(@main_colour, 20%);
 @main_alt_colour: #eeeeee;
 // darken(@main_alt_colour, 13%) > #cdcdcd
 // darken(@main_alt_colour, 13.5%) > #cccccc
@@ -56,9 +58,6 @@
 @info: #1353b1;
 @alert: #ff0000;
 
-@lt_main_colour: lighten(@bg_colour, 10%);
-@dk_main_colour: darken(@bg_colour, 10%);
-
 //* links */
 @link_colour: #88a9d2;
 @dk_link_colour: darken(@link_colour, 10%);
@@ -137,7 +136,19 @@
 	-webkit-text-overflow: @t;
 	text-overflow: @t;
 }
-
+.lin_gradient(@x1: left, @x2: right, @y1: top, @y2: bottom, @c1: @bg_colour, @c2: @dk_bg_colour) {
+	// w3c
+	background: linear-gradient(@x1 @y2, @c1, @c2);
+	// webkit
+	// -webkit-gradient(<type>, <point> [, <radius>]?, <point> [, <radius>]? [, <stop>]*)
+	background: -webkit-gradient(linear, @x1 @y1, @x2 @y2, from(@c1), to(@c2));
+	// mozilla
+	// -moz-linear-gradient([<point> || <angle>,]? <stop>, <stop> [, <stop>])
+	background: -moz-linear-gradient(@x1 @y2, @c1, @c2);
+	// opera
+	//background: -o-linear-gradient([<point> || <angle>,]? <stop>, <stop> [, <stop>]);
+	background: -o-linear-gradient(@x1, @c1, @c2);
+}
 //* pre wrap */
 .wrap () {
 	white-space: pre-wrap;

view/theme/dispy/dark/style.css

@@ -17,9 +17,10 @@ button,input,select,textarea{color:#eeeecc;background-color:#2e2f2e;}
 select{border:1px dotted #555555;padding:1px;margin:3px;color:#eeeecc;background:#2e2f2e;max-width:85%;min-width:85px;}
 option{padding:1px;color:#eeeecc;background:#2e2f2e;}option[selected="selected"]{color:#2e2f2e;background:#eeeecc;}
 tr:nth-child(even){background-color:#474947;}
-:focus{outline:invert, dashed, thin;}
+:focus{outline:none;}
+a:focus{outline:invert, dashed, thin;}
 [disabled="disabled"]{background:#4e4f4e;color:#ddddbb;}
-ins,mark{background-color:#2e302e;color:#474947;}
+ins,mark{background-color:#2e302e;color:#fbfbf2;}
 ins{text-decoration:none;}
 mark{font-style:italic;font-weight:bold;}
 pre,code,kbd,samp,.wall-item-body code{font-family:monospace, monospace;_font-family:monospace;font-size:1em;}
@@ -36,8 +37,9 @@ img{border:0 none;}
 a{color:#88a9d2;text-decoration:none;margin-bottom:1px;}a:hover{color:#638ec4;border-bottom:1px dotted #638ec4;}
 a:hover img{text-decoration:none;}
 blockquote{background:#444444;color:#eeeecc;text-indent:5px;padding:5px;border:1px solid #9a9a9a;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}
-label{width:38%;display:inline-block;font-size:small;margin:0 10px 1em 0;border:1px solid #2e2f2e;padding:5px;background:#eeeecc;color:#111111;-moz-box-shadow:3px 3px 5px 0px #111111;-o-box-shadow:3px 3px 5px 0px #111111;-webkit-box-shadow:3px 3px 5px 0px #111111;-ms-box-shadow:3px 3px 5px 0px #111111;box-shadow:3px 3px 5px 0px #111111;}
-input{width:250px;height:25px;border:1px solid #999999;}input[type="checkbox"],input[type="radio"]{margin:0;width:15px;height:15px;}
+label{width:38%;display:inline-block;font-size:small;margin:0 10px 1em 0;border:1px solid #2e2f2e;padding:3px 5px;background:#eeeecc;color:#111111;-moz-box-shadow:3px 3px 5px 0px #111111;-o-box-shadow:3px 3px 5px 0px #111111;-webkit-box-shadow:3px 3px 5px 0px #111111;-ms-box-shadow:3px 3px 5px 0px #111111;box-shadow:3px 3px 5px 0px #111111;}
+input{width:250px;height:25px;border:1px solid #999999;width:17em;}input[type="checkbox"],input[type="radio"]{width:15px;height:15px;margin:0;}
+input[type="radio"]{margin:5px 0;}
 input[type="submit"],input[type="button"]{background-color:#eeeeee;border:2px outset #b1b1b1;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:1px 3px 4px 0 #111111;-o-box-shadow:1px 3px 4px 0 #111111;-webkit-box-shadow:1px 3px 4px 0 #111111;-ms-box-shadow:1px 3px 4px 0 #111111;box-shadow:1px 3px 4px 0 #111111;color:#2e302e;cursor:pointer;font-weight:bold;width:auto;-moz-text-shadow:1px 1px #111111;-o-text-shadow:1px 1px #111111;-webkit-text-shadow:1px 1px #111111;-ms-text-shadow:1px 1px #111111;text-shadow:1px 1px #111111;}
 input[type="submit"]:active,input[type="button"]:active{-moz-box-shadow:0 0 0 0 #111111;-o-box-shadow:0 0 0 0 #111111;-webkit-box-shadow:0 0 0 0 #111111;-ms-box-shadow:0 0 0 0 #111111;box-shadow:0 0 0 0 #111111;}
 h1,h2,h3,h4,h5,h6{margin:10px 0px;font-weight:bold;border-bottom:1px solid #638ec4;}
@@ -51,13 +53,12 @@ h6{font-size:xx-small;}
 .fakelink,.lockview{color:#88a9d2;cursor:pointer;}
 .fakelink:hover{color:#638ec4;}
 .smalltext{font-size:0.7em;}
-#panel{position:absolute;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;border:1px solid #eeeeee;background-color:#2e302e;color:#eeeecc;padding:1em;}
-.pager{margin-top:60px;display:block;clear:both;text-align:center;font-size:small;font-weight:bold;}.pager span{padding:4px;margin:4px;}
-.pager_current{background-color:#88a9d2;color:#2e2f2e;}
 .action{margin:5px 0;}
 .tool{margin:5px 0;list-style:none;}
 #articlemain{width:100%;height:100%;margin:0 auto;}
-[class$="-desc"],[id$="-desc"]{color:#2e2f2e;background:#eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;}
+.button{color:#eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding:5px;cursor:pointer;}.button a{color:#eeeecc;font-weight:bold;}
+#profile-listing-desc a{color:#eeeecc;font-weight:bold;}
+[class$="-desc"],[id$="-desc"]{color:#eeeecc;background:#2e2f2e;border:2px outset #d4d580;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;}
 #item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;}
 .intro-approve-as-friend-desc{margin-top:10px;}
 .intro-desc{margin-bottom:20px;font-weight:bold;}
@@ -65,6 +66,7 @@ h6{font-size:xx-small;}
 #settings-nickname-desc{background:#eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;border:1px solid #eeeecc;padding:5px;color:#2e2f2e;}
 .contactname,.contact-name{font-weight:bold;font-size:smaller;}
 .contact-details{font-style:italic;font-size:smaller;}
+.like-rotator{vertical-align:middle;text-align:center;margin:1px;}
 #asidemain .field{overflow:hidden;width:200px;}
 #login-extra-links{overflow:auto !important;padding-top:60px !important;width:100% !important;}#login-extra-links a{margin-right:20px;}
 #login_standard{display:block !important;float:none !important;height:100% !important;position:relative !important;width:100% !important;}#login_standard .field label{width:200px !important;}
@@ -76,7 +78,7 @@ h6{font-size:xx-small;}
 #login_openid label{width:180px !important;}
 nav{height:60px;background-color:#1d1f1d;color:#eeeeee;position:relative;padding:20px 20px 10px 95px;}nav a{text-decoration:none;color:#eeeeee;border:0px;}nav a:hover{text-decoration:none;color:#eeeeee;border:0px;}
 nav #banner{display:block;position:absolute;left:51px;top:25px;}nav #banner #logo-text a{font-size:40px;font-weight:bold;margin-left:3px;}
-ul#user-menu-popup{display:none;position:absolute;background-color:#555753;width:100%;padding:10px 0px;margin:0px;top:20px;left:0;font-size:small;line-height:1;-o-border-radius:0 0 5px 5px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;-ms-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-moz-box-shadow:5px 5px 10px 0px #111111;-o-box-shadow:5px 5px 10px 0px #111111;-webkit-box-shadow:5px 5px 10px 0px #111111;-ms-box-shadow:5px 5px 10px 0px #111111;box-shadow:5px 5px 10px 0px #111111;z-index:10000;}ul#user-menu-popup li{display:block;}ul#user-menu-popup li a{display:block;padding:5px;}ul#user-menu-popup li a:hover{color:#eeeecc;background-color:#2e302e;}
+ul#user-menu-popup{display:none;position:absolute;background-color:#555753;width:100%;padding:10px 0px;margin:0px;top:20px;left:0;font-size:small;line-height:1;-o-border-radius:0 0 5px 5px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;-ms-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-moz-box-shadow:5px 5px 10px 0px #111111;-o-box-shadow:5px 5px 10px 0px #111111;-webkit-box-shadow:5px 5px 10px 0px #111111;-ms-box-shadow:5px 5px 10px 0px #111111;box-shadow:5px 5px 10px 0px #111111;z-index:10000;}ul#user-menu-popup li{display:block;}ul#user-menu-popup li a{display:block;padding:5px;color:#eeeeee;background-color:#555753;}ul#user-menu-popup li a:hover{color:#2e2f2e;background-color:#eeeeee;}
 ul#user-menu-popup li a.nav-sep{border-top:1px solid #2e302e;}
 nav .nav-link{display:inline-block;width:22px;height:22px;overflow:hidden;margin:0px 5px 5px;text-indent:50px;background:transparent url(dark/icons.png) 0 0 no-repeat;}
 #nav-apps-link{background-position:0 -66px;}#nav-apps-link:hover{background-position:-22px -66px;}
@@ -101,15 +103,17 @@ div.jGrowl div.info{background:#1353b1 url("../../../images/icons/48/info.png")
 nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkmenu.selected .icon.s22.notify{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAQAAABuvaSwAAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAAUJcAAFCXAZtv64UAAAHuSURBVCjPbZPbTlNBFIYHLixXRIhEQGNRMUopJAJyAyZ4Z2l8B+XwEBqKtjwOp8oDIAJKIJFUjdFIQCUYrRytdyb0459ht8wG9rrYs9b618y/TsYEH4ZK4qRYYIdDybZOI7TKakIfVhrJ8J2i5IBNyV93/kaaBuv3oV3MgwCTPKGHPkkPA0xRUMBrOgN4AP0o6BseEpF2m3es0qJTFQneyvMhgDsC9tZprnEcGuOPeMcDLUpW3jlLxlDBmJTFY6gLvsVv8tyh9G7U3Z6mwtCuJAoiECSh/w1+8otmTjLqF2KDNsNzRY1bruV0o6rFFtc9S5USh5RRWvAYv4xX9dYPS8ur1oBQC4Y99m2uHriRNda5ErLdU1l3jCI2xdJ3XOYLX6kP2W6K2OF54Et84jN154F31d6ukKOG92pSbcjWLRrbRhVGLTZeOtXqX46LoQSHhJo3jOo3ESrdBQbljIRKNyXUiKHNNSXhTdbZiUzyT/WJ23Zn3BBFy+2u4ZHc1eV2N7EkxAvbbqMRmZOSlbE0g/uajRgl6Iy8r1wpnaFTQ4ji+8XOEsuxYmdDWpJleXJ0+BPdoduL4p5Vavd5IOllmJfiWmSWu6d3pV4jteFWqaAGbLkdKSqtUXXUnN3DSvF8phfy/JfkxfOp9sVb2COz+hY/T0qkwwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxMS0wOS0xNlQwOTozOTowMCswMjowMC9Oi90AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTEtMDktMTZUMDk6Mzk6MDArMDI6MDBeEzNhAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAABJRU5ErkJggg==");}
 .show{display:block;}
 #notifications{width:170px;height:20px;font-size:small;top:-19px;left:4px;position:absolute;}
-#nav-floater{position:fixed;top:20px;right:1%;padding:5px;background:#1d1f1d;color:transparent;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100;width:300px;height:60px;}
+#nav-floater{position:fixed;top:20px;right:1%;padding:5px;background:#1d1f1d;color:transparent;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100;width:270px;height:60px;}
 #nav-buttons{clear:both;list-style:none;padding:0px;margin:0px;height:25px;}#nav-buttons>li{padding:0;display:inline-block;margin:0px -4px 0px 0px;}
 .floaterflip{display:block;position:fixed;z-index:110;top:56px;right:19px;width:22px;height:22px;overflow:hidden;margin:0px;background:transparent url(dark/icons.png) -190px -60px no-repeat;}
 .search-box{display:inline-block;margin:5px;position:fixed;right:0px;bottom:0px;z-index:100;background:#1d1f1d;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}
-#search-text{border:1px solid #eeeecc;background:#2e2f2e;color:#eeeecc;font-size:8pt;margin:8px;width:10em;height:14px;}
+#search-text,#mini-search-text{background:white;color:#2e2f2e;}
+#search-text{border:1px solid #eeeeee;margin:5px 0;}
+#mini-search-text{font-size:8pt;height:14px;width:10em;margin:5px;}
 #scrollup{position:fixed;right:5px;bottom:40px;z-index:100;}#scrollup a:hover{text-decoration:none;border:0;}
-#user-menu{-moz-box-shadow:5px 0 10px 0 #111111;-o-box-shadow:5px 0 10px 0 #111111;-webkit-box-shadow:5px 0 10px 0 #111111;-ms-box-shadow:5px 0 10px 0 #111111;box-shadow:5px 0 10px 0 #111111;display:block;width:75%;margin:3px 0 0 0;position:relative;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;background-color:#555753;background-image:url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q==");background-position:98% center;background-repeat:no-repeat;clear:both;top:4px;left:10px;padding:2px;}#user-menu>a{vertical-align:top;outline:0 none;}
+#user-menu{-moz-box-shadow:5px 0 10px 0 #111111;-o-box-shadow:5px 0 10px 0 #111111;-webkit-box-shadow:5px 0 10px 0 #111111;-ms-box-shadow:5px 0 10px 0 #111111;box-shadow:5px 0 10px 0 #111111;display:block;width:80%;margin:3px 0 0 0;position:relative;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;background-color:#555753;background-image:url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q==");background-position:98% center;background-repeat:no-repeat;clear:both;top:4px;left:10px;padding:2px;}#user-menu>a{vertical-align:top;outline:0 none;}
 #user-menu-label{font-size:small;padding:3px 20px 9px 5px;height:10px;}
-.nav-ajax-update,.nav-ajax-left{width:30px;height:19px;background:transparent url(dark/notifications.png) 0 0 no-repeat;color:#eeeecc;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,.nav-ajax-left{width:30px;height:19px;background:transparent url(dark/notifications.png) 0 0 no-repeat;color:#111111;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;}
 #mail-update{background-position:-30px 0;}
@@ -118,20 +122,21 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
 #intro-update{background-position:-120px 0px;}
 #lang-select-icon{cursor:pointer;position:fixed;left:28px;bottom:6px;z-index:10;}
 #language-selector{position:fixed;bottom:2px;left:52px;z-index:10;}
-.menu-popup{position:absolute;display:none;width:11em;background:white;color:#2e2f2e;margin:0px;padding:0px;border:3px solid #2e3436;z-index:100000;-moz-box-shadow:5px 5px 5px 0px #111111;-o-box-shadow:5px 5px 5px 0px #111111;-webkit-box-shadow:5px 5px 5px 0px #111111;-ms-box-shadow:5px 5px 5px 0px #111111;box-shadow:5px 5px 5px 0px #111111;}.menu-popup a{display:block;color:#2e2f2e;padding:5px 10px;text-decoration:none;}.menu-popup a:hover{background-color:#b9c1c3;}
+.menu-popup{position:absolute;display:none;background:white;color:#2e2f2e;margin:0px;padding:0px;font-size:small;line-height:1.2;border:3px solid #88a9d2;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100000;-moz-box-shadow:5px 5px 5px 0px #111111;-o-box-shadow:5px 5px 5px 0px #111111;-webkit-box-shadow:5px 5px 5px 0px #111111;-ms-box-shadow:5px 5px 5px 0px #111111;box-shadow:5px 5px 5px 0px #111111;}.menu-popup a{display:block;color:#2e2f2e;padding:5px 10px;text-decoration:none;}.menu-popup a:hover{color:#eeeecc;background-color:#88a9d2;}
 .menu-popup .menu-sep{border-top:1px solid #4e4f4e;}
 .menu-popup li{float:none;overflow:auto;height:auto;display:block;}.menu-popup li img{float:left;width:16px;height:16px;padding-right:5px;}
 .menu-popup .empty{padding:5px;text-align:center;color:#9ea8ac;}
 .notif-item{font-size:small;}.notif-item a{vertical-align:middle;}
 .notif-image{width:32px;height:32px;padding:7px 7px 0px 0px;}
-.notify-seen{background:#bbbbbb;}
+.notify-seen{background:#ddddbb;color:#eeeecc;}
+.notify-unseen{color:#eeeecc;}
 #sysmsg_info{position:fixed;bottom:0;-moz-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-o-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-webkit-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-ms-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;padding:10px;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 3px 10px 0 #111111 5px 5px 0px #111111;-o-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-webkit-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-ms-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;padding:10px;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 #eeeecc;}
-#asidemain{float:left;font-size:small;margin:20px 0 20px 35px;width:25%;display:inline;}
+#asidemain{float:left;font-size:small;margin:1em;width:25%;display:inline;}
 #asideright,#asideleft{display:none;}
 .vcard .fn{font-size:1.5em;font-weight:bold;border-bottom:1px solid #638ec4;padding-bottom:3px;}
-.vcard #profile-photo-wrapper{margin:20px;}.vcard #profile-photo-wrapper img{-moz-box-shadow:3px 3px 10px 0 #111111;-o-box-shadow:3px 3px 10px 0 #111111;-webkit-box-shadow:3px 3px 10px 0 #111111;-ms-box-shadow:3px 3px 10px 0 #111111;box-shadow:3px 3px 10px 0 #111111;}
+.vcard #profile-photo-wrapper{margin:20px 0;background-color:#555753;padding:5px;width:175px;height:175px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:3px 3px 10px 0 #111111;-o-box-shadow:3px 3px 10px 0 #111111;-webkit-box-shadow:3px 3px 10px 0 #111111;-ms-box-shadow:3px 3px 10px 0 #111111;box-shadow:3px 3px 10px 0 #111111;}
 #asidemain h4{font-size:1.2em;}
 #asidemain #viewcontacts{text-align:right;}
 #asidemain #contact-block{width:99%;}#asidemain #contact-block .contact-block-content{width:99%;}#asidemain #contact-block .contact-block-content .contact-block-div{float:left;margin:0 5px 5px 0;width:50px;height:50px;padding:3px;position:relative;}
@@ -152,7 +157,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
 #profile-jot-text_tbl{margin-bottom:10px;background:#777777;}
 #profile-jot-text_ifr{width:99.900002% !important;}
 #profile-jot-text_toolbargroup,.mceCenter tr{background:#777777;}
-[id$="jot-text_ifr"]{width:99.900002% !important;color:#2e2f2e;background:#eeeecc;}[id$="jot-text_ifr"] .mceContentBody{color:#2e2f2e;background:#eeeecc;}
+[id$="jot-text_ifr"]{color:#2e2f2e;background:#eeeecc;}[id$="jot-text_ifr"] .mceContentBody{color:#2e2f2e;background:#eeeecc;}
 .defaultSkin tr.mceFirst{background:#777777;}
 .defaultSkin td.mceFirst,.defaultSkin td.mceLast{background-color:#eeeecc;}
 .defaultSkin span.mceIcon,.defaultSkin img.mceIcon,.defaultSkin .mceButtonDisabled .mceIcon{background-color:#eeeecc;}
@@ -165,11 +170,11 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
 #profile-jot-net{margin:5px 0;}
 #jot-preview-link{margin:0 0 0 10px;border:0;text-decoration:none;float:right;}
 .icon-text-preview{margin:0 0 -18px 0;display:block;width:20px;height:20px;background:url(dark/icons.png) no-repeat -128px -40px;border:0;text-decoration:none;float:right;cursor:pointer;}
-#profile-jot-perms{float:right;color:#555753;background-color:#eeeecc;width:20px;height:20px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:3px 3px 5px 0 #111111;-o-box-shadow:3px 3px 5px 0 #111111;-webkit-box-shadow:3px 3px 5px 0 #111111;-ms-box-shadow:3px 3px 5px 0 #111111;box-shadow:3px 3px 5px 0 #111111;border:2px outset #eeeeee;overflow:hidden;margin:0 10px 0 10px;}
+#profile-jot-perms{float:right;color:#555753;width:20px;height:20px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:3px 3px 5px 0 #111111;-o-box-shadow:3px 3px 5px 0 #111111;-webkit-box-shadow:3px 3px 5px 0 #111111;-ms-box-shadow:3px 3px 5px 0 #111111;box-shadow:3px 3px 5px 0 #111111;border:2px outset #555753;overflow:hidden;margin:0 10px 0 10px;}
 #profile-jot-plugin-wrapper{width:1px;margin:10px 0 0 0;float:right;}
 #profile-jot-submit-wrapper{float:right;width:100%;margin:10px 0 0 0;padding:0;}
 #profile-jot-submit{height:auto;background-color:#555753;color:#eeeeee;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;border:2px outset #2e3436;margin:0;float:right;-moz-text-shadow:1px 1px #111111;-o-text-shadow:1px 1px #111111;-webkit-text-shadow:1px 1px #111111;-ms-text-shadow:1px 1px #111111;text-shadow:1px 1px #111111;width:auto;}#profile-jot-submit:active{-moz-box-shadow:0 0 0 0 #111111;-o-box-shadow:0 0 0 0 #111111;-webkit-box-shadow:0 0 0 0 #111111;-ms-box-shadow:0 0 0 0 #111111;box-shadow:0 0 0 0 #111111;}
-#jot-perms-icon{width:20px;height:22px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;overflow:hidden;}
+#jot-perms-icon{width:22px;height:22px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;overflow:hidden;background:#555753 url("dark/icons.png") -88px -40px;}
 #group_allow_wrapper,#group_deny_wrapper,#acl-permit-outer-wrapper,#contact_allow_wrapper,#contact_deny_wrapper,#acl-deny-outer-wrapper{width:47%;}
 #group_allow_wrapper,#group_deny_wrapper,#acl-permit-outer-wrapper{float:left;}
 #contact_allow_wrapper,#contact_deny_wrapper,#acl-deny-outer-wrapper{float:right;}
@@ -177,19 +182,20 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
 #jot-public{background-color:#555555;color:#ff0000;padding:5px;float:left;}
 #acl-deny-text{background-color:#555555;color:#eeeecc;padding:5px;float:left;}
 #jot-title-desc{color:#cdcdcd;}
-#profile-jot-desc{color:#ff2000;margin:5px 0;}
+#profile-jot-desc{background:#2e2f2e;border:1px solid #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;color:#ff2000;margin:5px 0;}
 #jot-title-wrapper{margin-bottom:5px;}
 #jot-title-display{font-weight:bold;}
 .jothidden{display:none;}
-#jot-preview-content{background-color:#2e302e;color:#eeeecc;border:1px solid #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:5px 0 10px 0px #111111;-o-box-shadow:5px 0 10px 0px #111111;-webkit-box-shadow:5px 0 10px 0px #111111;-ms-box-shadow:5px 0 10px 0px #111111;box-shadow:5px 0 10px 0px #111111;padding:3px 3px 6px 10px;}#jot-preview-content .wall-item-outside-wrapper{border:0;-o-border-radius:0px 0px 0px 0px;-webkit-border-radius:0px 0px 0px 0px;-moz-border-radius:0px 0px 0px 0px;-ms-border-radius:0px 0px 0px 0px;border-radius:0px 0px 0px 0px;-moz-box-shadow:0 0 0 0 #111111;-o-box-shadow:0 0 0 0 #111111;-webkit-box-shadow:0 0 0 0 #111111;-ms-box-shadow:0 0 0 0 #111111;box-shadow:0 0 0 0 #111111;}
-#sectionmain{margin:20px;font-size:0.8em;min-width:475px;width:67%;float:left;display:inline;}
+#jot-preview-content{background-color:#2e3436;color:#eeeecc;border:1px solid #2e2f2e;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:5px 0 10px 0px #111111;-o-box-shadow:5px 0 10px 0px #111111;-webkit-box-shadow:5px 0 10px 0px #111111;-ms-box-shadow:5px 0 10px 0px #111111;box-shadow:5px 0 10px 0px #111111;padding:3px 3px 6px 10px;}#jot-preview-content .wall-item-outside-wrapper{border:0;-o-border-radius:0px 0px 0px 0px;-webkit-border-radius:0px 0px 0px 0px;-moz-border-radius:0px 0px 0px 0px;-ms-border-radius:0px 0px 0px 0px;border-radius:0px 0px 0px 0px;-moz-box-shadow:0 0 0 0 #111111;-o-box-shadow:0 0 0 0 #111111;-webkit-box-shadow:0 0 0 0 #111111;-ms-box-shadow:0 0 0 0 #111111;box-shadow:0 0 0 0 #111111;}
+#sectionmain{margin:1em;font-size:0.8em;min-width:475px;width:69%;float:left;display:inline;}
 .tabs{margin:0px;padding:0px;list-style:none;list-style-position:inside;margin:10px 0;}.tabs li{display:inline;font-size:smaller;}
-.tab{border:1px solid #638ec4;padding:4px;}.tab:hover,.tab.active:hover,.tab:active{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;}
-.tab.active{background:#eeeecc;color:#2e2f2e;border:1px solid #638ec4;}.tab.active a{color:#2e2f2e;text-decoration:none;}
+.tab{border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.tab:active,.tab:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;}
 .tab a{border:0;text-decoration:none;}
+.tab.active{background:#eeeecc;color:#2e2f2e;border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.tab.active:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;}
+.tab.active a{color:#2e2f2e;text-decoration:none;}
 .wall-item-outside-wrapper{border:1px solid #a9a9a9;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:6px 1px 10px -2px #111111;-o-box-shadow:6px 1px 10px -2px #111111;-webkit-box-shadow:6px 1px 10px -2px #111111;-ms-box-shadow:6px 1px 10px -2px #111111;box-shadow:6px 1px 10px -2px #111111;}.wall-item-outside-wrapper.comment{margin-top:5px;}
 .wall-item-content-wrapper{position:relative;padding:0.75em;width:auto;}
-.wall-item-outside-wrapper .wall-item-comment-wrapper{}
+.wall-item-outside-wrapper .wall-item-comment-wrapper{}.wall-item-outside-wrapper .wall-item-comment-wrapper .preview{border:0;-o-border-radius:0px;-webkit-border-radius:0px;-moz-border-radius:0px;-ms-border-radius:0px;border-radius:0px;}
 .shiny{background:#2e3436;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}
 .wall-outside-wrapper .shiny{-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}
 .heart{color:red;}
@@ -197,7 +203,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
 [id^="tread-wrapper"],[class^="tread-wrapper"]{margin:1.2em 0 0 0;padding:0px;}
 .wall-item-photo-menu{display:none;}
 .wall-item-photo-menu-button{display:none;text-indent:-99999px;background:#555753 url(dark/menu-user-pin.jpg) no-repeat 75px center;position:absolute;overflow:hidden;width:90px;height:20px;top:85px;left:0;-o-border-radius:0 0 5px 5px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;-ms-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;}
-.wall-item-info{float:left;width:110px;}
+.wall-item-info{float:left;width:7em;position:relative;}
 .wall-item-photo-wrapper{width:80px;height:80px;position:relative;padding:5px;background-color:#555753;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}
 [class^="wall-item-tools"] *{}[class^="wall-item-tools"] *>*{}
 .wall-item-tools{float:right;opacity:0.4;-webkit-transition:all 0.75s ease-in-out;-moz-transition:all 0.75s ease-in-out;-o-transition:all 0.75s ease-in-out;-ms-transition:all 0.75s ease-in-out;transition:all 0.75s ease-in-out;}.wall-item-tools:hover{opacity:1;-webkit-transition:all 0.75s ease-in-out;-moz-transition:all 0.75s ease-in-out;-o-transition:all 0.75s ease-in-out;-ms-transition:all 0.75s ease-in-out;transition:all 0.75s ease-in-out;}
@@ -207,26 +213,27 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
 .wall-item-body{margin:15px 10px 10px 0px;text-align:left;overflow-x:auto;}
 .wall-item-lock-wrapper{float:right;width:22px;height:22px;margin:0 -5px 0 0;opacity:1;}
 .wall-item-dislike,.wall-item-like{clear:left;font-size:0.8em;color:#888b85;margin:5px 0 5px 10.2em;-webkit-transition:all 0.75s ease-in-out;-moz-transition:all 0.75s ease-in-out;-o-transition:all 0.75s ease-in-out;-ms-transition:all 0.75s ease-in-out;transition:all 0.75s ease-in-out;opacity:0.5;}.wall-item-dislike:hover,.wall-item-like:hover{opacity:1;}
-.wall-item-author,.wall-item-actions-author{clear:left;float:left;font-size:0.8em;color:#888b85;margin:1em auto 0 0.2em;}
-.wall-item-ago{display:inline;padding-left:10px;}
-.wall-item-location{margin-top:15px;width:100px;overflow:hidden;-moz-text-overflow:ellipsis;-ms-text-verflow:ellipsis;-o-text-overflow:ellipsis;-webkit-text-overflow:ellipsis;text-overflow:ellipsis;}.wall-item-location .icon{float:left;}
+.wall-item-author,.wall-item-actions-author,.wall-item-ago{color:#eeeecc;line-height:1;display:inline-block;font-size:x-small;margin:0.5em auto;font-weight:bold;}
+.comment-edit-preview{width:auto;margin:auto auto auto -2em;}.comment-edit-preview.wall-item-author,.comment-edit-preview.wall-item-actions-author,.comment-edit-preview.wall-item-ago{font-size:smaller;}
+.wall-item-location{margin-top:2em;width:6em;overflow:hidden;-moz-text-overflow:ellipsis;-ms-text-verflow:ellipsis;-o-text-overflow:ellipsis;-webkit-text-overflow:ellipsis;text-overflow:ellipsis;}.wall-item-location .icon{float:left;}
 .wall-item-location>a,.wall-item-location .smalltext{margin-left:25px;font-size:0.7em;display:block;}
 .wall-item-location>br{display:none;}
 .wallwall .wwto{left:5px;margin:0;position:absolute;top:75px;z-index:10001;width:30px;height:30px;}.wallwall .wwto img{width:30px !important;height:30px !important;}
 .wallwall .wall-item-photo-end{clear:both;}
 .wall-item-arrowphoto-wrapper{position:absolute;left:35px;top:80px;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;-o-border-radius:0 5px 5px 5px;-webkit-border-radius:0 5px 5px 5px;-moz-border-radius:0 5px 5px 5px;-ms-border-radius:0 5px 5px 5px;border-radius:0 5px 5px 5px;}.wall-item-photo-menu li a{white-space:nowrap;display:block;padding:5px 2px;color:#eeeeee;}.wall-item-photo-menu li a:hover{color:#555753;background:#eeeeee;}
+.wall-item-photo-menu{min-width:92px;font-size:0.75em;border:2px solid #555753;border-top:0px;background:#555753;position:absolute;left:-2px;top:101px;display:none;z-index:10003;-o-border-radius:0 5px 5px 5px;-webkit-border-radius:0 5px 5px 5px;-moz-border-radius:0 5px 5px 5px;-ms-border-radius:0 5px 5px 5px;border-radius:0 5px 5px 5px;}.wall-item-photo-menu li a{white-space:nowrap;display:block;padding:5px 6px;color:#eeeeee;}.wall-item-photo-menu li a:hover{color:#555753;background:#eeeeee;}
 #item-delete-selected{overflow:auto;width:100%;}
-#connect-services-header,#connect-services,#extra-help-header,#extra-help,#postit-header,#postit{margin:5px 0 0 0;}
+#connect-services-header,#extra-help-header{margin:1.5em 0 0 0;}
+#connect-services,#extra-help{margin:0px;padding:0px;list-style:none;list-style-position:inside;margin:1em 0 0 0;}#connect-services li,#extra-help li{display:inline;}
 .ccollapse-wrapper{font-size:0.9em;margin-left:5em;}
-.wall-item-outside-wrapper.comment{margin-left:5em;}.wall-item-outside-wrapper.comment .wall-item-photo{width:40px !important;height:40px !important;}
+.hide-comments-outer{font-size:small;}
+.wall-item-outside-wrapper.comment{margin-left:5em;}.wall-item-outside-wrapper.comment .wall-item-info{width:5em;}
+.wall-item-outside-wrapper.comment .wall-item-photo{width:40px !important;height:40px !important;}
 .wall-item-outside-wrapper.comment .wall-item-photo-wrapper{width:40px;height:40px;}
-.wall-item-outside-wrapper.comment .wall-item-photo-menu-button{width:50px;top:45px;background-position:35px center;}
-.wall-item-outside-wrapper.comment .wall-item-info{width:60px;}
-.wall-item-outside-wrapper.comment .wall-item-body{margin-left:10px;}
+.wall-item-outside-wrapper.comment .wall-item-photo-menu-button{width:3.35em;top:3.2em;background-position:35px center;}
 .wall-item-outside-wrapper.comment .wall-item-author{margin-left:0.2em;}
-.wall-item-outside-wrapper.comment .wall-item-photo-menu{min-width:50px;top:60px;}
-.comment-wwedit-wrapper{}
+.wall-item-outside-wrapper.comment .wall-item-photo-menu{min-width:4.5em;top:5.5em;}
+.comment-wwedit-wrapper{border:1px solid #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:5px;}
 .comment-edit-wrapper{border-top:1px #aaa solid;}
 [class^="comment-edit-bb"]{margin:0px;padding:0px;list-style:none;list-style-position:inside;display:none;margin:-40px 0 5px 60px;width:75%;}[class^="comment-edit-bb"]>li{display:inline-block;margin:0 10px 0 0;visibility:none;}
 .comment-wwedit-wrapper img,.comment-edit-wrapper img{width:20px;height:20px;}
@@ -239,7 +246,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
 .comment-edit-submit{height:22px;background-color:#555753;color:#eeeeee;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;border:0;}
 .wall-item-body code{background-color:#444444;border-bottom:1px dashed #cccccc;border-left:5px solid #cccccc;border-top:1px dashed #cccccc;color:#eeeecc;display:block;overflow-x:auto;padding:5px 0 15px 10px;width:95%;}.wall-item-body code a{color:#adc4e0;}
 div[id$="text"]{font-weight:bold;border-bottom:1px solid #cccccc;}
-div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:left;}
+div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;}
 .profile-match-wrapper{float:left;margin:0 5px 40px 0;width:120px;height:120px;padding:3px;position:relative;}
 .icon.drophide.profile-match-ignore{margin:0 6px 0 -3px;}
 [id$="-end"],[class$="-end"]{clear:both;margin:0 0 10px 0;}
@@ -250,27 +257,28 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
 .photos{height:auto;overflow:auto;}
 #photo-top-links{margin-bottom:30px;}
 .photo-album-image-wrapper,.photo-top-image-wrapper{float:left;-moz-box-shadow:3px 3px 10px 0 #111111;-o-box-shadow:3px 3px 10px 0 #111111;-webkit-box-shadow:3px 3px 10px 0 #111111;-ms-box-shadow:3px 3px 10px 0 #111111;box-shadow:3px 3px 10px 0 #111111;background-color:#222222;color:#2e2f2e;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding-bottom:30px;position:relative;margin:0 10px 10px 0;}
-#photo-photo{max-width:100%;}#photo-photo img{max-width:100%;}
+#photo-photo{margin:auto auto 5em 20%;}#photo-photo img{max-width:50%;}
 .photo-top-image-wrapper a:hover,#photo-photo a:hover,.photo-album-image-wrapper a:hover{border-bottom:0;}
 .photo-top-photo,.photo-album-photo{-o-border-radius:5px 5px 0 0;-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;-ms-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0;}
 .photo-top-album-name,.caption{position:absolute;bottom:0;padding:0 5px;}
-#photo-photo{position:relative;margin:5px 45%;}
-#photo-prev-link,#photo-next-link{position:absolute;width:50px;height:150px;background:#ffffff center center no-repeat;opacity:0;-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;z-index:10;top:175px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}#photo-prev-link:hover,#photo-next-link:hover{opacity:0.6;-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;}
+#photo-prev-link,#photo-next-link{position:absolute;width:50px;height:200px;background:#ffffff center center no-repeat;opacity:0;-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;z-index:10;top:15em;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}#photo-prev-link:hover,#photo-next-link:hover{opacity:0.6;-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;}
 #photo-prev-link .icon,#photo-next-link .icon{display:none;}
-#photo-prev-link{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAnCAMAAADTjiM/AAAAA3NCSVQICAjb4U/gAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAALpQTFRF////AAAAQEBAZmZmVVVVSUlJTU1NXV1dVVVVTk5OW1tbWlpaWFhPWFhQU1pTVVVVVlZSVVlRVlZTVFdUVFdUVVdTVFZSVldUVldSVldSVldTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVZUVVdTVVdTVVhSVVdTVVdTVVhSVVdTVVdTVVhSVVdTVVdTVVdTVVdTVVdTVVdTVVhTVVdTVVdTVVdTVVdT3XYY/AAAAD10Uk5TAAEEBQYHCgsMDQ4RHSAlP0FFR1hee3+JnqSqq6ytrq+wsbKztLW2t7y9vr/AwcLDxMXGx8jU1dng7O/3+TmOwVsAAADASURBVCjPddPXEoIwEAXQINh7Q8WKYu+95v9/S0dxZxNy83hgMpvdu0Jox642r25GVxGfys+5540sZV3jyY/lWeVxyDLg7AR/lhXOI+KZZeRFgvGQeMnY9olXScYD4jXnPvHGzNsU4x7xjnGsa+YO8T7NnukRHzgXiY/KNKiUkzqkZ8ivnDoKD/xfBvdbbXM9sH70Xtgf2E/YfzgvOF+YB5gf5cPcAfmsgTy3QP5vYF8akf36XvXIRhZPlPyLWxBvNENWsZXDKukAAAAASUVORK5CYII=");left:22%;}
-#photo-next-link{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAnCAMAAADTjiM/AAAAA3NCSVQICAjb4U/gAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAKVQTFRF////gICAQEBAZmZmVVVVSUlJYGBgVVVVTU1NXV1dVVVVWVlZU1hTVlZSVlZTVlZTVVlRVVhSVFdUVlhTVVdTVFZTVVdTVldTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVhSVVdTVVdTVVdTVVdTVVdTVVdTVVdTVVdTVVdT8E3YQQAAADZ0Uk5TAAIEBQYHCAkKCwwUN0FER0hOW2uNjqWqq6ytrq+wsbKztLW2t7i5uru8vb6/wMHCxcjT3PP3B0dhfwAAANlJREFUKM910+cSgjAQRtEIomAXu4iIYge7ef9Hs+ZzN4b9eW4mk1kGIaqdU9wQf2Nf5XPSiu4d+Z6jp/n54/KghZ40h5ZymbFQGCCkLg3WKC+MEfYs2AHCrszCBGHLQ5gXpggbFooRwrrEwgxhxUOcE5w5wtJiYYHQZjt0EuUhX3r19vU7Y++ozgeMD7i/buYhYTcDj8gz3RQ8prwHB/aPyzvwhPLWzBtwSLi0Bk8pr8BR0cgzwiIycw0cUxZ9xXOH7VZ9vAVn4X840Vh4F9Pp1w/gZ92mpesDuLpM+1blc68AAAAASUVORK5CYII=");left:44%;}
+#photo-prev-link{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAnCAMAAADTjiM/AAAAA3NCSVQICAjb4U/gAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAALpQTFRF////AAAAQEBAZmZmVVVVSUlJTU1NXV1dVVVVTk5OW1tbWlpaWFhPWFhQU1pTVVVVVlZSVVlRVlZTVFdUVFdUVVdTVFZSVldUVldSVldSVldTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVZUVVdTVVdTVVhSVVdTVVdTVVhSVVdTVVdTVVhSVVdTVVdTVVdTVVdTVVdTVVdTVVhTVVdTVVdTVVdTVVdT3XYY/AAAAD10Uk5TAAEEBQYHCgsMDQ4RHSAlP0FFR1hee3+JnqSqq6ytrq+wsbKztLW2t7y9vr/AwcLDxMXGx8jU1dng7O/3+TmOwVsAAADASURBVCjPddPXEoIwEAXQINh7Q8WKYu+95v9/S0dxZxNy83hgMpvdu0Jox642r25GVxGfys+5540sZV3jyY/lWeVxyDLg7AR/lhXOI+KZZeRFgvGQeMnY9olXScYD4jXnPvHGzNsU4x7xjnGsa+YO8T7NnukRHzgXiY/KNKiUkzqkZ8ivnDoKD/xfBvdbbXM9sH70Xtgf2E/YfzgvOF+YB5gf5cPcAfmsgTy3QP5vYF8akf36XvXIRhZPlPyLWxBvNENWsZXDKukAAAAASUVORK5CYII=");left:5%;}
+#photo-next-link{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAnCAMAAADTjiM/AAAAA3NCSVQICAjb4U/gAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAKVQTFRF////gICAQEBAZmZmVVVVSUlJYGBgVVVVTU1NXV1dVVVVWVlZU1hTVlZSVlZTVlZTVVlRVVhSVFdUVlhTVVdTVFZTVVdTVldTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVhSVVdTVVdTVVdTVVdTVVdTVVdTVVdTVVdTVVdT8E3YQQAAADZ0Uk5TAAIEBQYHCAkKCwwUN0FER0hOW2uNjqWqq6ytrq+wsbKztLW2t7i5uru8vb6/wMHCxcjT3PP3B0dhfwAAANlJREFUKM910+cSgjAQRtEIomAXu4iIYge7ef9Hs+ZzN4b9eW4mk1kGIaqdU9wQf2Nf5XPSiu4d+Z6jp/n54/KghZ40h5ZymbFQGCCkLg3WKC+MEfYs2AHCrszCBGHLQ5gXpggbFooRwrrEwgxhxUOcE5w5wtJiYYHQZjt0EuUhX3r19vU7Y++ozgeMD7i/buYhYTcDj8gz3RQ8prwHB/aPyzvwhPLWzBtwSLi0Bk8pr8BR0cgzwiIycw0cUxZ9xXOH7VZ9vAVn4X840Vh4F9Pp1w/gZ92mpesDuLpM+1blc68AAAAASUVORK5CYII=");left:50%;}
 #photo-prev-link a,#photo-next-link a{display:block;width:100%;height:100%;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;overflow:hidden;text-indent:-900000px;}
 #photos-upload-spacer,#photos-upload-new-wrapper,#photos-upload-exist-wrapper{margin-bottom:1em;}
 #photos-upload-existing-album-text,#photos-upload-newalbum-div{background-color:#555753;color:#eeeeee;padding:1px;}
 #photos-upload-album-select,#photos-upload-newalbum{width:99%;}
 #photos-upload-perms-menu{text-align:right;}
-#photo-edit-caption,#photo-edit-newtag,#photo-edit-albumname{float:left;margin-bottom:25px;}
 #photo-edit-link-wrap{margin-bottom:15px;}
-#photo-edit-caption,#photo-edit-newtag{width:100%;}
-#photo-like-div{margin-bottom:25px;}
-#photo-edit-delete-button{margin-left:200px;}
+#photo-edit-perms{width:auto;}
+#photo-edit-rotate-label{width:38%;display:inline-block;font-size:small;margin:0 10px 1em 0;border:1px solid #2e2f2e;padding:3px 5px;background:#eeeecc;color:#111111;-moz-box-shadow:3px 3px 5px 0px #111111;-o-box-shadow:3px 3px 5px 0px #111111;-webkit-box-shadow:3px 3px 5px 0px #111111;-ms-box-shadow:3px 3px 5px 0px #111111;box-shadow:3px 3px 5px 0px #111111;}
+#photo-like-div{float:left;margin:auto 0 0;width:2em;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;border:1px solid #eeeecc;}
+.wall-item-like-buttons>*{display:inline;}
+#photo-edit-delete-button{margin:auto auto auto 1em;}
 #photo-edit-end{margin-bottom:35px;}
 #photo-caption{font-size:110%;font-weight:bold;margin-top:15px;margin-bottom:15px;}
+#wall-photo-container{margin:0 auto 1em 4em;width:90%;}
 .prvmail-text{width:100%;}
 #prvmail-subject{width:100%;color:#2e2f2e;background:#eeeecc;}
 #prvmail-submit-wrapper{margin-top:10px;}
@@ -313,17 +321,16 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
 #contact-edit-last-update-text{margin-bottom:15px;}
 #contact-edit-last-updated{font-weight:bold;}
 #contact-edit-poll-text{display:inline;}
-#contact-edit-info_tbl,#contact-edit-info_parent,.mceLayout{width:100%;}
 #contact-edit-end{clear:both;margin-bottom:65px;}
 .contact-photo-menu-button{position:absolute;background:url("dark/photo-menu.jpg") top left no-repeat transparent;margin:0px;padding:0px;width:16px;height:16px;top:64px;left:0px;overflow:hidden;text-indent:40px;display:none;}
-.contact-photo-menu{width:auto;border:2px solid #444444;background:#2e2f2e;color:#eeeecc;position:absolute;left:0px;top:90px;display:none;z-index:10000;}.contact-photo-menu li a{display:block;padding:2px;}.contact-photo-menu li a:hover{color:white;background:#3465A4;text-decoration:none;}
+.contact-photo-menu{width:auto;border:2px solid #88a9d2;background:#2e2f2e;color:#eeeecc;position:absolute;font-size:smaller;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;left:0px;top:90px;display:none;z-index:10000;}.contact-photo-menu li a{display:block;padding:4px;color:#88a9d2;background:#eeeecc;line-height:1;}.contact-photo-menu li a:hover{background:#88a9d2;color:#eeeecc;text-decoration:none;}
 #id_openid_url{background:url(dark/login-bg.gif) no-repeat;background-position:0 50%;padding-left:18px;}
 #settings-default-perms{margin-bottom:20px;}
 #register-form div,#profile-edit-form div{clear:both;}
 .settings-block label{clear:left;}
 .settings-block input{margin:10px 5px;}
-#register-form label,#profile-edit-form label{width:300px;float:left;}
-#register-form span,#profile-edit-form span{color:#555753;display:block;margin-bottom:20px;}
+#register-form label,#profile-edit-form label{width:23em;}
+#register-form span,#profile-edit-form span{color:#555753;display:inline-block;margin-bottom:20px;}
 #profile-edit-marital-label span{margin:-4px;}
 .settings-submit-wrapper,.profile-edit-submit-wrapper{margin:0 0 30px;}
 .profile-edit-side-div{display:none;}
@@ -385,20 +392,22 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
 .fc-state-highlight{background:#eeeecc;color:#2e2f2e;}
 .directory-item{float:left;margin:0 5px 4px 0;padding:3px;width:180px;height:250px;position:relative;}
 #group-sidebar{margin-bottom:10px;}
-.group-selected,.nets-selected,.fileas-selected{padding:3px;color:#2e2f2e;background:#eeeecc;border:1px solid #88a9d2;}
-.group-selected:hover,.nets-selected:hover,.fileas-selected:hover{padding:3px;color:#88a9d2;background:#2e2f2e;border:1px solid #88a9d2;}
+.categories-selected,.group-selected,.nets-selected,.fileas-selected{color:#2e2f2e;background:#eeeecc;color:#2e2f2e;border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.categories-selected:hover,.group-selected:hover,.nets-selected:hover,.fileas-selected:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;}
+.categories-selected a,.group-selected a,.nets-selected a,.fileas-selected a{color:#2e2f2e;text-decoration:none;}
 .groupsideedit{margin-right:10px;}
 #sidebar-group-ul{padding-left:0;}
 #sidebar-group-list{margin:0 0 5px 0;}#sidebar-group-list li{margin-top:10px;}
 #sidebar-group-list .icon{display:inline-block;width:12px;height:12px;}
-.sidebar-group-element{padding:3px;}.sidebar-group-element:hover{color:#2e2f2e;background:#88a9d2;font-weight:bold;padding:3px;}
+.sidebar-group-element{border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.sidebar-group-element:active,.sidebar-group-element:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;}
+.sidebar-group-element a{border:0;text-decoration:none;}
 #sidebar-new-group{margin:auto;display:inline-block;color:#eeeeee;text-decoration:none;text-align:center;}
 #peoplefind-sidebar form{margin-bottom:10px;}
 #sidebar-new-group:hover{}
 #sidebar-new-group:active{position:relative;top:1px;}
-#side-peoplefind-url{background-color:#2e2f2e;color:#eeeecc;border:1px solid #999999;margin-right:3px;width:75%;}#side-peoplefind-url:hover,#side-peoplefind-url:focus{background-color:#eeeeee;color:#222222;border:1px solid #333333;}
-.nets-ul{margin:0px;padding:0px;list-style:none;list-style-position:inside;}.nets-ul li{margin:10px 0 0;}
-.nets-link,.nets-all{margin-left:0px;}
+#side-peoplefind-url{border:1px solid #999999;margin-right:3px;width:75%;}
+.categories-ul,.nets-ul{margin:0px;padding:0px;list-style:none;list-style-position:inside;}.categories-ul li,.nets-ul li{margin:10px 0 0;}
+.categories-link,.nets-link,.nets-all{border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin-left:0px;}.categories-link:active,.nets-link:active,.nets-all:active,.categories-link:hover,.nets-link:hover,.nets-all:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;}
+.categories-link a,.nets-link a,.nets-all a{border:0;text-decoration:none;}
 #netsearch-box{margin:20px 0px 30px;width:135px;}#netsearch-box #search-submit{margin:5px 5px 0px 0px;}
 #pending-update{float:right;color:white;font-weight:bold;background-color:red;padding:0 0.3em;}
 .admin.linklist{border:0;padding:0;}
@@ -413,8 +422,7 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
 #adminpage .toggleplugin{float:left;margin-right:1em;}
 #adminpage table{width:100%;border-bottom:1px solid #111111;margin:5px 0;}#adminpage table th{font-weight:bold;text-align:left;}
 #adminpage table td{padding:5px;vertical-align:middle;}
-#adminpage table#users{padding:5px;}
-#adminpage table#users img{width:16px;height:16px;}
+#adminpage table#users{padding:5px;}#adminpage table#users img{width:16px;height:16px;}
 #adminpage table#users a{color:#eeeecc;text-decoration:underline;}
 #adminpage td .icon{float:left;}
 #adminpage .selectall{text-align:right;}
@@ -431,7 +439,9 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
 .field.radio .field_help{margin-left:297px;}
 .popup{width:100%;height:100%;top:0px;left:0px;position:absolute;display:none;}.popup .background{background-color:#111111;opacity:0.5;width:100%;height:100%;position:absolute;top:0px;left:0px;}
 .popup .panel{top:25%;left:25%;width:50%;height:50%;padding:1em;position:absolute;border:4px solid #000000;background-color:white;}
-#panel{z-index:100;}
+#panel{position:absolute;font-size:small;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;border:1px solid #eeeeee;background-color:#2e302e;color:#eeeecc;padding:1em;z-index:100;}
+.pager{margin-top:60px;display:block;clear:both;text-align:center;font-size:small;font-weight:bold;}.pager span{padding:4px;margin:4px;}
+.pager_current{background-color:#88a9d2;color:#2e2f2e;}
 .grey,.gray{color:gray;}
 .orange{color:orange;}
 .red{color:red;}
@@ -442,8 +452,8 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
 .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 img.noicon{background-image:url("../../../images/icons/48/plugin.png");background-position:center center;background-repeat:no-repeat;}
 .oauthapp a{float:left;}
 .iconspacer{display:block;width:16px;height:16px;}
-.icon{display:block;width:20px;height:20px;background:url(dark/icons.png) no-repeat;border:0;text-decoration:none;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.icon:hover{border:0;text-decoration:none;}
-.editicon{display:inline-block;width:21px;height:21px;background:url(dark/editicons.png) no-repeat;border:0;text-decoration:none;}
+.icon{display:block;width:20px;height:20px;background:transparent url("dark/icons.png") no-repeat;border:0;text-decoration:none;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.icon:hover{border:0;text-decoration:none;}
+.editicon{display:inline-block;width:21px;height:21px;background:url("dark/editicons.png") no-repeat;border:0;text-decoration:none;}
 .shadow{-moz-box-shadow:2px 2px 5px 2px #111111;-o-box-shadow:2px 2px 5px 2px #111111;-webkit-box-shadow:2px 2px 5px 2px #111111;-ms-box-shadow:2px 2px 5px 2px #111111;box-shadow:2px 2px 5px 2px #111111;}.shadow:active,.shadow:focus,.shadow:hover{-moz-box-shadow:0 0 0 0 #111111;-o-box-shadow:0 0 0 0 #111111;-webkit-box-shadow:0 0 0 0 #111111;-ms-box-shadow:0 0 0 0 #111111;box-shadow:0 0 0 0 #111111;}
 .editicon:hover{border:0;}
 .boldbb{background-position:0px 0px;}.boldbb:hover{background-position:-22px 0px;}
@@ -507,9 +517,10 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
 .type-unkn{background-position:-80px 0;}
 .cc-license{margin-top:100px;font-size:0.7em;}
 footer{display:block;clear:both;}
+#sectionfooter{margin:1em 0 1em 0;}
 #profile-jot-text{height:20px;color:#eeeecc;background:#2e2f2e;border:1px solid #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;width:99.5%;}
 #photo-edit-perms-select,#photos-upload-permissions-wrapper,#profile-jot-acl-wrapper{display:block !important;background:#2e2f2e;color:#eeeecc;}
-#profile-jot-acl-wrapper{margin:0 10px;border:1px solid #555753;border-top:0;}
+#profile-jot-acl-wrapper{margin:0 10px;border:1px solid #555753;border-top:0;font-size:small;}
 #acl-wrapper{width:660px;margin:0 auto;}
 #acl-search{float:right;background:#ffffff url("../../../images/search_18.png") no-repeat right center;padding-right:20px;margin:6px;color:#111111;}
 #acl-showall{float:left;display:block;width:auto;height:18px;background:#eeeecc url("../../../images/show_all_off.png") 8px 8px no-repeat;padding:7px 10px 7px 30px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;color:#999999;margin:5px 0;}#acl-showall.selected{color:black;background:#ff9900 url(../../../images/show_all_on.png) 8px 8px no-repeat;}

view/theme/dispy/dark/style.less

@@ -90,6 +90,9 @@ tr:nth-child(even) {
 //outline-style		Sets the style of an outline	dotted,dashed,solid,double,groove,ridge,inset,outset,inherit
 //outline-width		Sets the width of an outline 	thin,medium,thick,length,inherit
 :focus {
+	outline: none;
+}
+a:focus {
 	outline: invert, dashed, thin;
 }
 [disabled="disabled"] {
@@ -181,24 +184,31 @@ blockquote {
 	.borders(1px, solid, darken(@main_alt_colour, 33%));
 	.rounded_corners;
 }
-label {
+.label () {
 	width: 38%;
 	display: inline-block;
 	font-size: small;
 	margin: 0 10px 1em 0;
 	.borders(1px, solid, @bg_colour);
-	padding: 5px;
+	padding: 3px 5px;
 	background: @main_colour;
 	color: darken(@main_alt_colour, 86.5%);
 	.box_shadow(3px, 3px, 5px);
 }
+label {
+	.label;
+}
 input {
 	.box(250px, 25px);
 	.borders(1px, solid, darken(@main_alt_colour, 33.5%));
+	width: 17em;
 	&[type="checkbox"],
 	&[type="radio"] {
-		margin: 0;
 		.box(15px, 15px);
+		margin: 0;
+	}
+	&[type="radio"] {
+		margin: 5px 0;
 	}
 	&[type="submit"],
 	&[type="button"] {
@@ -260,30 +270,6 @@ h6 {
 .smalltext {
 	font-size: 0.7em;
 }
-#panel {
-	position: absolute;
-	.rounded_corners;
-	.borders(1px, solid, @main_alt_colour);
-	background-color: @bg_alt_colour;
-	color: @main_colour;
-	padding: 1em;
-}
-.pager {
-	margin-top: 60px;
-	display: block;
-	clear: both;
-	text-align: center;
-	font-size: small;
-	font-weight: bold;
-	span {
-		padding: 4px;
-		margin: 4px;
-	}
-}
-.pager_current {
-	background-color: @link_colour;
-	color: @bg_colour;
-}
 
 
 /**
@@ -301,10 +287,35 @@ h6 {
 	.box(100%, 100%);
 	margin: 0 auto;
 }
+.button {
+	// .box(25%, auto);
+	// background: @menu_bg_colour;
+	color: @main_colour;
+	// .borders(2px, outset, darken(@menu_bg_colour, 20%));
+	.rounded_corners;
+	padding: 5px;
+	// font-size: smaller;
+	cursor: pointer;
+	// &.active {
+		// .box_shadow(4px, 4px, 7px);
+	// }
+	a {
+		color: @main_colour;
+		// font-size: smaller;
+		font-weight: bold;
+	}
+}
+#profile-listing-desc {
+	a {
+		color: @main_colour;
+		font-weight: bold;
+	}
+}
 [class$="-desc"],
 [id$="-desc"] {
-	color: @bg_colour;
-	background: @main_colour;
+	color: @main_colour;
+	background: @bg_colour;
+	.borders(2px, outset, @dk_main_colour);
 	.rounded_corners;
 	// .box_shadow(3px, 3px, 5px);
     margin: 3px 10px 7px 0;
@@ -345,6 +356,11 @@ h6 {
 	font-style: italic;
 	font-size: smaller;
 }
+.like-rotator {
+	vertical-align: middle;
+	text-align: center;
+	margin: 1px;
+}
 
 
 /**
@@ -448,9 +464,11 @@ ul#user-menu-popup {
 		a {
 			display: block;
 			padding: 5px;
+			color: @main_alt_colour;
+			background-color: @menu_bg_colour;
 			&:hover {
-				color: @main_colour;
-				background-color: @bg_alt_colour;
+				color: @bg_colour;
+				background-color: @main_alt_colour;
 			}
 			&.nav-sep {
 				border-top: 1px solid @bg_alt_colour; } } }
@@ -500,7 +518,8 @@ nav .nav-link {
 		background-position: -44px -190px;
 	}
 }
-#nav-login-link, #nav-logout-link {
+#nav-login-link,
+#nav-logout-link {
 	background-position: 0 -88px;
 	&:hover {
 		background-position: -22px -88px;
@@ -567,6 +586,9 @@ div.jGrowl div {
 		padding-left: 58px;
 		margin-top: 50px;
 	}
+	// &.jGrowl-message {
+
+	// }
 }
 #nav-notifications-menu {
 	margin: 30px 0 0 -20px;
@@ -617,7 +639,7 @@ nav #nav-notifications-linkmenu {
 	color: transparent;
 	.rounded_corners;
 	z-index: 100;
-	.box(300px, 60px);
+	.box(270px, 60px);
 }
 #nav-buttons {
 	clear: both;
@@ -652,13 +674,20 @@ nav #nav-notifications-linkmenu {
 	background: @dk_bg_colour;
 	.rounded_corners;
 }
+#search-text,
+#mini-search-text {
+	background: white;
+	color: @bg_colour;
+}
 #search-text {
-	.borders;
-	background: @bg_colour;
-	color: @main_colour;
+	.borders(1px, solid, @main_alt_colour);
+	margin: 5px 0;
+}
+#mini-search-text {
 	font-size: 8pt;
-	margin: 8px;
-	.box(10em, 14px);
+	height: 14px;
+	width: 10em;
+	margin: 5px;
 }
 #scrollup {
 	position: fixed;
@@ -673,7 +702,7 @@ nav #nav-notifications-linkmenu {
 #user-menu {
 	.box_shadow(5px, 0, 10px, 0);
 	display: block;
-	width: 75%;
+	width: 80%;
 	margin: 3px 0 0 0;
 	position: relative;
 	.rounded_corners;
@@ -699,7 +728,7 @@ nav #nav-notifications-linkmenu {
 .nav-ajax-left {
 	.box(30px, 19px);
 	background: transparent url(dark/notifications.png) 0 0 no-repeat;
-	color: @main_colour;
+	color: @shadow_colour;
 	font-weight: bold;
 	font-size: 0.8em;
 	padding-top: 0.2em;
@@ -744,12 +773,15 @@ nav #nav-notifications-linkmenu {
 .menu-popup {
 	position: absolute;
 	display: none;
-	width: 11em;
+	// width: 11em;
 	background: white;
 	color: @bg_colour;
 	margin: 0px;
 	padding: 0px;
-	.borders(3px, solid, @shiny_colour);
+	font-size: small;
+	line-height: 1.2;
+	.borders(3px, solid, @link_colour);
+	.rounded_corners;
 	z-index: 100000;
 	.box_shadow;
 	a {
@@ -758,7 +790,8 @@ nav #nav-notifications-linkmenu {
 		padding: 5px 10px;
 		text-decoration: none;
 		&:hover {
-			background-color: lighten(@shiny_colour, 55%);
+			color: @main_colour;
+			background-color: @link_colour;
 		}
 	}
 	.menu-sep {
@@ -792,7 +825,11 @@ nav #nav-notifications-linkmenu {
 	padding: 7px 7px 0px 0px;
 }
 .notify-seen {
-	background: darken(@main_alt_colour, 20%);
+	background: @disabled_colour;
+	color: @main_colour;
+}
+.notify-unseen {
+	color: @main_colour;
 }
 
 
@@ -835,7 +872,7 @@ nav #nav-notifications-linkmenu {
 #asidemain {
 	float: left;
 	font-size: small;
-	margin: 20px 0 20px 35px;
+	margin: 1em;
 	width: 25%;
 	display: inline;
 }
@@ -851,10 +888,12 @@ nav #nav-notifications-linkmenu {
 		padding-bottom: 3px;
 	}
 	#profile-photo-wrapper {
-		margin: 20px;
-		img {
-			.box_shadow(3px, 3px, 10px, 0);
-		}
+		margin: 20px 0;
+		background-color: @menu_bg_colour;
+		padding: 5px;
+		.box(175px, 175px);
+		.rounded_corners;
+		.box_shadow(3px, 3px, 10px, 0);
 	}
 }
 #asidemain {
@@ -1000,7 +1039,7 @@ nav #nav-notifications-linkmenu {
 	background: darken(@main_alt_colour, 46.8%);
 }
 [id$="jot-text_ifr"] {
-	width: 99.900002% !important;
+	// width: 99.900002% !important;
 	color: @bg_colour;
 	background: @main_colour;
 	.mceContentBody {
@@ -1078,11 +1117,10 @@ nav #nav-notifications-linkmenu {
 #profile-jot-perms {
 	float: right;
 	color: @menu_bg_colour;
-	background-color: @main_colour;
 	.box(20px, 20px);
 	.rounded_corners;
 	.box_shadow(3px, 3px, 5px, 0);
-	.borders(2px, outset, @main_alt_colour);
+	.borders(2px, outset, @menu_bg_colour);
 	overflow: hidden;
 	margin: 0 10px 0 10px;
 }
@@ -1112,9 +1150,10 @@ nav #nav-notifications-linkmenu {
 	}
 }
 #jot-perms-icon {
-	.box(20px, 22px);
+	.box(22px, 22px);
 	.rounded_corners;
 	overflow: hidden;
+	background: @menu_bg_colour url("dark/icons.png") -88px -40px;
 }
 #group_allow_wrapper,
 #group_deny_wrapper,
@@ -1156,6 +1195,9 @@ nav #nav-notifications-linkmenu {
 	color: darken(@main_alt_colour, 13%);
 }
 #profile-jot-desc {
+	background: @bg_colour;
+	.borders;
+	.rounded_corners;
 	color: @red_orange;
 	margin: 5px 0;
 }
@@ -1169,9 +1211,9 @@ nav #nav-notifications-linkmenu {
 	display: none;
 }
 #jot-preview-content {
-	background-color: @bg_alt_colour;
+	background-color: @shiny_colour;
 	color: @main_colour;
-	.borders(1px, solid, @main_colour);
+	.borders(1px, solid, @bg_colour);
 	.rounded_corners;
 	.box_shadow(5px, 0, 10px);
 	padding: 3px 3px 6px 10px;
@@ -1187,10 +1229,10 @@ nav #nav-notifications-linkmenu {
  * section
  */
 #sectionmain {
-	margin: 20px;
+	margin: 1em;
 	font-size: 0.8em;
 	min-width: 475px;
-	width: 67%;
+	width: 69%;
 	float: left;
 	display: inline;
 }
@@ -1207,30 +1249,45 @@ nav #nav-notifications-linkmenu {
 		font-size: smaller;
 	}
 }
-.tab {
+.multibutton () {
 	.borders(1px, solid, @hover_colour);
 	padding: 4px;
-	&:hover,
-	&.active:hover,
-	&:active {
+	.rounded_corners;
+	&:active,
+	&:hover {
 		background: @shiny_colour;
 		color: @main_colour;
 		.borders(1px, solid, @hover_colour);
 	}
-	&.active {
-		background: @main_colour;
-		color: @bg_colour;
-		.borders(1px, solid, @hover_colour);
-		a {
-			color: @bg_colour;
-			text-decoration: none;
-		}
-	}
 	a {
 		border: 0;
 		text-decoration: none;
 	}
 }
+.multibutton_active () {
+	background: @main_colour;
+	color: @bg_colour;
+	.borders(1px, solid, @hover_colour);
+	padding: 4px;
+	.rounded_corners;
+	&:hover {
+		background: @shiny_colour;
+		color: @main_colour;
+		.borders(1px, solid, @hover_colour);
+	}
+	a {
+		color: @bg_colour;
+		text-decoration: none;
+	}
+}
+.tab {
+	.multibutton;
+}
+.tab {
+	&.active {
+		.multibutton_active;
+	}
+}
 
 
 /**
@@ -1251,6 +1308,10 @@ nav #nav-notifications-linkmenu {
 }
 .wall-item-outside-wrapper .wall-item-comment-wrapper {
 	/*margin-left: 90px;*/
+	.preview {
+		border: 0;
+		.rounded_corners(0px);
+	}
 }
 .shiny {
 	background: @shiny_colour;
@@ -1287,7 +1348,8 @@ nav #nav-notifications-linkmenu {
 }
 .wall-item-info {
 	float: left;
-	width: 110px;
+	width: 7em;
+	position: relative;
 }
 .wall-item-photo-wrapper {
 	.box(80px, 80px);
@@ -1352,26 +1414,34 @@ nav #nav-notifications-linkmenu {
 	}
 }
 .wall-item-author,
-.wall-item-actions-author {
-	clear: left;
-	float: left;
-	font-size: 0.8em;
-	color: lighten(@menu_bg_colour, 20%);
-	margin: 1em auto 0 0.2em;
-}
+.wall-item-actions-author,
 .wall-item-ago {
-	display: inline;
-	padding-left: 10px;
+	color: @main_colour;
+	line-height: 1;
+	display: inline-block;
+	font-size: x-small;
+	margin: 0.5em auto;
+	font-weight: bold;
+}
+.comment-edit-preview {
+	width: auto;
+	margin: auto auto auto -2em;
+	&.wall-item-author,
+	&.wall-item-actions-author,
+	&.wall-item-ago {
+		font-size: smaller;
+	}
 }
 .wall-item-location {
-	margin-top: 15px;
-	width: 100px;
+	margin-top: 2em;
+	width: 6em;
 	overflow: hidden;
 	.text_overflow;
 	.icon {
 		float: left;
 	}
-	> a, .smalltext {
+	> a,
+	.smalltext {
 		margin-left: 25px;
 		font-size: 0.7em;
 		display: block;
@@ -1405,7 +1475,8 @@ nav #nav-notifications-linkmenu {
 }
 .wall-item-photo-menu {
 	min-width: 92px;
-	.borders(2px, solid, white);
+	font-size: 0.75em;
+	.borders(2px, solid, @menu_bg_colour);
 	border-top: 0px;
 	background: @menu_bg_colour;
 	position: absolute;
@@ -1417,7 +1488,7 @@ nav #nav-notifications-linkmenu {
 	li a {
 		white-space: nowrap;
 		display: block;
-		padding: 5px 2px;
+		padding: 5px 6px;
 		color: @main_alt_colour;
 		&:hover {
 			color: @menu_bg_colour;
@@ -1430,12 +1501,16 @@ nav #nav-notifications-linkmenu {
 	width: 100%;
 }
 #connect-services-header,
+#extra-help-header {
+	margin: 1.5em 0 0 0;
+}
 #connect-services,
-#extra-help-header,
-#extra-help,
-#postit-header,
-#postit {
-	margin: 5px 0 0 0;
+#extra-help {
+	.list_reset;
+	margin: 1em 0 0 0;
+	li {
+		display: inline;
+	}
 }
 
 
@@ -1446,8 +1521,14 @@ nav #nav-notifications-linkmenu {
 	font-size: 0.9em;
 	margin-left: 5em;
 }
+.hide-comments-outer {
+	font-size: small;
+}
 .wall-item-outside-wrapper.comment {
 	margin-left: 5em;
+	.wall-item-info {
+		width: 5em;
+	}
 	.wall-item-photo {
 		width: 40px !important;
 		height: 40px !important;
@@ -1456,26 +1537,22 @@ nav #nav-notifications-linkmenu {
 		.box(40px, 40px);
 	}
 	.wall-item-photo-menu-button {
-		width: 50px;
-		top: 45px;
+		width: 3.35em;
+		top: 3.2em;
 		background-position: 35px center;
 	}
-	.wall-item-info {
-		width: 60px;
-	}
-	.wall-item-body {
-		margin-left: 10px;
-	}
 	.wall-item-author {
 		margin-left: 0.2em;
 	}
 	.wall-item-photo-menu {
-		min-width: 50px;
-		top: 60px;
+		min-width: 4.5em;
+		top: 5.5em;
 	}
 }
 .comment-wwedit-wrapper {
-	/*margin: 30px 0px 0px 80px;*/
+    .borders(1px, solid, @main_colour);
+    .rounded_corners;
+    margin: 5px;
 }
 .comment-edit-wrapper {
 	border-top: 1px #aaa solid;
@@ -1565,7 +1642,6 @@ div {
 	}
 	&[id$="wrapper"] {
 		height: 100%;
-		margin-bottom: 1em;
 		br {
 			clear: left;
 		}
@@ -1626,9 +1702,9 @@ div {
 	margin: 0 10px 10px 0;
 }
 #photo-photo {
-	max-width: 100%;
+	margin: auto auto 5em 20%;
 	img {
-		max-width: 100%;
+		max-width: 50%;
 	}
 }
 .photo-top-image-wrapper a:hover,
@@ -1636,7 +1712,8 @@ div {
 .photo-album-image-wrapper a:hover {
 	border-bottom: 0;
 }
-.photo-top-photo, .photo-album-photo {
+.photo-top-photo,
+.photo-album-photo {
 	.rounded_corners(5px 5px 0 0);
 }
 .photo-top-album-name,
@@ -1645,21 +1722,16 @@ div {
 	bottom: 0;
 	padding: 0 5px;
 }
-#photo-photo {
-	position: relative;
-	// float: left;
-	margin: 5px 45%;
-}
 #photo-prev-link,
 #photo-next-link {
 	position: absolute;
 	// .box(30%, 100%);
-	.box(50px, 150px);
+	.box(50px, 200px);
 	background: white center center no-repeat;
 	opacity: 0;
 	.transition(all, 0.5s);
 	z-index: 10;
-	top: 175px;
+	top: 15em;
 	.rounded_corners;
 	&:hover {
 		opacity: 0.6;
@@ -1672,12 +1744,12 @@ div {
 #photo-prev-link {
 	// background-image: url(dark/prev.png);
 	background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAnCAMAAADTjiM/AAAAA3NCSVQICAjb4U/gAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAALpQTFRF////AAAAQEBAZmZmVVVVSUlJTU1NXV1dVVVVTk5OW1tbWlpaWFhPWFhQU1pTVVVVVlZSVVlRVlZTVFdUVFdUVVdTVFZSVldUVldSVldSVldTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVZUVVdTVVdTVVhSVVdTVVdTVVhSVVdTVVdTVVhSVVdTVVdTVVdTVVdTVVdTVVdTVVhTVVdTVVdTVVdTVVdT3XYY/AAAAD10Uk5TAAEEBQYHCgsMDQ4RHSAlP0FFR1hee3+JnqSqq6ytrq+wsbKztLW2t7y9vr/AwcLDxMXGx8jU1dng7O/3+TmOwVsAAADASURBVCjPddPXEoIwEAXQINh7Q8WKYu+95v9/S0dxZxNy83hgMpvdu0Jox642r25GVxGfys+5540sZV3jyY/lWeVxyDLg7AR/lhXOI+KZZeRFgvGQeMnY9olXScYD4jXnPvHGzNsU4x7xjnGsa+YO8T7NnukRHzgXiY/KNKiUkzqkZ8ivnDoKD/xfBvdbbXM9sH70Xtgf2E/YfzgvOF+YB5gf5cPcAfmsgTy3QP5vYF8akf36XvXIRhZPlPyLWxBvNENWsZXDKukAAAAASUVORK5CYII=");
-    left: 22%;
+    left: 5%;
 }
 #photo-next-link {
 	// background-image: url(dark/next.png);
 	background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAnCAMAAADTjiM/AAAAA3NCSVQICAjb4U/gAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAKVQTFRF////gICAQEBAZmZmVVVVSUlJYGBgVVVVTU1NXV1dVVVVWVlZU1hTVlZSVlZTVlZTVVlRVVhSVFdUVlhTVVdTVFZTVVdTVldTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVhSVVdTVVdTVVdTVVdTVVdTVVdTVVdTVVdTVVdT8E3YQQAAADZ0Uk5TAAIEBQYHCAkKCwwUN0FER0hOW2uNjqWqq6ytrq+wsbKztLW2t7i5uru8vb6/wMHCxcjT3PP3B0dhfwAAANlJREFUKM910+cSgjAQRtEIomAXu4iIYge7ef9Hs+ZzN4b9eW4mk1kGIaqdU9wQf2Nf5XPSiu4d+Z6jp/n54/KghZ40h5ZymbFQGCCkLg3WKC+MEfYs2AHCrszCBGHLQ5gXpggbFooRwrrEwgxhxUOcE5w5wtJiYYHQZjt0EuUhX3r19vU7Y++ozgeMD7i/buYhYTcDj8gz3RQ8prwHB/aPyzvwhPLWzBtwSLi0Bk8pr8BR0cgzwiIycw0cUxZ9xXOH7VZ9vAVn4X840Vh4F9Pp1w/gZ92mpesDuLpM+1blc68AAAAASUVORK5CYII=");
-    left: 44%;
+    left: 50%;
 }
 #photo-prev-link a,
 #photo-next-link a {
@@ -1708,21 +1780,35 @@ div {
 #photo-edit-caption,
 #photo-edit-newtag,
 #photo-edit-albumname {
-	float: left;
-	margin-bottom: 25px;
+
 }
 #photo-edit-link-wrap {
 	margin-bottom: 15px;
 }
 #photo-edit-caption,
 #photo-edit-newtag {
-	width: 100%;
+
+}
+#photo-edit-perms {
+	width: auto;
+}
+#photo-edit-rotate-label {
+	.label;
 }
 #photo-like-div {
-	margin-bottom: 25px;
+	float: left;
+	margin: auto 0 0;
+	width: 2em;
+	.rounded_corners;
+	.borders;
+}
+.wall-item-like-buttons {
+	> * {
+		display: inline;
+	}
 }
 #photo-edit-delete-button {
-	margin-left: 200px;
+	margin: auto auto auto 1em;
 }
 #photo-edit-end {
 	margin-bottom: 35px;
@@ -1733,6 +1819,10 @@ div {
 	margin-top: 15px;
 	margin-bottom: 15px;
 }
+#wall-photo-container {
+	margin: 0 auto 1em 4em;
+	width: 90%;
+}
 
 
 /**
@@ -1903,11 +1993,6 @@ div {
 #contact-edit-poll-text {
 	display: inline;
 }
-#contact-edit-info_tbl,
-#contact-edit-info_parent,
-.mceLayout {
-	width: 100%;
-}
 #contact-edit-end {
 	clear: both;
 	margin-bottom: 65px;
@@ -1926,20 +2011,25 @@ div {
 }
 .contact-photo-menu {
 	width: auto;
-	.borders(2px, solid, darken(@main_alt_colour, 66.5%));
+	.borders(2px, solid, @link_colour);
 	background: @bg_colour;
 	color: @main_colour;
 	position: absolute;
+	font-size: smaller;
+	.rounded_corners;
 	left: 0px;
 	top: 90px;
 	display: none;
 	z-index: 10000;
 	li a {
 		display: block;
-		padding: 2px;
+		padding: 4px;
+		color: @link_colour;
+		background: @main_colour;
+		line-height: 1;
 		&:hover {
-			color: white;
-			background: #3465A4;
+			background: @link_colour;
+			color: @main_colour;
 			text-decoration: none;
 		}
 	}
@@ -1971,13 +2061,12 @@ div {
 }
 #register-form label,
 #profile-edit-form label {
-    width: 300px;
-    float: left;
+    width: 23em;
 } 
 #register-form span,
 #profile-edit-form span {
     color: @menu_bg_colour;
-    display: block;
+    display: inline-block;
     margin-bottom: 20px;
 }
 #profile-edit-marital-label span {
@@ -1990,12 +2079,6 @@ div {
 .profile-edit-side-div {
 	display: none;
 }
-/*.profile-edit-side-div:hover {
-    display: block;
-}
-.profile-edit-side-link {
-    margin: 3px 0px 0px 70px;
-}*/
 #profiles-menu-trigger {
 	margin: 0px 0px 0px 25px;
 }
@@ -2287,21 +2370,24 @@ div {
 #group-sidebar {
 	margin-bottom: 10px;
 }
+.categories-selected,
 .group-selected,
 .nets-selected,
 .fileas-selected {
-	padding: 3px;
+	// padding: 4px;
 	color: @bg_colour;
-	background: @main_colour;
-	.borders(1px, solid, @link_colour);
+	// background: @main_colour;
+	// .borders(1px, solid, @link_colour);
+	.multibutton_active;
 }
+.categories-selected:hover,
 .group-selected:hover,
 .nets-selected:hover,
 .fileas-selected:hover {
-	padding: 3px;
-	color: @link_colour;
-	background: @bg_colour;
-	.borders(1px, solid, @link_colour);
+//     padding: 4px;
+	// color: @bg_colour;
+//     background: @bg_colour;
+//     .borders(1px, solid, @link_colour);
 }
 .groupsideedit {
 	margin-right: 10px;
@@ -2320,13 +2406,8 @@ div {
 	}
 }
 .sidebar-group-element {
-	padding: 3px;
-	&:hover {
-		color: @bg_colour;
-		background: @link_colour;
-		font-weight: bold;
-		padding: 3px;
-	}
+	.multibutton;
+	.rounded_corners;
 }
 #sidebar-new-group {
 	margin: auto;
@@ -2350,25 +2431,22 @@ div {
 	}
 }
 #side-peoplefind-url {
-	background-color: @bg_colour;
-	color: @main_colour;
 	.borders(1px, solid, darken(@main_alt_colour, 33.5%));
 	margin-right: 3px;
 	width: 75%;
-	&:hover, &:focus {
-		background-color: @main_alt_colour;
-		color: darken(@main_alt_colour, 80%);
-		.borders(1px, solid, darken(@main_alt_colour, 73.5%));
-	}
 }
+.categories-ul,
 .nets-ul {
 	.list_reset;
 	li {
 		margin: 10px 0 0;
 	}
 }
+.categories-link,
 .nets-link,
 .nets-all {
+	.multibutton;
+	.rounded_corners;
 	margin-left: 0px;
 }
 #netsearch-box {
@@ -2454,13 +2532,13 @@ div {
 		}
 		&#users {
 			padding: 5px;
-		}
-		&#users img {
-			.box(16px, 16px);
-		}
-		&#users a {
-			color: @main_colour;
-			text-decoration: underline;
+		    img {
+			    .box(16px, 16px);
+    		}
+            a {
+			    color: @main_colour;
+			    text-decoration: underline;
+            }
 		}
 	}
 	td .icon {
@@ -2558,9 +2636,33 @@ div {
 	}
 }
 #panel {
+	position: absolute;
+	font-size: small;
+	.rounded_corners;
+	.borders(1px, solid, @main_alt_colour);
+	background-color: @bg_alt_colour;
+	color: @main_colour;
+	padding: 1em;
 	z-index: 100;
 }
-.grey, .gray {
+.pager {
+	margin-top: 60px;
+	display: block;
+	clear: both;
+	text-align: center;
+	font-size: small;
+	font-weight: bold;
+	span {
+		padding: 4px;
+		margin: 4px;
+	}
+}
+.pager_current {
+	background-color: @link_colour;
+	color: @bg_colour;
+}
+.grey,
+.gray {
 	color: gray;
 }
 .orange {
@@ -2637,7 +2739,7 @@ div {
 .icon {
 	display: block;
 	.box;
-	background: url(dark/icons.png) no-repeat;
+	background: transparent url("dark/icons.png") no-repeat;
 	border: 0;
 	text-decoration: none;
 	.rounded_corners;
@@ -2649,7 +2751,7 @@ div {
 .editicon {
 	display: inline-block;
 	.box(21px, 21px);
-	background: url(dark/editicons.png) no-repeat;
+	background: url("dark/editicons.png") no-repeat;
 	border: 0;
 	text-decoration: none;
 }
@@ -2890,6 +2992,9 @@ footer {
 	display: block;
 	clear: both;
 }
+#sectionfooter {
+	margin: 1em 0 1em 0;
+}
 #profile-jot-text {
 	height: 20px;
 	color: @main_colour;
@@ -2914,6 +3019,7 @@ footer {
 	margin: 0 10px;
 	.borders(1px, solid, @menu_bg_colour);
 	border-top: 0;
+	font-size: small;
 	// .box_shadow;
 }
 #acl-wrapper {

view/theme/dispy/dark/theme.php

@@ -1,19 +1,17 @@
 <?php
 
 /*
-* Name: Dispy Dark
-* Description: Dispy Dark: Dark, Spartan, Sleek, and Functional
-* Version: 1.2
-* Author: Simon <http://simon.kisikew.org/>
-* Maintainer: Simon <http://simon.kisikew.org/>
-* Screenshot: <a href="screenshot.jpg">Screenshot</a>
-*/
+ * Name: Dispy Dark
+ * Description: Dispy Dark: Dark, Spartan, Sleek, and Functional
+ * Author: Simon <http://simon.kisikew.org/>
+ * Maintainer: Simon <http://simon.kisikew.org/>
+ * Screenshot: <a href="screenshot.jpg">Screenshot</a>
+ */
 
 $a = get_app();
 $a->theme_info = array(
     'family' => 'dispy',
     'name' => 'dark',
-    'version' => '1.2'
 );
 
 function dispy_dark_init(&$a) {

view/theme/dispy/group_side.tpl

@@ -5,10 +5,9 @@
 	<ul id="sidebar-group-ul">
 		{{ for $groups as $group }}
 			<li class="sidebar-group-li">
-				<a href="$group.href" class="sidebar-group-element {{ if $group.selected }}group-selected{{ endif }}">$group.text</a>
+				<a href="$group.href" class="sidebar-group-element {{ if $group.selected }}group-selected{{ else }}group-other{{ endif }}">$group.text</a>
 				{{ if $group.edit }}
-					<a 
-                        class="groupsideedit"
+					<a class="groupsideedit"
                         href="$group.edit.href" title="$group.edit.title"><span class="icon small-pencil"></span></a>
 				{{ endif }}
 				{{ if $group.cid }}

view/theme/dispy/light/_base.less

@@ -24,16 +24,23 @@
 @menu_bg_colour: #555753;
 
 //* font colour, aka color: */
-@lt_main_colour: #ffff99;
+@lt_main_colour: lighten(@bg_colour, 10%);
 @main_colour: #111;
+@dk_main_colour: darken(@bg_colour, 10%);
 @main_alt_colour: #999999;
+// darken(@main_alt_colour, 6.5%) > #888888
+// //#9eabb0
 // darken(@main_alt_colour, 10%) > #777777
 // darken(@main_alt_colour, 20%) > #666666
 // darken(@main_alt_colour, 26.8%) > #555555
 // darken(@main_alt_colour, 33.5%) > #444444
 // darken(@main_alt_colour, 40%) > #333333
 //
+// lighten(@main_alt_colour, 26.5%) > #dddddd
 // lighten(@main_alt_colour, 20%) > #cccccc
+// lighten(@main_alt_colour, 13.5%) > #bbbbbb
+// lighten(@main_alt_colour, 6.5%) > #aaaaaa
+// lighten(@main_alt_colour, 30%)
 @disabled_colour: #dddddd;
 @shiny_colour: #f2f2c3;
 @red_orange: #ff2000;
@@ -49,11 +56,9 @@
 @info: #364e59;
 @alert: #ff0000;
 
-@lt_main_colour: lighten(@bg_colour, 10%);
-@dk_main_colour: darken(@bg_colour, 10%);
-
 //* links */
-@link_colour: #3465a4;
+// yes our link colour is "friendica blue" ;)
+@link_colour: @friendica_blue;
 @dk_link_colour: darken(@link_colour, 10%);
 @lt_link_colour: lighten(@link_colour, 10%);
 //@hover_colour: #729fcf;
@@ -130,7 +135,19 @@
 	-webkit-text-overflow: @t;
 	text-overflow: @t;
 }
-
+.lin_gradient(@x1: left, @x2: right, @y1: top, @y2: bottom, @c1: @bg_colour, @c2: @dk_bg_colour) {
+	// w3c
+	background: linear-gradient(@x1 @y2, @c1, @c2);
+	// webkit
+	// -webkit-gradient(<type>, <point> [, <radius>]?, <point> [, <radius>]? [, <stop>]*)
+	background: -webkit-gradient(linear, @x1 @y1, @x2 @y2, from(@c1), to(@c2));
+	// mozilla
+	// -moz-linear-gradient([<point> || <angle>,]? <stop>, <stop> [, <stop>])
+	background: -moz-linear-gradient(@x1 @y2, @c1, @c2);
+	// opera
+	//background: -o-linear-gradient([<point> || <angle>,]? <stop>, <stop> [, <stop>]);
+	background: -o-linear-gradient(@x1, @c1, @c2);
+}
 //* pre wrap */
 .wrap () {
 	white-space: pre-wrap;

view/theme/dispy/light/style.css

@@ -13,13 +13,14 @@ audio,canvas,video,time{display:inline-block;*display:inline;*zoom:1;}
 audio:not([controls]),[hidden]{display:none;}
 html{font-size:100%;overflow-y:scroll;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-o-text-size-adjust:100%;font-size-adjust:100%;}
 body{margin:0;padding:0;font-size:14pt;line-height:1.1em;font-family:sans-serif;color:#111111;background-color:#eeeeec;}
-button,input,select,textarea{color:#111111;background-color:#eeeeec;}
+button,input,select,textarea{color:#111111;background-color:white;}
 select{border:1px dotted #555555;padding:1px;margin:3px;color:#111111;background:#eeeeec;max-width:85%;min-width:85px;}
 option{padding:1px;color:#111111;background:#eeeeec;}option[selected="selected"]{color:#eeeeec;background:#2e3436;}
 tr:nth-child(even){background-color:#d6d6d1;}
-:focus{outline:invert, dashed, thin;}
-[disabled="disabled"]{background:#4e4f4e;color:#dddddd;}
-ins,mark{background-color:#2e302e;color:#ffffff;}
+:focus{outline:none;}
+a:focus{outline:invert, dashed, thin;}
+[disabled="disabled"]{background:#2e3436;color:#dddddd;}
+ins,mark{background-color:#eeeeec;color:#111111;}
 ins{text-decoration:none;}
 mark{font-style:italic;font-weight:bold;}
 pre,code,kbd,samp,.wall-item-body code{font-family:monospace, monospace;_font-family:monospace;font-size:1em;}
@@ -35,9 +36,10 @@ sup{top:-0.5em;}
 img{border:0 none;}
 a{color:#3465a4;text-decoration:none;margin-bottom:1px;}a:hover{color:#284d7d;border-bottom:1px dotted #284d7d;}
 a:hover img{text-decoration:none;}
-blockquote{background:#000000;color:#111111;text-indent:5px;padding:5px;border:1px solid #454545;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}
-label{width:38%;display:inline-block;font-size:small;margin:0 10px 1em 0;border:1px solid #eeeeec;padding:5px;background:#cccccc;color:#111111;-moz-box-shadow:3px 3px 5px 0px #111111;-o-box-shadow:3px 3px 5px 0px #111111;-webkit-box-shadow:3px 3px 5px 0px #111111;-ms-box-shadow:3px 3px 5px 0px #111111;box-shadow:3px 3px 5px 0px #111111;}
-input{width:250px;height:25px;border:1px solid #444444;}input[type="checkbox"],input[type="radio"]{margin:0;width:15px;height:15px;}
+blockquote{background:#aaaaaa;color:#111111;text-indent:5px;padding:5px;border:1px solid #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}
+label{width:38%;display:inline-block;font-size:small;margin:0 10px 1em 0;border:1px solid #eeeeec;padding:3px 5px;background:#cccccc;color:#111111;-moz-box-shadow:3px 3px 5px 0px #111111;-o-box-shadow:3px 3px 5px 0px #111111;-webkit-box-shadow:3px 3px 5px 0px #111111;-ms-box-shadow:3px 3px 5px 0px #111111;box-shadow:3px 3px 5px 0px #111111;}
+input{width:250px;height:25px;border:1px solid #444444;width:17em;}input[type="checkbox"],input[type="radio"]{width:15px;height:15px;margin:0;}
+input[type="radio"]{margin:5px 0;}
 input[type="submit"],input[type="button"]{background-color:#555753;border:2px outset #444444;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:1px 3px 4px 0 #111111;-o-box-shadow:1px 3px 4px 0 #111111;-webkit-box-shadow:1px 3px 4px 0 #111111;-ms-box-shadow:1px 3px 4px 0 #111111;box-shadow:1px 3px 4px 0 #111111;color:#eeeeec;cursor:pointer;font-weight:bold;width:auto;-moz-text-shadow:1px 1px #111111;-o-text-shadow:1px 1px #111111;-webkit-text-shadow:1px 1px #111111;-ms-text-shadow:1px 1px #111111;text-shadow:1px 1px #111111;}
 input[type="submit"]:active,input[type="button"]:active{-moz-box-shadow:0 0 0 0 #111111;-o-box-shadow:0 0 0 0 #111111;-webkit-box-shadow:0 0 0 0 #111111;-ms-box-shadow:0 0 0 0 #111111;box-shadow:0 0 0 0 #111111;}
 h1,h2,h3,h4,h5,h6{margin:10px 0px;font-weight:bold;border-bottom:1px solid #284d7d;}
@@ -51,13 +53,12 @@ h6{font-size:xx-small;}
 .fakelink,.lockview{color:#3465a4;cursor:pointer;}
 .fakelink:hover{color:#284d7d;}
 .smalltext{font-size:0.7em;}
-#panel{position:absolute;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;border:1px solid #999999;background-color:#2e302e;color:#111111;padding:1em;}
-.pager{margin-top:60px;display:block;clear:both;text-align:center;font-size:small;font-weight:bold;}.pager span{padding:4px;margin:4px;}
-.pager_current{background-color:#3465a4;color:#eeeeec;}
 .action{margin:5px 0;}
 .tool{margin:5px 0;list-style:none;}
 #articlemain{width:100%;height:100%;margin:0 auto;}
-[class$="-desc"],[id$="-desc"]{color:#eeeeec;background:#2e3436;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;}
+.button{color:#111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding:5px;cursor:pointer;}.button a{color:#111111;font-weight:bold;}
+#profile-listing-desc a{color:#eeeeec;font-weight:bold;}
+[class$="-desc"],[id$="-desc"]{color:#eeeeec;background:#2e3436;border:2px outset #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;}
 #item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;}
 .intro-approve-as-friend-desc{margin-top:10px;}
 .intro-desc{margin-bottom:20px;font-weight:bold;}
@@ -65,6 +66,7 @@ h6{font-size:xx-small;}
 #settings-nickname-desc{background:#2e3436;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;border:1px solid #111111;padding:5px;color:#eeeeec;}
 .contactname,.contact-name{font-weight:bold;font-size:smaller;}
 .contact-details{font-style:italic;font-size:smaller;}
+.like-rotator{vertical-align:middle;text-align:center;margin:1px;}
 #asidemain .field{overflow:hidden;width:200px;}
 #login-extra-links{overflow:auto !important;padding-top:60px !important;width:100% !important;}#login-extra-links a{margin-right:20px;}
 #login_standard{display:block !important;float:none !important;height:100% !important;position:relative !important;width:100% !important;}#login_standard .field label{width:200px !important;}
@@ -76,7 +78,7 @@ h6{font-size:xx-small;}
 #login_openid label{width:180px !important;}
 nav{height:60px;background-color:#2e3436;color:#eeeeec;position:relative;padding:20px 20px 10px 95px;}nav a{text-decoration:none;color:#eeeeec;border:0px;}nav a:hover{text-decoration:none;color:#eeeeec;border:0px;}
 nav #banner{display:block;position:absolute;left:51px;top:25px;}nav #banner #logo-text a{font-size:40px;font-weight:bold;margin-left:3px;}
-ul#user-menu-popup{display:none;position:absolute;background-color:#555753;width:100%;padding:10px 0px;margin:0px;top:20px;left:0;font-size:small;line-height:1;-o-border-radius:0 0 5px 5px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;-ms-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-moz-box-shadow:5px 5px 10px 0px #111111;-o-box-shadow:5px 5px 10px 0px #111111;-webkit-box-shadow:5px 5px 10px 0px #111111;-ms-box-shadow:5px 5px 10px 0px #111111;box-shadow:5px 5px 10px 0px #111111;z-index:10000;}ul#user-menu-popup li{display:block;}ul#user-menu-popup li a{display:block;padding:5px;}ul#user-menu-popup li a:hover{color:#2e3436;background-color:#eeeeec;}
+ul#user-menu-popup{display:none;position:absolute;background-color:#555753;width:100%;padding:10px 0px;margin:0px;top:20px;left:0;font-size:small;line-height:1;-o-border-radius:0 0 5px 5px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;-ms-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-moz-box-shadow:5px 5px 10px 0px #111111;-o-box-shadow:5px 5px 10px 0px #111111;-webkit-box-shadow:5px 5px 10px 0px #111111;-ms-box-shadow:5px 5px 10px 0px #111111;box-shadow:5px 5px 10px 0px #111111;z-index:10000;}ul#user-menu-popup li{display:block;}ul#user-menu-popup li a{display:block;padding:5px;color:#eeeeec;background-color:#555753;}ul#user-menu-popup li a:hover{color:#eeeeec;background-color:#111111;}
 ul#user-menu-popup li a.nav-sep{border-top:1px solid #2e302e;}
 nav .nav-link{display:inline-block;width:22px;height:22px;overflow:hidden;margin:0px 5px 5px;text-indent:50px;background:transparent url(light/icons.png) 0 0 no-repeat;}
 #nav-apps-link{background-position:0 -66px;}#nav-apps-link:hover{background-position:-22px -66px;}
@@ -101,13 +103,15 @@ div.jGrowl div.info{background:#364e59 url("../../../images/icons/48/info.png")
 nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkmenu.selected .icon.s22.notify{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAQAAABuvaSwAAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAAUJcAAFCXAZtv64UAAAHuSURBVCjPbZPbTlNBFIYHLixXRIhEQGNRMUopJAJyAyZ4Z2l8B+XwEBqKtjwOp8oDIAJKIJFUjdFIQCUYrRytdyb0459ht8wG9rrYs9b618y/TsYEH4ZK4qRYYIdDybZOI7TKakIfVhrJ8J2i5IBNyV93/kaaBuv3oV3MgwCTPKGHPkkPA0xRUMBrOgN4AP0o6BseEpF2m3es0qJTFQneyvMhgDsC9tZprnEcGuOPeMcDLUpW3jlLxlDBmJTFY6gLvsVv8tyh9G7U3Z6mwtCuJAoiECSh/w1+8otmTjLqF2KDNsNzRY1bruV0o6rFFtc9S5USh5RRWvAYv4xX9dYPS8ur1oBQC4Y99m2uHriRNda5ErLdU1l3jCI2xdJ3XOYLX6kP2W6K2OF54Et84jN154F31d6ukKOG92pSbcjWLRrbRhVGLTZeOtXqX46LoQSHhJo3jOo3ESrdBQbljIRKNyXUiKHNNSXhTdbZiUzyT/WJ23Zn3BBFy+2u4ZHc1eV2N7EkxAvbbqMRmZOSlbE0g/uajRgl6Iy8r1wpnaFTQ4ji+8XOEsuxYmdDWpJleXJ0+BPdoduL4p5Vavd5IOllmJfiWmSWu6d3pV4jteFWqaAGbLkdKSqtUXXUnN3DSvF8phfy/JfkxfOp9sVb2COz+hY/T0qkwwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxMS0wOS0xNlQwOTozOTowMCswMjowMC9Oi90AAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTEtMDktMTZUMDk6Mzk6MDArMDI6MDBeEzNhAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAABJRU5ErkJggg==");}
 .show{display:block;}
 #notifications{width:170px;height:20px;font-size:small;top:-19px;left:4px;position:absolute;}
-#nav-floater{position:fixed;top:20px;right:1%;padding:5px;background:#2e3436;color:transparent;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100;width:300px;height:60px;}
+#nav-floater{position:fixed;top:20px;right:1%;padding:5px;background:#2e3436;color:transparent;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100;width:270px;height:60px;}
 #nav-buttons{clear:both;list-style:none;padding:0px;margin:0px;height:25px;}#nav-buttons>li{padding:0;display:inline-block;margin:0px -4px 0px 0px;}
 .floaterflip{display:block;position:fixed;z-index:110;top:56px;right:19px;width:22px;height:22px;overflow:hidden;margin:0px;background:transparent url(light/icons.png) -190px -60px no-repeat;}
 .search-box{display:inline-block;margin:5px;position:fixed;right:0px;bottom:0px;z-index:100;background:#2e3436;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}
-#search-text{border:1px solid #eeeeec;background:#eeeeec;color:#2e3436;font-size:8pt;margin:8px;width:10em;height:14px;}
+#search-text,#mini-search-text{background:white;color:#111111;}
+#search-text{border:1px solid #999999;margin:5px 0;}
+#mini-search-text{font-size:8pt;height:14px;width:10em;margin:5px;}
 #scrollup{position:fixed;right:5px;bottom:40px;z-index:100;}#scrollup a:hover{text-decoration:none;border:0;}
-#user-menu{-moz-box-shadow:5px 0 10px 0 #111111;-o-box-shadow:5px 0 10px 0 #111111;-webkit-box-shadow:5px 0 10px 0 #111111;-ms-box-shadow:5px 0 10px 0 #111111;box-shadow:5px 0 10px 0 #111111;display:block;width:75%;margin:3px 0 0 0;position:relative;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;background-color:#555753;background-image:url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q==");background-position:98% center;background-repeat:no-repeat;clear:both;top:4px;left:10px;padding:2px;}#user-menu>a{vertical-align:top;outline:0 none;}
+#user-menu{-moz-box-shadow:5px 0 10px 0 #111111;-o-box-shadow:5px 0 10px 0 #111111;-webkit-box-shadow:5px 0 10px 0 #111111;-ms-box-shadow:5px 0 10px 0 #111111;box-shadow:5px 0 10px 0 #111111;display:block;width:80%;margin:3px 0 0 0;position:relative;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;background-color:#555753;background-image:url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q==");background-position:98% center;background-repeat:no-repeat;clear:both;top:4px;left:10px;padding:2px;}#user-menu>a{vertical-align:top;outline:0 none;}
 #user-menu-label{font-size:small;padding:3px 20px 9px 5px;height:10px;}
 .nav-ajax-update,.nav-ajax-left{width:30px;height:19px;background:transparent url(light/notifications.png) 0 0 no-repeat;color:#111111;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;}
@@ -118,26 +122,27 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
 #intro-update{background-position:-120px 0px;}
 #lang-select-icon{cursor:pointer;position:fixed;left:28px;bottom:6px;z-index:10;}
 #language-selector{position:fixed;bottom:2px;left:52px;z-index:10;}
-.menu-popup{position:absolute;display:none;width:11em;background:white;color:#eeeeec;margin:0px;padding:0px;border:3px solid #f2f2c3;z-index:100000;-moz-box-shadow:5px 5px 5px 0px #111111;-o-box-shadow:5px 5px 5px 0px #111111;-webkit-box-shadow:5px 5px 5px 0px #111111;-ms-box-shadow:5px 5px 5px 0px #111111;box-shadow:5px 5px 5px 0px #111111;}.menu-popup a{display:block;color:#eeeeec;padding:5px 10px;text-decoration:none;}.menu-popup a:hover{background-color:#ffffff;}
+.menu-popup{position:absolute;display:none;background:white;color:#111111;margin:0px;padding:0px;font-size:small;line-height:1.2;border:3px solid #3465a4;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100000;-moz-box-shadow:5px 5px 5px 0px #111111;-o-box-shadow:5px 5px 5px 0px #111111;-webkit-box-shadow:5px 5px 5px 0px #111111;-ms-box-shadow:5px 5px 5px 0px #111111;box-shadow:5px 5px 5px 0px #111111;}.menu-popup a{display:block;color:#111111;padding:5px 10px;text-decoration:none;}.menu-popup a:hover{color:#eeeeec;background-color:#3465a4;}
 .menu-popup .menu-sep{border-top:1px solid #4e4f4e;}
 .menu-popup li{float:none;overflow:auto;height:auto;display:block;}.menu-popup li img{float:left;width:16px;height:16px;padding-right:5px;}
 .menu-popup .empty{padding:5px;text-align:center;color:#ffffff;}
 .notif-item{font-size:small;}.notif-item a{vertical-align:middle;}
 .notif-image{width:32px;height:32px;padding:7px 7px 0px 0px;}
-.notify-seen{background:#666666;}
+.notify-seen{background:#dddddd;color:#111111;}
+.notify-unseen{color:#111111;}
 #sysmsg_info{position:fixed;bottom:0;-moz-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-o-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-webkit-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-ms-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;padding:10px;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 3px 10px 0 #111111 5px 5px 0px #111111;-o-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-webkit-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-ms-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;padding:10px;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 #111111;}
-#asidemain{float:left;font-size:small;margin:20px 0 20px 35px;width:25%;display:inline;}
+#sysmsg_info br,#sysmsg br{display:block;margin:2px 0px;border-top:1px solid #eeeeec;}
+#asidemain{float:left;font-size:small;margin:1em;width:25%;display:inline;}
 #asideright,#asideleft{display:none;}
 .vcard .fn{font-size:1.5em;font-weight:bold;border-bottom:1px solid #284d7d;padding-bottom:3px;}
-.vcard #profile-photo-wrapper{margin:20px;}.vcard #profile-photo-wrapper img{-moz-box-shadow:3px 3px 10px 0 #111111;-o-box-shadow:3px 3px 10px 0 #111111;-webkit-box-shadow:3px 3px 10px 0 #111111;-ms-box-shadow:3px 3px 10px 0 #111111;box-shadow:3px 3px 10px 0 #111111;}
+.vcard #profile-photo-wrapper{margin:20px 0;background-color:#555753;padding:5px;width:175px;height:175px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:3px 3px 10px 0 #111111;-o-box-shadow:3px 3px 10px 0 #111111;-webkit-box-shadow:3px 3px 10px 0 #111111;-ms-box-shadow:3px 3px 10px 0 #111111;box-shadow:3px 3px 10px 0 #111111;}
 #asidemain h4{font-size:1.2em;}
 #asidemain #viewcontacts{text-align:right;}
 #asidemain #contact-block{width:99%;}#asidemain #contact-block .contact-block-content{width:99%;}#asidemain #contact-block .contact-block-content .contact-block-div{float:left;margin:0 5px 5px 0;width:50px;height:50px;padding:3px;position:relative;}
-.aprofile dt{background:#111111;color:#eeeeec;font-weight:bold;-moz-box-shadow:3px 3px 5px 0px #111111;-o-box-shadow:3px 3px 5px 0px #111111;-webkit-box-shadow:3px 3px 5px 0px #111111;-ms-box-shadow:3px 3px 5px 0px #111111;box-shadow:3px 3px 5px 0px #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:15px 0 5px;padding-left:5px;}
+.aprofile dt{background:transparent;color:#666666;font-weight:bold;-moz-box-shadow:3px 3px 5px 0px #111111;-o-box-shadow:3px 3px 5px 0px #111111;-webkit-box-shadow:3px 3px 5px 0px #111111;-ms-box-shadow:3px 3px 5px 0px #111111;box-shadow:3px 3px 5px 0px #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:15px 0 5px;padding-left:5px;}
 #profile-extra-links ul{margin-left:0px;padding-left:0px;list-style:none;}
-#dfrn-request-link{-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;color:#111111;display:block;font-size:1.2em;padding:0.2em 0.5em;background-color:#3465a4;background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAOCAYAAAAmL5yKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAE4SURBVCiRpZKxLgRRFIa//64dKruZFRIlolBviFKiVHsHrRaFikTCC+hEQtRegMQDqDUKJOPOvauSMJmjYEU2M0viT071/+fLOTlHZkadQgjLkh1LPEoj661WKw5mXG034JxtAgtmrJoVK5WZYYCy1AVQSOYbjeSqMmRmQ8v755Ne77lb5w+d4HMNJopCT7X+bwDQZKfTyf4BIAHeawHe+/kQ/FGM+QagvpFl2VSM/tyMmV7PV14AYMQ5nUp0AULIp0HXzpVvSdLYMmNVAjNdAuNAUQHgxy/ZvEQTSMw0A33DxkIIi2ma3gwC9PKSzRWF2wbdpml62DfyPF9yjlNgAnQGLJjZnXON3Xa7ff8NGPbKQPNrbAOI0a9J2ilLEzAL7P0GqJJizF+BUeDhL2cclJnZPvAg6eADf+imKjSMX1wAAAAASUVORK5CYII=");background-repeat:no-repeat;background-position:95% center;}
+#dfrn-request-link{-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;color:#eeeeec;display:block;font-size:1.2em;padding:0.2em 0.5em;background-color:#3465a4;background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAOCAYAAAAmL5yKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAE4SURBVCiRpZKxLgRRFIa//64dKruZFRIlolBviFKiVHsHrRaFikTCC+hEQtRegMQDqDUKJOPOvauSMJmjYEU2M0viT071/+fLOTlHZkadQgjLkh1LPEoj661WKw5mXG034JxtAgtmrJoVK5WZYYCy1AVQSOYbjeSqMmRmQ8v755Ne77lb5w+d4HMNJopCT7X+bwDQZKfTyf4BIAHeawHe+/kQ/FGM+QagvpFl2VSM/tyMmV7PV14AYMQ5nUp0AULIp0HXzpVvSdLYMmNVAjNdAuNAUQHgxy/ZvEQTSMw0A33DxkIIi2ma3gwC9PKSzRWF2wbdpml62DfyPF9yjlNgAnQGLJjZnXON3Xa7ff8NGPbKQPNrbAOI0a9J2ilLEzAL7P0GqJJizF+BUeDhL2cclJnZPvAg6eADf+imKjSMX1wAAAAASUVORK5CYII=");background-repeat:no-repeat;background-position:95% center;}
 #wallmessage-link{color:#eeeeec;display:block;font-size:1.2em;padding:0.2em 0.5em;}
 .ttright{margin:0px;}
 .contact-block-div{width:50px;height:50px;float:left;}
@@ -145,51 +150,52 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
 #jot{margin:10px 0 20px 0px;width:100%;}#jot #jot-tools{margin:0px;padding:0px;width:100%;height:35px;overflow:none;}#jot #jot-tools span{float:left;margin:10px 20px 2px 0px;}#jot #jot-tools span a{display:block;}
 #jot #jot-tools .perms{float:right;width:40px;}
 #jot #jot-tools li.loading{float:right;background-color:white;width:20px;height:38px;vertical-align:center;text-align:center;border-top:2px solid #9eabb0;}#jot #jot-tools li.loading img{margin-top:10px;}
-#jot #jot-title{border:1px solid #787878;margin:0 0 5px;width:90%;height:20px;font-weight:bold;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;vertical-align:middle;}
+#jot #jot-title{border:1px solid #cccccc;margin:0 0 5px;width:90%;height:20px;font-weight:bold;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;vertical-align:middle;}
 #jot-category{margin:5px 0;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;border:1px solid #cccccc;color:#666666;font-size:smaller;}#jot-category:focus{color:#111111;}
 #jot #character-counter{width:6%;height:15px;float:right;text-align:right;line-height:20px;padding:2px 20px 5px 0;}
 #profile-jot-text_parent{-moz-box-shadow:5px 0 10px 0 #111111;-o-box-shadow:5px 0 10px 0 #111111;-webkit-box-shadow:5px 0 10px 0 #111111;-ms-box-shadow:5px 0 10px 0 #111111;box-shadow:5px 0 10px 0 #111111;}
-#profile-jot-text_tbl{margin-bottom:10px;background:#222222;}
+#profile-jot-text_tbl{margin-bottom:10px;background:#808080;}
 #profile-jot-text_ifr{width:99.900002% !important;}
-#profile-jot-text_toolbargroup,.mceCenter tr{background:#222222;}
-[id$="jot-text_ifr"]{width:99.900002% !important;color:#eeeeec;background:#111111;}[id$="jot-text_ifr"] .mceContentBody{color:#eeeeec;background:#111111;}
+#profile-jot-text_toolbargroup,.mceCenter tr{background:#808080;}
+[id$="jot-text_ifr"]{color:#111111;background:#eeeeec;}[id$="jot-text_ifr"] .mceContentBody{color:#111111;background:#eeeeec;}
 .defaultSkin tr.mceFirst{background:#808080;}
 .defaultSkin td.mceFirst,.defaultSkin td.mceLast{background-color:#eeeeec;}
 .defaultSkin span.mceIcon,.defaultSkin img.mceIcon,.defaultSkin .mceButtonDisabled .mceIcon{background-color:#eeeeec;}
 #profile-attach-wrapper,#profile-audio-wrapper,#profile-link-wrapper,#profile-location-wrapper,#profile-nolocation-wrapper,#profile-title-wrapper,#profile-upload-wrapper,#profile-video-wrapper{float:left;margin:0 20px 0 0;}
 #profile-rotator-wrapper{float:right;}
 #profile-jot-email-wrapper{margin:10px 10% 0;border:1px solid #555753;border-bottom:0;}
-#profile-jot-email-label{background-color:#555753;color:#111111;padding:5px;}
+#profile-jot-email-label{background-color:#555753;color:#eeeeec;padding:5px;}
 #profile-jot-email{width:90%;margin:5px;}
 #profile-jot-networks{margin:0 10%;border:1px solid #555753;border-top:0;border-bottom:0;padding:5px;}
 #profile-jot-net{margin:5px 0;}
 #jot-preview-link{margin:0 0 0 10px;border:0;text-decoration:none;float:right;}
 .icon-text-preview{margin:0 0 -18px 0;display:block;width:20px;height:20px;background:url(light/icons.png) no-repeat -128px -40px;border:0;text-decoration:none;float:right;cursor:pointer;}
-#profile-jot-perms{float:right;color:#555753;background-color:#111111;width:20px;height:20px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:3px 3px 5px 0 #111111;-o-box-shadow:3px 3px 5px 0 #111111;-webkit-box-shadow:3px 3px 5px 0 #111111;-ms-box-shadow:3px 3px 5px 0 #111111;box-shadow:3px 3px 5px 0 #111111;border:2px outset #999999;overflow:hidden;margin:0 10px 0 10px;}
+#profile-jot-perms{float:right;color:#555753;width:20px;height:20px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:3px 3px 5px 0 #111111;-o-box-shadow:3px 3px 5px 0 #111111;-webkit-box-shadow:3px 3px 5px 0 #111111;-ms-box-shadow:3px 3px 5px 0 #111111;box-shadow:3px 3px 5px 0 #111111;border:2px outset #555753;overflow:hidden;margin:0 10px 0 10px;}
 #profile-jot-plugin-wrapper{width:1px;margin:10px 0 0 0;float:right;}
 #profile-jot-submit-wrapper{float:right;width:100%;margin:10px 0 0 0;padding:0;}
-#profile-jot-submit{height:auto;background-color:#555753;color:#999999;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;border:2px outset #f2f2c3;margin:0;float:right;-moz-text-shadow:1px 1px #111111;-o-text-shadow:1px 1px #111111;-webkit-text-shadow:1px 1px #111111;-ms-text-shadow:1px 1px #111111;text-shadow:1px 1px #111111;width:auto;}#profile-jot-submit:active{-moz-box-shadow:0 0 0 0 #111111;-o-box-shadow:0 0 0 0 #111111;-webkit-box-shadow:0 0 0 0 #111111;-ms-box-shadow:0 0 0 0 #111111;box-shadow:0 0 0 0 #111111;}
-#jot-perms-icon{width:20px;height:22px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;overflow:hidden;}
+#profile-jot-submit{height:auto;background-color:#555753;color:#eeeeec;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;border:2px outset #555753;margin:0;float:right;-moz-text-shadow:1px 1px #111111;-o-text-shadow:1px 1px #111111;-webkit-text-shadow:1px 1px #111111;-ms-text-shadow:1px 1px #111111;text-shadow:1px 1px #111111;width:auto;}#profile-jot-submit:active{-moz-box-shadow:0 0 0 0 #111111;-o-box-shadow:0 0 0 0 #111111;-webkit-box-shadow:0 0 0 0 #111111;-ms-box-shadow:0 0 0 0 #111111;box-shadow:0 0 0 0 #111111;}
+#jot-perms-icon{width:22px;height:22px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;overflow:hidden;background:#555753 url("dark/icons.png") -88px -40px;}
 #group_allow_wrapper,#group_deny_wrapper,#acl-permit-outer-wrapper,#contact_allow_wrapper,#contact_deny_wrapper,#acl-deny-outer-wrapper{width:47%;}
 #group_allow_wrapper,#group_deny_wrapper,#acl-permit-outer-wrapper{float:left;}
 #contact_allow_wrapper,#contact_deny_wrapper,#acl-deny-outer-wrapper{float:right;}
-#acl-permit-text{background-color:#000000;color:#111111;padding:5px;float:left;}
-#jot-public{background-color:#000000;color:#ff0000;padding:5px;float:left;}
-#acl-deny-text{background-color:#000000;color:#111111;padding:5px;float:left;}
-#jot-title-desc{color:#787878;}
-#profile-jot-desc{color:#ff2000;margin:5px 0;}
+#acl-permit-text{background-color:#555753;color:#111111;padding:5px;float:left;}
+#jot-public{background-color:#555753;color:#ff0000;padding:5px;float:left;}
+#acl-deny-text{background-color:#555753;color:#eeeeec;padding:5px;float:left;}
+#jot-title-desc{color:#cccccc;}
+#profile-jot-desc{background:#eeeeec;border:1px solid #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;color:#ff2000;margin:5px 0;}
 #jot-title-wrapper{margin-bottom:5px;}
 #jot-title-display{font-weight:bold;}
 .jothidden{display:none;}
-#jot-preview-content{background-color:#2e302e;color:#111111;border:1px solid #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:5px 0 10px 0px #111111;-o-box-shadow:5px 0 10px 0px #111111;-webkit-box-shadow:5px 0 10px 0px #111111;-ms-box-shadow:5px 0 10px 0px #111111;box-shadow:5px 0 10px 0px #111111;padding:3px 3px 6px 10px;}#jot-preview-content .wall-item-outside-wrapper{border:0;-o-border-radius:0px 0px 0px 0px;-webkit-border-radius:0px 0px 0px 0px;-moz-border-radius:0px 0px 0px 0px;-ms-border-radius:0px 0px 0px 0px;border-radius:0px 0px 0px 0px;-moz-box-shadow:0 0 0 0 #111111;-o-box-shadow:0 0 0 0 #111111;-webkit-box-shadow:0 0 0 0 #111111;-ms-box-shadow:0 0 0 0 #111111;box-shadow:0 0 0 0 #111111;}
-#sectionmain{margin:20px;font-size:0.8em;min-width:475px;width:67%;float:left;display:inline;}
+#jot-preview-content{background-color:#f2f2c3;color:#111111;border:1px solid #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:5px 0 10px 0px #111111;-o-box-shadow:5px 0 10px 0px #111111;-webkit-box-shadow:5px 0 10px 0px #111111;-ms-box-shadow:5px 0 10px 0px #111111;box-shadow:5px 0 10px 0px #111111;padding:3px 3px 6px 10px;}#jot-preview-content .wall-item-outside-wrapper{border:0;-o-border-radius:0px 0px 0px 0px;-webkit-border-radius:0px 0px 0px 0px;-moz-border-radius:0px 0px 0px 0px;-ms-border-radius:0px 0px 0px 0px;border-radius:0px 0px 0px 0px;-moz-box-shadow:0 0 0 0 #111111;-o-box-shadow:0 0 0 0 #111111;-webkit-box-shadow:0 0 0 0 #111111;-ms-box-shadow:0 0 0 0 #111111;box-shadow:0 0 0 0 #111111;}
+#sectionmain{margin:1em;font-size:0.8em;min-width:475px;width:69%;float:left;display:inline;}
 .tabs{margin:0px;padding:0px;list-style:none;list-style-position:inside;margin:10px 0;}.tabs li{display:inline;font-size:smaller;}
-.tab{border:1px solid #284d7d;padding:4px;}.tab:hover,.tab.active:hover,.tab:active{background:#f2f2c3;color:#111111;border:1px solid #284d7d;}
-.tab.active{background:#111111;color:#eeeeec;border:1px solid #284d7d;}.tab.active a{color:#eeeeec;text-decoration:none;}
+.tab{border:1px solid #284d7d;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.tab:active,.tab:hover{background:#f2f2c3;color:#111111;border:1px solid #284d7d;}
 .tab a{border:0;text-decoration:none;}
+.tab.active{background:#2e3436;color:#eeeeec;border:1px solid #284d7d;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.tab.active:hover{background:#f2f2c3;color:#111111;border:1px solid #284d7d;}
+.tab.active a{color:#eeeeec;text-decoration:none;}
 .wall-item-outside-wrapper{border:1px solid #545454;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:6px 1px 10px -2px #111111;-o-box-shadow:6px 1px 10px -2px #111111;-webkit-box-shadow:6px 1px 10px -2px #111111;-ms-box-shadow:6px 1px 10px -2px #111111;box-shadow:6px 1px 10px -2px #111111;}.wall-item-outside-wrapper.comment{margin-top:5px;}
 .wall-item-content-wrapper{position:relative;padding:0.75em;width:auto;}
-.wall-item-outside-wrapper .wall-item-comment-wrapper{}
+.wall-item-outside-wrapper .wall-item-comment-wrapper{}.wall-item-outside-wrapper .wall-item-comment-wrapper .preview{border:0;-o-border-radius:0px;-webkit-border-radius:0px;-moz-border-radius:0px;-ms-border-radius:0px;border-radius:0px;}
 .shiny{background:#f2f2c3;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}
 .wall-outside-wrapper .shiny{-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}
 .heart{color:red;}
@@ -197,7 +203,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
 [id^="tread-wrapper"],[class^="tread-wrapper"]{margin:1.2em 0 0 0;padding:0px;}
 .wall-item-photo-menu{display:none;}
 .wall-item-photo-menu-button{display:none;text-indent:-99999px;background:#555753 url(light/menu-user-pin.jpg) no-repeat 75px center;position:absolute;overflow:hidden;width:90px;height:20px;top:85px;left:0;-o-border-radius:0 0 5px 5px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;-ms-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;}
-.wall-item-info{float:left;width:110px;}
+.wall-item-info{float:left;width:7em;position:relative;}
 .wall-item-photo-wrapper{width:80px;height:80px;position:relative;padding:5px;background-color:#555753;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}
 [class^="wall-item-tools"] *{}[class^="wall-item-tools"] *>*{}
 .wall-item-tools{float:right;opacity:0.4;-webkit-transition:all 0.75s ease-in-out;-moz-transition:all 0.75s ease-in-out;-o-transition:all 0.75s ease-in-out;-ms-transition:all 0.75s ease-in-out;transition:all 0.75s ease-in-out;}.wall-item-tools:hover{opacity:1;-webkit-transition:all 0.75s ease-in-out;-moz-transition:all 0.75s ease-in-out;-o-transition:all 0.75s ease-in-out;-ms-transition:all 0.75s ease-in-out;transition:all 0.75s ease-in-out;}
@@ -206,27 +212,28 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
 .wall-item-title{font-size:1.2em;font-weight:bold;margin-bottom:1.4em;}
 .wall-item-body{margin:15px 10px 10px 0px;text-align:left;overflow-x:auto;}
 .wall-item-lock-wrapper{float:right;width:22px;height:22px;margin:0 -5px 0 0;opacity:1;}
-.wall-item-dislike,.wall-item-like{clear:left;font-size:0.8em;color:#888b85;margin:5px 0 5px 10.2em;-webkit-transition:all 0.75s ease-in-out;-moz-transition:all 0.75s ease-in-out;-o-transition:all 0.75s ease-in-out;-ms-transition:all 0.75s ease-in-out;transition:all 0.75s ease-in-out;opacity:0.5;}.wall-item-dislike:hover,.wall-item-like:hover{opacity:1;}
-.wall-item-author,.wall-item-actions-author{clear:left;float:left;font-size:0.8em;color:#888b85;margin:1em auto 0 0.2em;}
-.wall-item-ago{display:inline;padding-left:10px;}
-.wall-item-location{margin-top:15px;width:100px;overflow:hidden;-moz-text-overflow:ellipsis;-ms-text-verflow:ellipsis;-o-text-overflow:ellipsis;-webkit-text-overflow:ellipsis;text-overflow:ellipsis;}.wall-item-location .icon{float:left;}
+.wall-item-dislike,.wall-item-like{clear:left;font-size:0.8em;color:#111111;margin:5px 0 5px 10.2em;-webkit-transition:all 0.75s ease-in-out;-moz-transition:all 0.75s ease-in-out;-o-transition:all 0.75s ease-in-out;-ms-transition:all 0.75s ease-in-out;transition:all 0.75s ease-in-out;opacity:0.5;}.wall-item-dislike:hover,.wall-item-like:hover{opacity:1;}
+.wall-item-author,.wall-item-actions-author,.wall-item-ago{color:#111111;line-height:1;display:inline-block;font-size:x-small;margin:0.5em auto;font-weight:bold;}
+.comment-edit-preview{width:auto;margin:auto auto auto -2em;}.comment-edit-preview.wall-item-author,.comment-edit-preview.wall-item-actions-author,.comment-edit-preview.wall-item-ago{font-size:smaller;}
+.wall-item-location{margin-top:2em;width:6em;overflow:hidden;-moz-text-overflow:ellipsis;-ms-text-verflow:ellipsis;-o-text-overflow:ellipsis;-webkit-text-overflow:ellipsis;text-overflow:ellipsis;}.wall-item-location .icon{float:left;}
 .wall-item-location>a,.wall-item-location .smalltext{margin-left:25px;font-size:0.7em;display:block;}
 .wall-item-location>br{display:none;}
 .wallwall .wwto{left:5px;margin:0;position:absolute;top:75px;z-index:10001;width:30px;height:30px;}.wallwall .wwto img{width:30px !important;height:30px !important;}
 .wallwall .wall-item-photo-end{clear:both;}
 .wall-item-arrowphoto-wrapper{position:absolute;left:35px;top:80px;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;-o-border-radius:0 5px 5px 5px;-webkit-border-radius:0 5px 5px 5px;-moz-border-radius:0 5px 5px 5px;-ms-border-radius:0 5px 5px 5px;border-radius:0 5px 5px 5px;}.wall-item-photo-menu li a{white-space:nowrap;display:block;padding:5px 2px;color:#999999;}.wall-item-photo-menu li a:hover{color:#555753;background:#999999;}
+.wall-item-photo-menu{min-width:92px;font-size:0.75em;border:2px solid #555753;border-top:0px;background:#555753;position:absolute;left:-2px;top:101px;display:none;z-index:10003;-o-border-radius:0 5px 5px 5px;-webkit-border-radius:0 5px 5px 5px;-moz-border-radius:0 5px 5px 5px;-ms-border-radius:0 5px 5px 5px;border-radius:0 5px 5px 5px;}.wall-item-photo-menu li a{white-space:nowrap;display:block;padding:5px 6px;color:#eeeeec;}.wall-item-photo-menu li a:hover{color:#555753;background:#eeeeec;}
 #item-delete-selected{overflow:auto;width:100%;}
-#connect-services-header,#connect-services,#extra-help-header,#extra-help,#postit-header,#postit{margin:5px 0 0 0;}
+#connect-services-header,#extra-help-header{margin:1.5em 0 0 0;}
+#connect-services,#extra-help{margin:0px;padding:0px;list-style:none;list-style-position:inside;margin:1em 0 0 0;}#connect-services li,#extra-help li{display:inline;}
 .ccollapse-wrapper{font-size:0.9em;margin-left:5em;}
-.wall-item-outside-wrapper.comment{margin-left:5em;}.wall-item-outside-wrapper.comment .wall-item-photo{width:40px !important;height:40px !important;}
+.hide-comments-outer{font-size:small;}
+.wall-item-outside-wrapper.comment{margin-left:5em;}.wall-item-outside-wrapper.comment .wall-item-info{width:5em;}
+.wall-item-outside-wrapper.comment .wall-item-photo{width:40px !important;height:40px !important;}
 .wall-item-outside-wrapper.comment .wall-item-photo-wrapper{width:40px;height:40px;}
-.wall-item-outside-wrapper.comment .wall-item-photo-menu-button{width:50px;top:45px;background-position:35px center;}
-.wall-item-outside-wrapper.comment .wall-item-info{width:60px;}
-.wall-item-outside-wrapper.comment .wall-item-body{margin-left:10px;}
+.wall-item-outside-wrapper.comment .wall-item-photo-menu-button{width:3.35em;top:3.2em;background-position:35px center;}
 .wall-item-outside-wrapper.comment .wall-item-author{margin-left:0.2em;}
-.wall-item-outside-wrapper.comment .wall-item-photo-menu{min-width:50px;top:60px;}
-.comment-wwedit-wrapper{}
+.wall-item-outside-wrapper.comment .wall-item-photo-menu{min-width:4.5em;top:5.5em;}
+.comment-wwedit-wrapper{border:1px solid #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:5px;}
 .comment-edit-wrapper{border-top:1px #aaa solid;}
 [class^="comment-edit-bb"]{margin:0px;padding:0px;list-style:none;list-style-position:inside;display:none;margin:-40px 0 5px 60px;width:75%;}[class^="comment-edit-bb"]>li{display:inline-block;margin:0 10px 0 0;visibility:none;}
 .comment-wwedit-wrapper img,.comment-edit-wrapper img{width:20px;height:20px;}
@@ -236,10 +243,10 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
 .comment-edit-text-empty{height:20px;border:2px solid #babdd6;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;color:#babdd6;-webkit-transition:all 0.75s ease-in-out;-moz-transition:all 0.75s ease-in-out;-o-transition:all 0.75s ease-in-out;-ms-transition:all 0.75s ease-in-out;transition:all 0.75s ease-in-out;}.comment-edit-text-empty:hover{color:#444444;}
 .comment-edit-text-full{height:10em;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-webkit-transition:all 0.75s ease-in-out;-moz-transition:all 0.75s ease-in-out;-o-transition:all 0.75s ease-in-out;-ms-transition:all 0.75s ease-in-out;transition:all 0.75s ease-in-out;}
 .comment-edit-submit-wrapper{width:90%;margin:5px 5px 10px 50px;text-align:right;}
-.comment-edit-submit{height:22px;background-color:#555753;color:#999999;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;border:0;}
-.wall-item-body code{background-color:#ffffff;border-bottom:1px dashed #bbbbbb;border-left:5px solid #bbbbbb;border-top:1px dashed #bbbbbb;color:#8c8c8c;display:block;overflow-x:auto;padding:5px 0 15px 10px;width:95%;}.wall-item-body code a{color:#477ec4;}
-div[id$="text"]{font-weight:bold;border-bottom:1px solid #777777;}
-div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:left;}
+.comment-edit-submit{height:22px;background-color:#555753;color:#eeeeec;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;border:0;}
+.wall-item-body code{background-color:#dddddd;border-bottom:1px dashed #888888;border-left:5px solid #888888;border-top:1px dashed #888888;color:#191919;display:block;overflow-x:auto;padding:5px 0 15px 10px;width:95%;}.wall-item-body code a{color:#477ec4;}
+div[id$="text"]{font-weight:bold;border-bottom:1px solid #eeeeec;}
+div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;}
 .profile-match-wrapper{float:left;margin:0 5px 40px 0;width:120px;height:120px;padding:3px;position:relative;}
 .icon.drophide.profile-match-ignore{margin:0 6px 0 -3px;}
 [id$="-end"],[class$="-end"]{clear:both;margin:0 0 10px 0;}
@@ -249,28 +256,29 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
 #advanced-profile-with{margin-left:200px;}
 .photos{height:auto;overflow:auto;}
 #photo-top-links{margin-bottom:30px;}
-.photo-album-image-wrapper,.photo-top-image-wrapper{float:left;-moz-box-shadow:3px 3px 10px 0 #111111;-o-box-shadow:3px 3px 10px 0 #111111;-webkit-box-shadow:3px 3px 10px 0 #111111;-ms-box-shadow:3px 3px 10px 0 #111111;box-shadow:3px 3px 10px 0 #111111;background-color:#000000;color:#eeeeec;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding-bottom:30px;position:relative;margin:0 10px 10px 0;}
-#photo-photo{max-width:100%;}#photo-photo img{max-width:100%;}
+.photo-album-image-wrapper,.photo-top-image-wrapper{float:left;-moz-box-shadow:3px 3px 10px 0 #111111;-o-box-shadow:3px 3px 10px 0 #111111;-webkit-box-shadow:3px 3px 10px 0 #111111;-ms-box-shadow:3px 3px 10px 0 #111111;box-shadow:3px 3px 10px 0 #111111;background-color:#eeeeec;color:#111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding-bottom:30px;position:relative;margin:0 10px 10px 0;}
+#photo-photo{margin:auto auto 5em 20%;}#photo-photo img{max-width:50%;}
 .photo-top-image-wrapper a:hover,#photo-photo a:hover,.photo-album-image-wrapper a:hover{border-bottom:0;}
 .photo-top-photo,.photo-album-photo{-o-border-radius:5px 5px 0 0;-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;-ms-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0;}
 .photo-top-album-name,.caption{position:absolute;bottom:0;padding:0 5px;}
-#photo-photo{position:relative;margin:5px 45%;}
-#photo-prev-link,#photo-next-link{position:absolute;width:50px;height:150px;background:#ffffff center center no-repeat;opacity:0;-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;z-index:10;top:175px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}#photo-prev-link:hover,#photo-next-link:hover{opacity:0.6;-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;}
+#photo-prev-link,#photo-next-link{position:absolute;width:50px;height:200px;background:#ffffff center center no-repeat;opacity:0;-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;z-index:10;top:15em;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}#photo-prev-link:hover,#photo-next-link:hover{opacity:0.6;-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;}
 #photo-prev-link .icon,#photo-next-link .icon{display:none;}
-#photo-prev-link{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAnCAMAAADTjiM/AAAAA3NCSVQICAjb4U/gAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAALpQTFRF////AAAAQEBAZmZmVVVVSUlJTU1NXV1dVVVVTk5OW1tbWlpaWFhPWFhQU1pTVVVVVlZSVVlRVlZTVFdUVFdUVVdTVFZSVldUVldSVldSVldTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVZUVVdTVVdTVVhSVVdTVVdTVVhSVVdTVVdTVVhSVVdTVVdTVVdTVVdTVVdTVVdTVVhTVVdTVVdTVVdTVVdT3XYY/AAAAD10Uk5TAAEEBQYHCgsMDQ4RHSAlP0FFR1hee3+JnqSqq6ytrq+wsbKztLW2t7y9vr/AwcLDxMXGx8jU1dng7O/3+TmOwVsAAADASURBVCjPddPXEoIwEAXQINh7Q8WKYu+95v9/S0dxZxNy83hgMpvdu0Jox642r25GVxGfys+5540sZV3jyY/lWeVxyDLg7AR/lhXOI+KZZeRFgvGQeMnY9olXScYD4jXnPvHGzNsU4x7xjnGsa+YO8T7NnukRHzgXiY/KNKiUkzqkZ8ivnDoKD/xfBvdbbXM9sH70Xtgf2E/YfzgvOF+YB5gf5cPcAfmsgTy3QP5vYF8akf36XvXIRhZPlPyLWxBvNENWsZXDKukAAAAASUVORK5CYII=");left:22%;}
-#photo-next-link{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAnCAMAAADTjiM/AAAAA3NCSVQICAjb4U/gAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAKVQTFRF////gICAQEBAZmZmVVVVSUlJYGBgVVVVTU1NXV1dVVVVWVlZU1hTVlZSVlZTVlZTVVlRVVhSVFdUVlhTVVdTVFZTVVdTVldTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVhSVVdTVVdTVVdTVVdTVVdTVVdTVVdTVVdTVVdT8E3YQQAAADZ0Uk5TAAIEBQYHCAkKCwwUN0FER0hOW2uNjqWqq6ytrq+wsbKztLW2t7i5uru8vb6/wMHCxcjT3PP3B0dhfwAAANlJREFUKM910+cSgjAQRtEIomAXu4iIYge7ef9Hs+ZzN4b9eW4mk1kGIaqdU9wQf2Nf5XPSiu4d+Z6jp/n54/KghZ40h5ZymbFQGCCkLg3WKC+MEfYs2AHCrszCBGHLQ5gXpggbFooRwrrEwgxhxUOcE5w5wtJiYYHQZjt0EuUhX3r19vU7Y++ozgeMD7i/buYhYTcDj8gz3RQ8prwHB/aPyzvwhPLWzBtwSLi0Bk8pr8BR0cgzwiIycw0cUxZ9xXOH7VZ9vAVn4X840Vh4F9Pp1w/gZ92mpesDuLpM+1blc68AAAAASUVORK5CYII=");left:44%;}
+#photo-prev-link{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAnCAMAAADTjiM/AAAAA3NCSVQICAjb4U/gAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAALpQTFRF////AAAAQEBAZmZmVVVVSUlJTU1NXV1dVVVVTk5OW1tbWlpaWFhPWFhQU1pTVVVVVlZSVVlRVlZTVFdUVFdUVVdTVFZSVldUVldSVldSVldTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVZUVVdTVVdTVVhSVVdTVVdTVVhSVVdTVVdTVVhSVVdTVVdTVVdTVVdTVVdTVVdTVVhTVVdTVVdTVVdTVVdT3XYY/AAAAD10Uk5TAAEEBQYHCgsMDQ4RHSAlP0FFR1hee3+JnqSqq6ytrq+wsbKztLW2t7y9vr/AwcLDxMXGx8jU1dng7O/3+TmOwVsAAADASURBVCjPddPXEoIwEAXQINh7Q8WKYu+95v9/S0dxZxNy83hgMpvdu0Jox642r25GVxGfys+5540sZV3jyY/lWeVxyDLg7AR/lhXOI+KZZeRFgvGQeMnY9olXScYD4jXnPvHGzNsU4x7xjnGsa+YO8T7NnukRHzgXiY/KNKiUkzqkZ8ivnDoKD/xfBvdbbXM9sH70Xtgf2E/YfzgvOF+YB5gf5cPcAfmsgTy3QP5vYF8akf36XvXIRhZPlPyLWxBvNENWsZXDKukAAAAASUVORK5CYII=");left:5%;}
+#photo-next-link{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAnCAMAAADTjiM/AAAAA3NCSVQICAjb4U/gAAAACXBIWXMAAA3XAAAN1wFCKJt4AAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAKVQTFRF////gICAQEBAZmZmVVVVSUlJYGBgVVVVTU1NXV1dVVVVWVlZU1hTVlZSVlZTVlZTVVlRVVhSVFdUVlhTVVdTVFZTVVdTVldTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVZUVVdTVVdTVVhSVVdTVVdTVVdTVVdTVVdTVVdTVVdTVVdTVVdT8E3YQQAAADZ0Uk5TAAIEBQYHCAkKCwwUN0FER0hOW2uNjqWqq6ytrq+wsbKztLW2t7i5uru8vb6/wMHCxcjT3PP3B0dhfwAAANlJREFUKM910+cSgjAQRtEIomAXu4iIYge7ef9Hs+ZzN4b9eW4mk1kGIaqdU9wQf2Nf5XPSiu4d+Z6jp/n54/KghZ40h5ZymbFQGCCkLg3WKC+MEfYs2AHCrszCBGHLQ5gXpggbFooRwrrEwgxhxUOcE5w5wtJiYYHQZjt0EuUhX3r19vU7Y++ozgeMD7i/buYhYTcDj8gz3RQ8prwHB/aPyzvwhPLWzBtwSLi0Bk8pr8BR0cgzwiIycw0cUxZ9xXOH7VZ9vAVn4X840Vh4F9Pp1w/gZ92mpesDuLpM+1blc68AAAAASUVORK5CYII=");left:50%;}
 #photo-prev-link a,#photo-next-link a{display:block;width:100%;height:100%;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;overflow:hidden;text-indent:-900000px;}
 #photos-upload-spacer,#photos-upload-new-wrapper,#photos-upload-exist-wrapper{margin-bottom:1em;}
 #photos-upload-existing-album-text,#photos-upload-newalbum-div{background-color:#555753;color:#eeeeec;padding:1px;}
 #photos-upload-album-select,#photos-upload-newalbum{width:99%;}
 #photos-upload-perms-menu{text-align:right;}
-#photo-edit-caption,#photo-edit-newtag,#photo-edit-albumname{float:left;margin-bottom:25px;}
 #photo-edit-link-wrap{margin-bottom:15px;}
-#photo-edit-caption,#photo-edit-newtag{width:100%;}
-#photo-like-div{margin-bottom:25px;}
-#photo-edit-delete-button{margin-left:200px;}
+#photo-edit-perms{width:auto;}
+#photo-edit-rotate-label{width:38%;display:inline-block;font-size:small;margin:0 10px 1em 0;border:1px solid #eeeeec;padding:3px 5px;background:#cccccc;color:#111111;-moz-box-shadow:3px 3px 5px 0px #111111;-o-box-shadow:3px 3px 5px 0px #111111;-webkit-box-shadow:3px 3px 5px 0px #111111;-ms-box-shadow:3px 3px 5px 0px #111111;box-shadow:3px 3px 5px 0px #111111;}
+#photo-like-div{float:left;margin:auto 0 0;width:2em;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;border:1px solid #111111;}
+.wall-item-like-buttons>*{display:inline;}
+#photo-edit-delete-button{margin:auto auto auto 1em;}
 #photo-edit-end{margin-bottom:35px;}
 #photo-caption{font-size:110%;font-weight:bold;margin-top:15px;margin-bottom:15px;}
+#wall-photo-container{margin:0 auto 1em 4em;width:90%;}
 .prvmail-text{width:100%;}
 #prvmail-subject{width:100%;color:#eeeeec;background:#111111;}
 #prvmail-submit-wrapper{margin-top:10px;}
@@ -313,17 +321,16 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
 #contact-edit-last-update-text{margin-bottom:15px;}
 #contact-edit-last-updated{font-weight:bold;}
 #contact-edit-poll-text{display:inline;}
-#contact-edit-info_tbl,#contact-edit-info_parent,.mceLayout{width:100%;}
 #contact-edit-end{clear:both;margin-bottom:65px;}
 .contact-photo-menu-button{position:absolute;background:url("light/photo-menu.jpg") top left no-repeat transparent;margin:0px;padding:0px;width:16px;height:16px;top:64px;left:0px;overflow:hidden;text-indent:40px;display:none;}
-.contact-photo-menu{width:auto;border:2px solid #000000;background:#eeeeec;color:#111111;position:absolute;left:0px;top:90px;display:none;z-index:10000;}.contact-photo-menu li a{display:block;padding:2px;}.contact-photo-menu li a:hover{color:white;background:#3465A4;text-decoration:none;}
+.contact-photo-menu{width:auto;border:2px solid #3465a4;background:#eeeeec;color:#111111;position:absolute;font-size:smaller;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;left:0px;top:90px;display:none;z-index:10000;}.contact-photo-menu li a{display:block;padding:4px;color:#3465a4;background:#eeeeec;line-height:1;}.contact-photo-menu li a:hover{background:#3465a4;color:#eeeeec;text-decoration:none;}
 #id_openid_url{background:url(light/login-bg.gif) no-repeat;background-position:0 50%;padding-left:18px;}
 #settings-default-perms{margin-bottom:20px;}
 #register-form div,#profile-edit-form div{clear:both;}
 .settings-block label{clear:left;}
 .settings-block input{margin:10px 5px;}
-#register-form label,#profile-edit-form label{width:300px;float:left;}
-#register-form span,#profile-edit-form span{color:#555753;display:block;margin-bottom:20px;}
+#register-form label,#profile-edit-form label{width:23em;}
+#register-form span,#profile-edit-form span{color:#555753;display:inline-block;margin-bottom:20px;}
 #profile-edit-marital-label span{margin:-4px;}
 .settings-submit-wrapper,.profile-edit-submit-wrapper{margin:0 0 30px;}
 .profile-edit-side-div{display:none;}
@@ -333,14 +340,14 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
 #profile-edit-links ul{margin:0px;padding:0px;list-style:none;list-style-position:inside;margin:20px 0;}
 .marital{margin-top:5px;}
 #register-sitename{display:inline;font-weight:bold;}
-#advanced-expire-popup{background:#eeeeec;color:#111111;}
+#advanced-expire-popup{background:#111111;color:#eeeeec;}
 #id_ssl_policy{width:374px;}
 #theme-preview img{margin:10px 10px 10px 288px;}
 .group-delete-wrapper{margin:-31px 50px 0 0;float:right;}
 #group-edit-submit-wrapper{margin:0 0 10px 0;display:inline;}
 #group-members,#prof-members{height:200px;overflow:auto;border:1px solid #555753;-o-border-radius:5px 5px 0 0;-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;-ms-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0;}
 #group-all-contacts,#prof-all-contacts{height:200px;overflow:auto;border:1px solid #555753;-o-border-radius:0 0 5px 5px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;-ms-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;}
-#group-members h3,#group-all-contacts h3,#prof-members h3,#prof-all-contacts h3{color:#999999;background-color:#555753;margin:0;padding:5px;}
+#group-members h3,#group-all-contacts h3,#prof-members h3,#prof-all-contacts h3{color:#eeeeec;background-color:#555753;margin:0;padding:5px;}
 #group-separator,#prof-separator{display:none;}
 #cropimage-wrapper{float:left;}
 #crop-image-form{clear:both;}
@@ -358,7 +365,7 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
 .clear{clear:both;}
 .eventcal{float:left;font-size:20px;}
 .event{background:#eeeeec;}
-.vevent{border:1px solid #777777;}.vevent .event-description,.vevent .event-location,.vevent .event-start{margin-left:10px;margin-right:10px;}
+.vevent{border:1px solid #eeeeec;}.vevent .event-description,.vevent .event-location,.vevent .event-start{margin-left:10px;margin-right:10px;}
 #new-event-link{margin-bottom:10px;}
 .edit-event-link,.plink-event-link{}
 .event-description:before{content:url('../../../images/calendar.png');margin-right:15px;}
@@ -385,20 +392,22 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
 .fc-state-highlight{background:#eeeeec;color:#111111;}
 .directory-item{float:left;margin:0 5px 4px 0;padding:3px;width:180px;height:250px;position:relative;}
 #group-sidebar{margin-bottom:10px;}
-.group-selected,.nets-selected,.fileas-selected{padding:3px;color:#eeeeec;background:#3465a4;border:1px solid #3465a4;}
-.group-selected:hover,.nets-selected:hover,.fileas-selected:hover{padding:3px;color:#eeeeec;background:#f2f2c3;border:1px solid #3465a4;}
+.categories-selected,.group-selected,.nets-selected,.fileas-selected{color:#111111;background:#2e3436;color:#eeeeec;border:1px solid #284d7d;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.categories-selected:hover,.group-selected:hover,.nets-selected:hover,.fileas-selected:hover{background:#f2f2c3;color:#111111;border:1px solid #284d7d;}
+.categories-selected a,.group-selected a,.nets-selected a,.fileas-selected a{color:#eeeeec;text-decoration:none;}
 .groupsideedit{margin-right:10px;}
 #sidebar-group-ul{padding-left:0;}
 #sidebar-group-list{margin:0 0 5px 0;}#sidebar-group-list li{margin-top:10px;}
 #sidebar-group-list .icon{display:inline-block;width:12px;height:12px;}
-.sidebar-group-element{padding:3px;}.sidebar-group-element:hover{color:#111111;background:#f2f2c3;font-weight:bold;padding:3px;}
-#sidebar-new-group{margin:auto;display:inline-block;color:#999999;text-decoration:none;text-align:center;}
+.sidebar-group-element{border:1px solid #284d7d;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.sidebar-group-element:active,.sidebar-group-element:hover{background:#f2f2c3;color:#111111;border:1px solid #284d7d;}
+.sidebar-group-element a{border:0;text-decoration:none;}
+#sidebar-new-group{margin:auto;display:inline-block;color:#eeeeec;text-decoration:none;text-align:center;}
 #peoplefind-sidebar form{margin-bottom:10px;}
 #sidebar-new-group:hover{}
 #sidebar-new-group:active{position:relative;top:1px;}
-#side-peoplefind-url{background-color:#eeeeec;color:#111111;border:1px solid #444444;margin-right:3px;width:75%;}#side-peoplefind-url:hover,#side-peoplefind-url:focus{background-color:#999999;color:#000000;border:1px solid #000000;}
-.nets-ul{margin:0px;padding:0px;list-style:none;list-style-position:inside;}.nets-ul li{margin:10px 0 0;}
-.nets-link,.nets-all{margin-left:0px;}
+#side-peoplefind-url{border:1px solid #666666;margin-right:3px;width:75%;}
+.categories-ul,.nets-ul{margin:0px;padding:0px;list-style:none;list-style-position:inside;}.categories-ul li,.nets-ul li{margin:10px 0 0;}
+.categories-link,.nets-link,.nets-all{border:1px solid #284d7d;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin-left:0px;}.categories-link:active,.nets-link:active,.nets-all:active,.categories-link:hover,.nets-link:hover,.nets-all:hover{background:#f2f2c3;color:#111111;border:1px solid #284d7d;}
+.categories-link a,.nets-link a,.nets-all a{border:0;text-decoration:none;}
 #netsearch-box{margin:20px 0px 30px;width:135px;}#netsearch-box #search-submit{margin:5px 5px 0px 0px;}
 #pending-update{float:right;color:white;font-weight:bold;background-color:red;padding:0 0.3em;}
 .admin.linklist{border:0;padding:0;}
@@ -406,22 +415,21 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
 #adminpage{color:#111111;background:#eeeeec;margin:5px;padding:10px;font-size:smaller;}#adminpage dl{clear:left;margin-bottom:2px;padding-bottom:2px;border-bottom:1px solid #111111;}
 #adminpage dt{width:250px;float:left;font-weight:bold;}
 #adminpage dd{margin-left:250px;}
-#adminpage h3{border-bottom:1px solid #777777;}
+#adminpage h3{border-bottom:1px solid #cccccc;}
 #adminpage .submit{clear:left;}
 #adminpage #pluginslist{margin:0;padding:0;}
-#adminpage .plugin{display:block;border:1px solid #333333;padding:1em;margin-bottom:5px;clear:left;}
+#adminpage .plugin{display:block;border:1px solid #888888;padding:1em;margin-bottom:5px;clear:left;}
 #adminpage .toggleplugin{float:left;margin-right:1em;}
 #adminpage table{width:100%;border-bottom:1px solid #111111;margin:5px 0;}#adminpage table th{font-weight:bold;text-align:left;}
 #adminpage table td{padding:5px;vertical-align:middle;}
-#adminpage table#users{padding:5px;}
-#adminpage table#users img{width:16px;height:16px;}
+#adminpage table#users{padding:5px;}#adminpage table#users img{width:16px;height:16px;}
 #adminpage table#users a{color:#111111;text-decoration:underline;}
 #adminpage td .icon{float:left;}
 #adminpage .selectall{text-align:right;}
 #users .name{color:#111111;}
 #users .tools{padding:5px 0;vertical-align:middle;}
 .field{overflow:auto;}
-.field .onoff{float:right;margin:0 330px 0 auto;width:80px;}.field .onoff a{display:block;border:1px solid #111111;padding:3px 6px 4px 10px;height:16px;text-decoration:none;}
+.field .onoff{float:right;margin:0 330px 0 auto;width:80px;}.field .onoff a{display:block;border:1px solid #666666;padding:3px 6px 4px 10px;height:16px;text-decoration:none;}
 .field .onoff .on,.field .onoff .off{background-image:url('data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAUACIDASIAAhEBAxEB/8QAGgABAQACAwAAAAAAAAAAAAAAAAQDBQEGCf/EACgQAAIBAwIFAwUAAAAAAAAAAAECAAMEERIUBRMxUpEhIoEjM1Nxkv/EABcBAAMBAAAAAAAAAAAAAAAAAAABAgT/xAAaEQEAAgMBAAAAAAAAAAAAAAAAAQIRMVES/9oADAMBAAIRAxEAPwD1ERKFNFVaNNVUYACgACcNVt1dEKUwzZwNI9cSDczDVdnuKDjomrPyJOQ2SXNq/L0rTPMzp9vXHWZfo/jT+RNFQV6e2yPt6s/Ms3EWQofhnDqjszWFqzMcljRUknxEn3ES/dup8xxPZ0hXtKFViQzorEDpkiZtqvc3mIkzs40bVe5vMbVe5vMREbrN3xy4t7utSVaZVHZQSDnAP7iIm+K1xpkm09f/2Q==');background-repeat:no-repeat;}
 .field .onoff .on{background-position:42px 1px;background-color:#333333;color:#cccccc;text-align:left;}
 .field .onoff .off{background-position:2px 1px;background-color:#cccccc;color:#333333;text-align:right;}
@@ -429,21 +437,23 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
 .field textarea{width:80%;height:100px;}
 .field_help{display:block;margin-left:297px;color:#666666;font-size:small;}
 .field.radio .field_help{margin-left:297px;}
-.popup{width:100%;height:100%;top:0px;left:0px;position:absolute;display:none;}.popup .background{background-color:#000000;opacity:0.5;width:100%;height:100%;position:absolute;top:0px;left:0px;}
+.popup{width:100%;height:100%;top:0px;left:0px;position:absolute;display:none;}.popup .background{background-color:#111111;opacity:0.5;width:100%;height:100%;position:absolute;top:0px;left:0px;}
 .popup .panel{top:25%;left:25%;width:50%;height:50%;padding:1em;position:absolute;border:4px solid #000000;background-color:white;}
-#panel{z-index:100;}
+#panel{position:absolute;font-size:small;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;border:1px solid #eeeeec;background-color:#2e3436;color:#eeeeec;padding:1em;z-index:100;}
+.pager{margin-top:60px;display:block;clear:both;text-align:center;font-size:small;font-weight:bold;}.pager span{padding:4px;margin:4px;}
+.pager_current{background-color:#3465a4;color:#eeeeec;}
 .grey,.gray{color:gray;}
 .orange{color:orange;}
 .red{color:red;}
 .popup .panel .panel_text{display:block;overflow:auto;height:80%;}
 .popup .panel .panel_in{width:100%;height:100%;position:relative;}
 .popup .panel .panel_actions{width:100%;bottom:4px;left:0px;position:absolute;}
-.panel_text .progress{width:50%;overflow:hidden;height:auto;border:1px solid #777777;margin-bottom:5px;}.panel_text .progress span{float:right;display:block;width:25%;background-color:#eeeeec;text-align:right;}
-.oauthapp{height:auto;overflow:auto;border-bottom:2px solid #777777;padding-bottom:1em;margin-bottom:1em;}.oauthapp img{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;}
+.panel_text .progress{width:50%;overflow:hidden;height:auto;border:1px solid #cccccc;margin-bottom:5px;}.panel_text .progress span{float:right;display:block;width:25%;background-color:#eeeeec;text-align:right;}
+.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 img.noicon{background-image:url("../../../images/icons/48/plugin.png");background-position:center center;background-repeat:no-repeat;}
 .oauthapp a{float:left;}
 .iconspacer{display:block;width:16px;height:16px;}
-.icon{display:block;width:20px;height:20px;background:url(light/icons.png) no-repeat;border:0;text-decoration:none;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.icon:hover{border:0;text-decoration:none;}
-.editicon{display:inline-block;width:21px;height:21px;background:url(light/editicons.png) no-repeat;border:0;text-decoration:none;}
+.icon{display:block;width:20px;height:20px;background:transparent url("light/icons.png") no-repeat;border:0;text-decoration:none;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.icon:hover{border:0;text-decoration:none;}
+.editicon{display:inline-block;width:21px;height:21px;background:url("light/editicons.png") no-repeat;border:0;text-decoration:none;}
 .shadow{-moz-box-shadow:2px 2px 5px 2px #111111;-o-box-shadow:2px 2px 5px 2px #111111;-webkit-box-shadow:2px 2px 5px 2px #111111;-ms-box-shadow:2px 2px 5px 2px #111111;box-shadow:2px 2px 5px 2px #111111;}.shadow:active,.shadow:focus,.shadow:hover{-moz-box-shadow:0 0 0 0 #111111;-o-box-shadow:0 0 0 0 #111111;-webkit-box-shadow:0 0 0 0 #111111;-ms-box-shadow:0 0 0 0 #111111;box-shadow:0 0 0 0 #111111;}
 .editicon:hover{border:0;}
 .boldbb{background-position:0px 0px;}.boldbb:hover{background-position:-22px 0px;}
@@ -507,11 +517,12 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
 .type-unkn{background-position:-80px 0;}
 .cc-license{margin-top:100px;font-size:0.7em;}
 footer{display:block;clear:both;}
+#sectionfooter{margin:1em 0 1em 0;}
 #profile-jot-text{height:20px;color:#666666;background:#cccccc;border:1px solid #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;width:99.5%;}
 #photo-edit-perms-select,#photos-upload-permissions-wrapper,#profile-jot-acl-wrapper{display:block !important;background:#eeeeec;color:#111111;}
-#profile-jot-acl-wrapper{margin:0 10px;border:1px solid #555753;border-top:0;}
+#profile-jot-acl-wrapper{margin:0 10px;border:1px solid #555753;border-top:0;font-size:small;}
 #acl-wrapper{width:660px;margin:0 auto;}
-#acl-search{float:right;background:#ffffff url("../../../images/search_18.png") no-repeat right center;padding-right:20px;margin:6px;color:#eeeeec;}
+#acl-search{float:right;background:#ffffff url("../../../images/search_18.png") no-repeat right center;padding-right:20px;margin:6px;color:#111111;}
 #acl-showall{float:left;display:block;width:auto;height:18px;background:#eeeeec url("../../../images/show_all_off.png") 8px 8px no-repeat;padding:7px 10px 7px 30px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;color:#999999;margin:5px 0;}#acl-showall.selected{color:black;background:#ff9900 url(../../../images/show_all_on.png) 8px 8px no-repeat;}
 #acl-list{height:210px;border:1px solid #cccccc;clear:both;margin-top:30px;overflow:auto;}
 .acl-list-item{border:1px solid #cccccc;width:120px;height:110px;display:block;float:left;margin:3px 0 5px 5px;}.acl-list-item img{width:22px;height:22px;float:left;margin:5px 5px 20px;}

view/theme/dispy/light/theme.php

@@ -1,9 +1,8 @@
 <?php
 
 /*
- * Name: Dispy
- * Description: <p style="white-space:pre;">            Dispy: Light, Spartan, Sleek, and Functional<br />            Dispy Dark: Dark, Spartan, Sleek, and Functional</p>
- * Version: 1.2
+ * Name: Dispy Light
+ * Description: Dispy Light: Light, Spartan, Sleek, and Functional
  * Author: Simon <http://simon.kisikew.org/>
  * Maintainer: Simon <http://simon.kisikew.org/>
  * Screenshot: <a href="screenshot.jpg">Screenshot</a>
@@ -13,7 +12,6 @@ $a = get_app();
 $a->theme_info = array(
     'family' => 'dispy',
 	'name' => 'light',
-	'version' => '1.2'
 );
 
 function dispy_light_init(&$a) {
@@ -21,10 +19,10 @@ function dispy_light_init(&$a) {
     /** @purpose set some theme defaults
     */
     $cssFile = null;
-    $colour = false;
     $colour = 'light';
+	$colour_path = "/light/";
 
-    // custom css
+    // set css
     if (!is_null($cssFile)) {
         $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
     }

view/theme/dispy/nav.tpl

@@ -50,7 +50,7 @@
 	</ul>
 
 	<div id="user-menu">
-        <a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a>
+        <a id="user-menu-label" onclick="openClose('user-menu-popup'); return false;" href="$nav.home.0">$sitelocation</a>
         <ul id="user-menu-popup"
             onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')"
             onmouseout="tmenu=setTimeout('closeMenu(\'user-menu-popup\');',200)">
@@ -90,7 +90,9 @@
 {{ if $userinfo }}
         <ul id="nav-user-menu" class="menu-popup">
             {{ for $nav.usermenu as $usermenu }}
-                <li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
+                <li>
+					<a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a>
+				</li>
             {{ endfor }}
         </ul>
 {{ endif }}
@@ -121,18 +123,19 @@ $langselector
 </div>
 
 <div id="scrollup">
-<a href="#top"><img
-	src="view/theme/dispy/icons/scroll_top.png"
+<a href="#top"><img src="view/theme/dispy/icons/scroll_top.png"
 	alt="back to top" title="Back to top" /></a>
 </div>
 
 <div class="search-box">
 	<form method="get" action="$nav.search.0">
-		<input id="search-text" class="nav-menu-search" type="search" placeholder="Search" value="" id="search" name="search" />
+		<input id="mini-search-text" class="nav-menu-search" type="search" placeholder="Search" value="" id="search" name="search" />
 	</form>
 </div>
 
 <ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
+	<li class="{4}">
+	<a href="{0}"><img src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a>
+	</li>
 </ul>
 

view/theme/dispy/photo_edit.tpl

@@ -0,0 +1,53 @@
+
+<form action="photos/$nickname/$resource_id" method="post" id="photo_edit_form" >
+
+	<input type="hidden" name="item_id" value="$item_id" />
+
+	<label id="photo-edit-albumname-label" for="photo-edit-albumname">$newalbum</label>
+	<input id="photo-edit-albumname" type="text" name="albname" value="$album" />
+
+	<div id="photo-edit-albumname-end"></div>
+
+	<label id="photo-edit-caption-label" for="photo-edit-caption">$capt_label</label>
+	<input id="photo-edit-caption" type="text" name="desc" value="$caption" />
+
+	<div id="photo-edit-caption-end"></div>
+
+	<label id="photo-edit-tags-label" for="photo-edit-newtag" >$tag_label</label>
+	<input name="newtag" id="photo-edit-newtag" title="$help_tags" type="text" />
+
+	<div id="photo-edit-tags-end"></div>
+	<div id="photo-edit-rotate-wrapper">
+		<div id="photo-edit-rotate-label">$rotate</div>
+		<input type="checkbox" name="rotate" value="1" />
+	</div>
+	<div id="photo-edit-rotate-end"></div>
+
+	<div id="photo-edit-perms" class="photo-edit-perms" >
+		<a href="#photo-edit-perms-select"
+			id="photo-edit-perms-menu"
+			class="button"
+			title="$permissions"/><span id="jot-perms-icon"
+			class="icon $lockstate" ></span>$permissions</a>
+		<div id="photo-edit-perms-menu-end"></div>
+
+		<div style="display: none;">
+			<div id="photo-edit-perms-select" >
+				$aclselect
+			</div>
+		</div>
+	</div>
+	<div id="photo-edit-perms-end"></div>
+
+	<input id="photo-edit-submit-button" type="submit" name="submit" value="$submit" />
+	<input id="photo-edit-delete-button" type="submit" name="delete" value="$delete" onclick="return confirmDelete()"; />
+
+	<div id="photo-edit-end"></div>
+</form>
+
+<script type="text/javascript">
+	$("a#photo-edit-perms-menu").fancybox({
+		'transitionIn' : 'none',
+		'transitionOut' : 'none'
+	}); 
+</script>

view/theme/dispy/style.php

@@ -13,238 +13,94 @@
         $colour = get_pconfig(local_user(), "dispy", "colour");
     }
 
-    if ($line_height === false) { $line_height = $site_line_height; }
-    if ($line_height === false) { $line_height = "1.2"; }
-    if ($dispy_font_size === false) { $dispy_font_size = $site_dispy_font_size; }
-    if ($dispy_font_size === false) { $dispy_font_size = "12"; }
-    if ($colour === false) { $colour = $site_colour; }
-    if ($colour === false) { $colour = "light"; }
+    if ($line_height === false) {
+		$line_height = $site_line_height;
+	}
+    if ($line_height === false) {
+		$line_height = "1.2";
+	}
+    if ($dispy_font_size === false) {
+		$dispy_font_size = $site_dispy_font_size;
+	}
+    if ($dispy_font_size === false) {
+		$dispy_font_size = "12";
+	}
+    if ($colour === false) {
+		$colour = $site_colour;
+	}
+    if ($colour === false) {
+		$colour = "light";
+	}
     
     if($colour == "light") {
         if (file_exists("$THEMEPATH/light/style.css")) {
             echo file_get_contents("$THEMEPATH/light/style.css");
         }
-        if($dispy_font_size == "16") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    font-size: 16px;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    font-size: 16px;
-                }";  
-        }
-        if($dispy_font_size == "15") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    font-size: 15px;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    font-size: 15px;
-                }";
-        }	
-        if($dispy_font_size == "14") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    font-size: 14px;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    font-size: 14px;
-                }";
-        }
-        if($dispy_font_size == "13.5") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    font-size: 13.5px;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    font-size: 13.5px;
-                }";
-        }
-        if($dispy_font_size == "13") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    font-size: 13px;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    font-size: 13px;
-                }";
-        }
-        if($dispy_font_size == "12.5") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    font-size: 12.5px;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    font-size: 12.5px;
-                }";
-        }
-        if($dispy_font_size == "12") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    font-size: 12px;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    font-size: 12px;
-                }";
-        }
-        if($line_height == "1.5") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    line-height: 1.5;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    line-height: 1.5;
-                }";
-        }	
-        if($line_height == "1.4") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    line-height: 1.4;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    line-height: 1.4;
-                }";
-        }
-        if($line_height == "1.3") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    line-height: 1.3;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    line-height: 1.3;
-                }";
-        }
-        if($line_height == "1.2") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    line-height: 1.2;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    line-height: 1.2;
-                }";
-        }
-        if($line_height == "1.1") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    line-height: 1.1;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    line-height: 1.1;
-                }";
-        }
     }
 
     if($colour == "dark") {
         if (file_exists("$THEMEPATH/dark/style.css")) { 
             echo file_get_contents("$THEMEPATH/dark/style.css");
         }
-        if($dispy_font_size == "16") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    font-size: 16px;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    font-size: 16px;
-                }";  
-        }
-        if($dispy_font_size == "15") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    font-size: 15px;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    font-size: 15px;
-                }";
-        }	
-        if($dispy_font_size == "14") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    font-size: 14px;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    font-size: 14px;
-                }";
-        }
-        if($dispy_font_size == "13.5") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    font-size: 13.5px;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    font-size: 13.5px;
-                }";
-        }
-        if($dispy_font_size == "13") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    font-size: 13px;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    font-size: 13px;
-                }";
-        }
-        if($dispy_font_size == "12.5") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    font-size: 12.5px;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    font-size: 12.5px;
-                }";
-        }
-        if($dispy_font_size == "12") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    font-size: 12px;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    font-size: 12px;
-                }";
-        }
-        if($line_height == "1.5") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    line-height: 1.5;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    line-height: 1.5;
-                }";
-        }	
-        if($line_height == "1.4"){
-            echo "
-                .wall-item-container .wall-item-content {
-                    line-height: 1.4;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    line-height: 1.4;
-                }";
-        }
-        if($line_height == "1.3") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    line-height: 1.3;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    line-height: 1.3;
-                }";
-        }
-        if($line_height == "1.2") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    line-height: 1.2;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    line-height: 1.2;
-                }";
-        }
-        if($line_height == "1.1") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    line-height: 1.1;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    line-height: 1.1;
-                }";
-        }
-    }
+	}
 
+	if($dispy_font_size == "16") {
+		echo ".wall-item-content {
+				font-size: 16px;
+			}";
+	}
+	if($dispy_font_size == "15") {
+		echo ".wall-item-content {
+				font-size: 15px;
+			}";
+	}	
+	if($dispy_font_size == "14") {
+		echo ".wall-item-content {
+				font-size: 14px;
+			}";
+	}
+	if($dispy_font_size == "13.5") {
+		echo ".wall-item-content {
+				font-size: 13.5px;
+			}";
+	}
+	if($dispy_font_size == "13") {
+		echo ".wall-item-content {
+				font-size: 13px;
+			}";
+	}
+	if($dispy_font_size == "12.5") {
+		echo ".wall-item-content {
+				font-size: 12.5px;
+			}";
+	}
+	if($dispy_font_size == "12") {
+		echo ".wall-item-content {
+				font-size: 12px;
+			}";
+	}
+	if($line_height == "1.5") {
+		echo ".wall-item-content {
+				line-height: 1.5;
+			}";
+	}	
+	if($line_height == "1.4") {
+		echo ".wall-item-content {
+				line-height: 1.4;
+			}";
+	}
+	if($line_height == "1.3") {
+		echo ".wall-item-content {
+				line-height: 1.3;
+			}";
+	}
+	if($line_height == "1.2") {
+		echo ".wall-item-content {
+				line-height: 1.2;
+			}";
+	}
+	if($line_height == "1.1") {
+		echo ".wall-item-content {
+				line-height: 1.1;
+			}";
+	}

view/theme/dispy/theme.php

@@ -20,7 +20,7 @@
 $a = get_app();
 $a->theme_info = array(
     'family' => 'dispy',
-	'version' => '1.2'
+	'version' => '1.2.2'
 );
 
 function dispy_init(&$a) {

view/theme/dispy/wall_item.tpl

@@ -13,7 +13,15 @@
 				</div>
 			</div>
 			<div class="wall-item-photo-end"></div>
-			<div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>				
+			<div class="wall-item-location" id="wall-item-location-$item.id">
+				{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}
+			</div>
+			<div class="wall-item-author">
+				<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id">$item.name</span></a>
+			</div>
+			<div class="wall-item-ago" id="wall-item-ago-$item.id">
+				$item.ago
+			</div>
 		</div>
 		<div class="wall-item-tools" id="wall-item-tools-$item.id">
 			<div class="wall-item-lock-wrapper">
@@ -67,10 +75,6 @@
 				</div>
 			</div>
 		</div>
-		<div class="wall-item-author">
-				<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
-		</div>	
 	</div>
 	<div class="wall-item-wrapper-end"></div>
 	<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>

view/theme/dispy/wallwall_item.tpl

@@ -18,7 +18,15 @@
 
 			</div>
 			<div class="wall-item-photo-end"></div>
-			<div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>				
+			<div class="wall-item-location" id="wall-item-location-$item.id">
+				{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}
+			</div>
+			<div class="wall-item-author">
+				<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id">$item.name</span></a>
+			</div>
+			<div class="wall-item-ago" id="wall-item-ago-$item.id">
+				$item.ago
+			</div>
 		</div>
 		<div class="wall-item-tools" id="wall-item-tools-$item.id">
 			<div class="wall-item-lock-wrapper">
@@ -73,10 +81,6 @@ class="icon recycle wall-item-share-buttons"  title="$item.vote.share.0" onclick
 				</div>			
 			</div>
 		</div>
-		<div class="wall-item-author">
-			<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
-			<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
-		</div>	
 	</div>	
 	<div class="wall-item-wrapper-end"></div>
 	<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>

view/theme/duepuntozero/profile_vcard.tpl

@@ -0,0 +1,51 @@
+<div class="vcard">
+
+	<div class="fn label">$profile.name</div>
+	
+				
+	
+	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
+	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name"></div>
+
+
+
+	{{ if $location }}
+		<dl class="location"><dt class="location-label">$location</dt> 
+		<dd class="adr">
+			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
+			<span class="city-state-zip">
+				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
+				<span class="region">$profile.region</span>
+				<span class="postal-code">$profile.postal-code</span>
+			</span>
+			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
+		</dd>
+		</dl>
+	{{ endif }}
+
+	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
+	
+	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
+
+	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
+
+	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
+
+	{{ inc diaspora_vcard.tpl }}{{ endinc }}
+
+	<div id="profile-vcard-break"></div>	
+	<div id="profile-extra-links">
+		<ul>
+			{{ if $connect }}
+				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
+			{{ endif }}
+			{{ if $wallmessage }}
+				<li><a id="wallmessage-link" href="wallmessage/$profile.nickname">$wallmessage</a></li>
+			{{ endif }}
+		</ul>
+	</div>
+</div>
+
+$contact_block
+
+

view/theme/duepuntozero/style.css

@@ -80,6 +80,7 @@ blockquote {
 .heart {
 	color: #FF0000;
 	font-size: 100%;
+	margin-right: 5px;
 }
 
 
@@ -338,6 +339,15 @@ div.wall-item-content-wrapper.shiny {
 	font-weight: bold;
 }
 
+.settings-widget .selected {
+	padding: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;	
+	border: 1px solid #CCCCCC;
+	background: #F8F8F8;
+	font-weight: bold;
+}
+
 .fakelink:hover {
 	color: #3465a4;
 	text-decoration: underline;
@@ -551,6 +561,9 @@ input#dfrn-url {
 	margin-bottom: 30px;
 }
 
+#profile-vcard-break {
+	clear: both;
+}
 #profile-extra-links {
 	clear: both;
 	margin-top: 10px;
@@ -666,7 +679,8 @@ input#dfrn-url {
 #profile-edit-religion-label,
 #profile-edit-pubkeywords-label,
 #profile-edit-prvkeywords-label,
-#profile-edit-homepage-label {
+#profile-edit-homepage-label,
+#profile-edit-hometown-label {
 	float: left;
 	width: 175px;
 }
@@ -704,7 +718,17 @@ input#dfrn-url {
 #settings-community {
 	float: left;
 }
-
+#settings-notifications label {
+	margin-left: 20px;
+}
+#settings-notify-desc, #settings-activity-desc {
+	font-weight: bold;
+	margin-bottom: 15px;
+}
+#settings-pagetype-desc {
+	color: #666666;
+	margin-bottom: 15px;
+}
 
 #profile-in-dir-yes-label,
 #profile-in-dir-no-label,
@@ -751,7 +775,7 @@ input#dfrn-url {
 }
 
 
-#profile-edit-homepage {
+#profile-edit-homepage, #profile-edit-hometown {
 	float: left;
 	margin-bottom: 35px;
 }
@@ -791,6 +815,7 @@ input#dfrn-url {
 #profile-edit-pubkeywords-end,
 #profile-edit-prvkeywords-end,
 #profile-edit-homepage-end,
+#profile-edit-hometown-end,
 #profile-in-dir-break,
 #profile-in-dir-end,
 #profile-in-netdir-break,
@@ -806,8 +831,15 @@ input#dfrn-url {
 	clear: both;
 }
 
+.settings-widget ul {
+	list-style-type: none;
+	padding: 0px;
+}
 
-
+.settings-widget li {
+	margin-left: 24px;
+	margin-bottom: 8px;
+}
 
 
 #gender-select, #marital-select, #sexual-select {
@@ -1091,6 +1123,11 @@ input#dfrn-url {
 	overflow: auto;
 }
 
+.wall-item-content img {
+  max-width: 700px;
+}
+
+
 .wall-item-title {
 	float: left;
 	font-weight: bold;
@@ -1958,23 +1995,29 @@ aside input[type='text'] {
 }
 
 
-.photos {
+/*.photos {
 	height: auto;
 	overflow: auto;
+}*/
+
+.photos-end {
+	clear: both;
+	margin-bottom: 25px;
 }
 
 .photo-album-image-wrapper {
 	float: left;
 	margin-top: 15px;
 	margin-right: 15px;
-	width: 200px; height: 200px; 
+	margin-left: 15px;
+/*	width: 200px; height: 200px; 
 	overflow: hidden; 
-	position: relative;
+	position: relative; */
 }
 .photo-album-image-wrapper .caption {
 	display: none; 
  	width: 100%;
- 	position: absolute; 
+/* 	position: absolute; */
  	bottom: 0px; 
  	padding: 0.5em 0.5em 0px 0.5em;
  	background-color: rgba(245, 245, 255, 0.8);
@@ -1987,20 +2030,23 @@ aside input[type='text'] {
 
 #photo-album-end {
 	clear: both;
+	margin-bottom: 25px;
 }
 
 .photo-top-image-wrapper {
-	position: relative;
+/*	position: relative; */
 	float: left;
 	margin-top: 15px;
 	margin-right: 15px;
-	width: 200px; height: 200px; 
-	overflow: hidden; 
+	margin-left: 15px;
+	margin-bottom: 15px;
+/*	width: 200px; height: 200px; 
+	overflow: hidden; */
 }
 .photo-top-album-name {
  	width: 100%;
  	min-height: 2em;
- 	position: absolute; 
+/* 	position: absolute;  */
  	bottom: 0px; 
  	padding: 0px 3px;
  	padding-top: 0.5em;
@@ -2104,7 +2150,7 @@ aside input[type='text'] {
 	margin-bottom: 15px;
 }
 
-#photo-edit-caption-label, #photo-edit-tags-label, #photo-edit-albumname-label {
+#photo-edit-caption-label, #photo-edit-tags-label, #photo-edit-albumname-label, #photo-edit-rotate-label {
 	float: left;
 	width: 150px;
 }
@@ -2113,7 +2159,7 @@ aside input[type='text'] {
 	margin-bottom: 15px;
 }
 
-#photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname {
+#photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname, #photo-edit-rotate {
 	float: left;
 	margin-bottom: 25px;
 }
@@ -2124,10 +2170,14 @@ aside input[type='text'] {
 	margin-bottom: 25px;
 }
 
-#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end {
+#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end, #photo-edit-rotate-end {
 	clear: both;
 }
 
+#photo-edit-rotate-end {
+	margin-bottom: 15px;
+}
+
 #photo-edit-delete-button {
 	margin-left: 200px;
 }
@@ -2932,6 +2982,7 @@ aside input[type='text'] {
 .starred { background-position: -16px -48px; }
 .unstarred { background-position: -32px -48px; }
 .tagged { background-position: -48px -48px; }
+.yellow { background-position: -64px -48px; }
 
 
 .filer-icon {

view/theme/quattro/dark/style.css

@@ -243,6 +243,18 @@
 .icon.s48.language {
   background-image: url("icons/language.png");
 }
+.icon.on {
+  background-image: url("icons/addon_on.png");
+  min-width: 16px;
+  height: 16px;
+  background-position: 0px 0px;
+}
+.icon.off {
+  background-image: url("icons/addon_off.png");
+  width: 16px;
+  height: 16px;
+  background-position: 0px 0px;
+}
 /* global */
 body {
   font-family: Liberation Sans, helvetica, arial, clean, sans-serif;
@@ -255,8 +267,7 @@ body {
 h4 {
   font-size: 1.1em;
 }
-a,
-a:link {
+a, a:link {
   color: #005c94;
   text-decoration: none;
 }
@@ -478,8 +489,7 @@ nav #nav-site-linkmenu .menu-popup {
   right: 0px;
   left: auto;
 }
-nav #nav-notifications-linkmenu.on .icon.s22.notify,
-nav #nav-notifications-linkmenu.selected .icon.s22.notify {
+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-apps-link.selected {
@@ -668,15 +678,11 @@ aside #profiles-menu {
   height: 48px;
 }
 /* group member */
-#contact-edit-drop-link,
-.mail-list-delete-wrapper,
-.group-delete-wrapper {
+#contact-edit-drop-link, .mail-list-delete-wrapper, .group-delete-wrapper {
   float: right;
   margin-right: 50px;
 }
-#contact-edit-drop-link .drophide,
-.mail-list-delete-wrapper .drophide,
-.group-delete-wrapper .drophide {
+#contact-edit-drop-link .drophide, .mail-list-delete-wrapper .drophide, .group-delete-wrapper .drophide {
   background-image: url('../../../images/icons/22/delete.png');
   display: block;
   width: 22px;
@@ -685,9 +691,7 @@ aside #profiles-menu {
   position: relative;
   top: -50px;
 }
-#contact-edit-drop-link .drop,
-.mail-list-delete-wrapper .drop,
-.group-delete-wrapper .drop {
+#contact-edit-drop-link .drop, .mail-list-delete-wrapper .drop, .group-delete-wrapper .drop {
   background-image: url('../../../images/icons/22/delete.png');
   display: block;
   width: 22px;
@@ -817,8 +821,7 @@ section {
   display: table;
   width: 750px;
 }
-.wall-item-container .wall-item-item,
-.wall-item-container .wall-item-bottom {
+.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
   display: table-row;
 }
 .wall-item-container .wall-item-bottom {
@@ -856,13 +859,11 @@ section {
 .wall-item-container .wall-item-content img {
   max-width: 710px;
 }
-.wall-item-container .wall-item-links,
-.wall-item-container .wall-item-actions {
+.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;
   vertical-align: middle;
 }
-.wall-item-container .wall-item-links .icon,
-.wall-item-container .wall-item-actions .icon {
+.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
   opacity: 0.5;
   -webkit-transition: all 0.2s ease-in-out;
   -moz-transition: all 0.2s ease-in-out;
@@ -870,8 +871,7 @@ section {
   -ms-transition: all 0.2s ease-in-out;
   transition: all 0.2s ease-in-out;
 }
-.wall-item-container .wall-item-links .icon:hover,
-.wall-item-container .wall-item-actions .icon:hover {
+.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon:hover {
   opacity: 1;
   -webkit-transition: all 0.2s ease-in-out;
   -moz-transition: all 0.2s ease-in-out;
@@ -1015,6 +1015,9 @@ section {
   opacity: 0.5;
 }
 .wwto {
+  position: absolute !important;
+  width: 25px;
+  height: 25px;
   background: #FFFFFF;
   border: 2px solid #364e59;
   height: 25px;
@@ -1245,9 +1248,7 @@ section {
     height: 18px;
 }*/
 /** acl **/
-#photo-edit-perms-select,
-#photos-upload-permissions-wrapper,
-#profile-jot-acl-wrapper {
+#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
   display: block!important;
 }
 #acl-wrapper {
@@ -1406,12 +1407,10 @@ ul.tabs li .active {
   float: left;
   width: 200px;
 }
-.field input,
-.field textarea {
+.field input, .field textarea {
   width: 400px;
 }
-.field input[type="checkbox"],
-.field input[type="radio"] {
+.field input[type="checkbox"], .field input[type="radio"] {
   width: auto;
 }
 .field textarea {
@@ -1642,15 +1641,13 @@ ul.tabs li .active {
   transition: all 0.2s ease-in-out;
 }
 /* theme screenshot */
-.screenshot,
-#theme-preview {
+.screenshot, #theme-preview {
   position: absolute;
   width: 202px;
   left: 70%;
   top: 50px;
 }
-.screenshot img,
-#theme-preview img {
+.screenshot img, #theme-preview img {
   width: 200px;
   height: 150px;
 }
@@ -1663,3 +1660,77 @@ footer {
   margin-top: 25px;
   clear: both;
 }
+/**
+ * ADMIN
+ */
+#pending-update {
+  float: right;
+  color: #ffffff;
+  font-weight: bold;
+  background-color: #FF0000;
+  padding: 0em 0.3em;
+}
+#adminpage dl {
+  clear: left;
+  margin-bottom: 2px;
+  padding-bottom: 2px;
+  border-bottom: 1px solid black;
+}
+#adminpage dt {
+  width: 200px;
+  float: left;
+  font-weight: bold;
+}
+#adminpage dd {
+  margin-left: 200px;
+}
+#adminpage h3 {
+  border-bottom: 1px solid #cccccc;
+}
+#adminpage .field label {
+  font-weight: bold;
+}
+#adminpage .submit {
+  clear: left;
+  text-align: right;
+}
+#adminpage #pluginslist {
+  margin: 0px;
+  padding: 0px;
+}
+#adminpage .plugin {
+  list-style: none;
+  display: block;
+  border: 1px solid #888888;
+  padding: 1em;
+  margin-bottom: 5px;
+  clear: left;
+}
+#adminpage .plugin desc {
+  margin-left: 2.5em;
+}
+#adminpage .toggleplugin {
+  float: left;
+  margin-right: 1em;
+}
+#adminpage table {
+  width: 100%;
+  border-bottom: 1px solid #000000;
+  margin: 5px 0px;
+}
+#adminpage table th {
+  text-align: left;
+}
+#adminpage table td .icon {
+  float: left;
+}
+#adminpage table tr:hover {
+  background-color: #bbc7d7;
+}
+#adminpage table#users img {
+  width: 16px;
+  height: 16px;
+}
+#adminpage .selectall {
+  text-align: right;
+}

view/theme/quattro/green/style.css

@@ -243,6 +243,18 @@
 .icon.s48.language {
   background-image: url("icons/language.png");
 }
+.icon.on {
+  background-image: url("icons/addon_on.png");
+  min-width: 16px;
+  height: 16px;
+  background-position: 0px 0px;
+}
+.icon.off {
+  background-image: url("icons/addon_off.png");
+  width: 16px;
+  height: 16px;
+  background-position: 0px 0px;
+}
 /* global */
 body {
   font-family: Liberation Sans, helvetica, arial, clean, sans-serif;
@@ -255,8 +267,7 @@ body {
 h4 {
   font-size: 1.1em;
 }
-a,
-a:link {
+a, a:link {
   color: #009100;
   text-decoration: none;
 }
@@ -478,8 +489,7 @@ nav #nav-site-linkmenu .menu-popup {
   right: 0px;
   left: auto;
 }
-nav #nav-notifications-linkmenu.on .icon.s22.notify,
-nav #nav-notifications-linkmenu.selected .icon.s22.notify {
+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-apps-link.selected {
@@ -668,15 +678,11 @@ aside #profiles-menu {
   height: 48px;
 }
 /* group member */
-#contact-edit-drop-link,
-.mail-list-delete-wrapper,
-.group-delete-wrapper {
+#contact-edit-drop-link, .mail-list-delete-wrapper, .group-delete-wrapper {
   float: right;
   margin-right: 50px;
 }
-#contact-edit-drop-link .drophide,
-.mail-list-delete-wrapper .drophide,
-.group-delete-wrapper .drophide {
+#contact-edit-drop-link .drophide, .mail-list-delete-wrapper .drophide, .group-delete-wrapper .drophide {
   background-image: url('../../../images/icons/22/delete.png');
   display: block;
   width: 22px;
@@ -685,9 +691,7 @@ aside #profiles-menu {
   position: relative;
   top: -50px;
 }
-#contact-edit-drop-link .drop,
-.mail-list-delete-wrapper .drop,
-.group-delete-wrapper .drop {
+#contact-edit-drop-link .drop, .mail-list-delete-wrapper .drop, .group-delete-wrapper .drop {
   background-image: url('../../../images/icons/22/delete.png');
   display: block;
   width: 22px;
@@ -817,8 +821,7 @@ section {
   display: table;
   width: 750px;
 }
-.wall-item-container .wall-item-item,
-.wall-item-container .wall-item-bottom {
+.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
   display: table-row;
 }
 .wall-item-container .wall-item-bottom {
@@ -856,13 +859,11 @@ section {
 .wall-item-container .wall-item-content img {
   max-width: 710px;
 }
-.wall-item-container .wall-item-links,
-.wall-item-container .wall-item-actions {
+.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;
   vertical-align: middle;
 }
-.wall-item-container .wall-item-links .icon,
-.wall-item-container .wall-item-actions .icon {
+.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
   opacity: 0.5;
   -webkit-transition: all 0.2s ease-in-out;
   -moz-transition: all 0.2s ease-in-out;
@@ -870,8 +871,7 @@ section {
   -ms-transition: all 0.2s ease-in-out;
   transition: all 0.2s ease-in-out;
 }
-.wall-item-container .wall-item-links .icon:hover,
-.wall-item-container .wall-item-actions .icon:hover {
+.wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon:hover {
   opacity: 1;
   -webkit-transition: all 0.2s ease-in-out;
   -moz-transition: all 0.2s ease-in-out;
@@ -1015,6 +1015,9 @@ section {
   opacity: 0.5;
 }
 .wwto {
+  position: absolute !important;
+  width: 25px;
+  height: 25px;
   background: #FFFFFF;
   border: 2px solid #364e59;
   height: 25px;
@@ -1245,9 +1248,7 @@ section {
     height: 18px;
 }*/
 /** acl **/
-#photo-edit-perms-select,
-#photos-upload-permissions-wrapper,
-#profile-jot-acl-wrapper {
+#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
   display: block!important;
 }
 #acl-wrapper {
@@ -1406,12 +1407,10 @@ ul.tabs li .active {
   float: left;
   width: 200px;
 }
-.field input,
-.field textarea {
+.field input, .field textarea {
   width: 400px;
 }
-.field input[type="checkbox"],
-.field input[type="radio"] {
+.field input[type="checkbox"], .field input[type="radio"] {
   width: auto;
 }
 .field textarea {
@@ -1642,15 +1641,13 @@ ul.tabs li .active {
   transition: all 0.2s ease-in-out;
 }
 /* theme screenshot */
-.screenshot,
-#theme-preview {
+.screenshot, #theme-preview {
   position: absolute;
   width: 202px;
   left: 70%;
   top: 50px;
 }
-.screenshot img,
-#theme-preview img {
+.screenshot img, #theme-preview img {
   width: 200px;
   height: 150px;
 }
@@ -1663,3 +1660,77 @@ footer {
   margin-top: 25px;
   clear: both;
 }
+/**
+ * ADMIN
+ */
+#pending-update {
+  float: right;
+  color: #ffffff;
+  font-weight: bold;
+  background-color: #FF0000;
+  padding: 0em 0.3em;
+}
+#adminpage dl {
+  clear: left;
+  margin-bottom: 2px;
+  padding-bottom: 2px;
+  border-bottom: 1px solid black;
+}
+#adminpage dt {
+  width: 200px;
+  float: left;
+  font-weight: bold;
+}
+#adminpage dd {
+  margin-left: 200px;
+}
+#adminpage h3 {
+  border-bottom: 1px solid #cccccc;
+}
+#adminpage .field label {
+  font-weight: bold;
+}
+#adminpage .submit {
+  clear: left;
+  text-align: right;
+}
+#adminpage #pluginslist {
+  margin: 0px;
+  padding: 0px;
+}
+#adminpage .plugin {
+  list-style: none;
+  display: block;
+  border: 1px solid #888888;
+  padding: 1em;
+  margin-bottom: 5px;
+  clear: left;
+}
+#adminpage .plugin desc {
+  margin-left: 2.5em;
+}
+#adminpage .toggleplugin {
+  float: left;
+  margin-right: 1em;
+}
+#adminpage table {
+  width: 100%;
+  border-bottom: 1px solid #000000;
+  margin: 5px 0px;
+}
+#adminpage table th {
+  text-align: left;
+}
+#adminpage table td .icon {
+  float: left;
+}
+#adminpage table tr:hover {
+  background-color: #bbc7d7;
+}
+#adminpage table#users img {
+  width: 16px;
+  height: 16px;
+}
+#adminpage .selectall {
+  text-align: right;
+}

view/theme/quattro/icons.less

@@ -21,7 +21,8 @@
 	&.type-text	{ background-image: url("../../../images/icons/@{size}/text.png"); }
 
 	&.language	{ background-image: url("icons/language.png"); }
-	
+
+
 	
 }
 
@@ -59,5 +60,17 @@
 		.icons(48);
 	}
 	
+        &.on {
+            background-image: url("icons/addon_on.png");
+	    min-width:16px;
+            height: 16px;
+            background-position: 0px 0px;
+        }
+        &.off {
+            background-image: url("icons/addon_off.png");
+	    width: 16px;
+            height: 16px;
+            background-position: 0px 0px;
+        }
 	
 }

view/theme/quattro/quattro.less

@@ -1152,3 +1152,76 @@ footer { height: 100px; display: table-row; }
     clear: both;
 }
 
+/**
+ * ADMIN
+ */
+#pending-update {
+	float:right;
+	color: #ffffff;
+	font-weight: bold;
+	background-color: #FF0000;
+	padding: 0em 0.3em;
+	
+}
+#adminpage {
+    dl {
+	clear: left;
+	margin-bottom: 2px;
+	padding-bottom: 2px;
+	border-bottom: 1px solid black;
+    }
+    dt {
+	width: 200px;
+	float: left;
+	font-weight: bold;
+    }
+    dd {
+	margin-left: 200px;
+    }
+    h3 {
+	border-bottom: 1px solid #cccccc;
+    }
+    .field label {
+	font-weight: bold;
+    }
+    .submit {
+	clear:left;
+	text-align: right;
+    }
+    #pluginslist {
+	margin: 0px; padding: 0px;
+    }
+    .plugin {
+	list-style: none;
+	display: block;
+	border: 1px solid #888888;
+	padding: 1em;
+	margin-bottom: 5px;
+	clear: left;
+        desc {
+            margin-left: 2.5em;
+        }
+    }
+    .toggleplugin {
+	float:left;
+	margin-right: 1em;
+    }
+    table {
+        width:100%;
+        border-bottom: 1px solid #000000; 
+        margin: 5px 0px;
+        th { 
+            text-align: left;
+        }
+        td .icon { 
+            float: left;
+        }
+        tr:hover { 
+            background-color: #bbc7d7;
+        }
+    }
+    table#users img { 
+            width: 16px; height: 16px; 
+    }
+    .selectall { text-align: right; }
+}

view/theme/slackr/birthdays_reminder.tpl

@@ -0,0 +1 @@
+

view/theme/slackr/events_reminder.tpl

@@ -0,0 +1,39 @@
+<link rel='stylesheet' type='text/css' href='$baseurl/library/fullcalendar/fullcalendar.css' />
+<script language="javascript" type="text/javascript"
+          src="$baseurl/library/fullcalendar/fullcalendar.min.js"></script>
+<script>
+	// start calendar from yesterday
+	var yesterday= new Date()
+	yesterday.setDate(yesterday.getDate()-1)
+	
+	function showEvent(eventid) {
+		$.get(
+			'$baseurl/events/?id='+eventid,
+			function(data){
+				$.fancybox(data);
+			}
+		);			
+	}
+	$(document).ready(function() {
+		$('#events-reminder').fullCalendar({
+			firstDay: yesterday.getDay(),
+			year: yesterday.getFullYear(),
+			month: yesterday.getMonth(),
+			date: yesterday.getDate(),
+			events: '$baseurl/events/json/',
+			header: {
+				left: '',
+				center: '',
+				right: ''
+			},			
+			timeFormat: 'HH(:mm)',
+			defaultView: 'basicWeek',
+			height: 50,
+			eventClick: function(calEvent, jsEvent, view) {
+				showEvent(calEvent.id);
+			}
+		});
+	});
+</script>
+<div id="events-reminder"></div>
+<br>

view/theme/slackr/style.css

@@ -40,7 +40,115 @@ nav #site-location {
 	right: 36px;
 }
 
+#profile-jot-text_parent, .mceLayout {
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+	box-shadow: 4px 4px 3px 0 #444444;
+}
+
+#profile-jot-text:hover {
+	color: #000000;
+}
+
+.fc {
+	opacity: 0.3;
+	filter:alpha(opacity=30);
+}
+
+.fc:hover {
+	opacity: 1.0;
+	filter:alpha(opacity=100);
+}
+
+.fc-event-skin {
+	background-color: #3465a4 !important;
+}
 .wall-item-photo, .photo, .contact-block-img, .my-comment-photo {
 	border-radius: 3px;
 	-moz-border-radius: 3px;
-}
+	box-shadow: 4px 4px 3px 0 #444444;
+}
+
+#sidebar-page-list img {
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+	box-shadow: 4px 4px 3px 0 #444444;
+}
+
+.contact-entry-photo img, .profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo, .fc, .profile-jot-text, .group-selected, .nets-selected, .fileas-selected, #profile-jot-submit, .categories-selected {
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+	box-shadow: 4px 4px 3px 0 #444444;
+}
+.settings-widget .selected {
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+	box-shadow: 4px 4px 3px 0 #444444;
+}
+
+.photo {
+	border: 1px solid #AAAAAA;
+}
+
+.photo-top-photo, .photo-album-photo {
+	padding: 10px;
+	max-width: 300px;
+	border: 1px solid #888888;
+}
+
+.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);
+}
+

view/theme/slackr/theme.php

@@ -43,8 +43,17 @@ function cmtBbOpen(id) {
 function cmtBbClose(id) {
 	$(".comment-edit-bb-" + id).hide();
 }
+
+function hidecal() {
+	if(editor) return;
+	$('.fc').hide();
+}
+
 $(document).ready(function() {
 
+	$("#profile-jot-text").focus(hidecal);
+	$("#profile-jot-text").click(hidecal);
+
 $('html').click(function() { $("#nav-notifications-menu" ).hide(); });
 
 $('.group-edit-icon').hover(