diff --git a/fishfinger/.hg_archival.txt b/fishfinger/.hg_archival.txt
new file mode 100644
index 0000000..5b5662d
--- /dev/null
+++ b/fishfinger/.hg_archival.txt
@@ -0,0 +1,6 @@
+repo: b2754da3bf6c95357032a7f6fdb4f98de8a6c6e8
+node: ad134149a34041bc14d58e9b2b93dfed69d58d99
+branch: default
+latesttag: version 0.7
+latesttagdistance: 5
+changessincelatesttag: 5
diff --git a/fishfinger/.hgtags b/fishfinger/.hgtags
new file mode 100644
index 0000000..7db46ea
--- /dev/null
+++ b/fishfinger/.hgtags
@@ -0,0 +1,15 @@
+b2754da3bf6c95357032a7f6fdb4f98de8a6c6e8 0.1
+4eb29b99a6ada92c91675931420639f811f2153b 0.2
+4eb29b99a6ada92c91675931420639f811f2153b 0.2
+c0016cbfaf518e0b293e99e9530370c8d1099d90 0.2
+4d0056e14d6d48a6813d042185e2eab05153d4fb 0.3
+5769897470f0cc05b919c44684e9676d3a867d43 0.4
+5769897470f0cc05b919c44684e9676d3a867d43 0.4
+97de422eab520c97445bb0adddafe08ad1c2d161 0.4
+97de422eab520c97445bb0adddafe08ad1c2d161 0.4
+5b0e55c340f5497c91e81744250cfcc5d4b34078 0.4
+5b0e55c340f5497c91e81744250cfcc5d4b34078 0.4
+f784b19f7e9576b0f9cbd345959487da58d7370b 0.4
+9a61e8102c9fe9c1d79ef7c35ef2134c0abbda0b 0.5
+7d04d08762dc7c97b72981765f2e525c7d27b0f5 0.6
+5f3afdcb46349e58d40daf9dd4228529a33eee46 version 0.7
diff --git a/fishfinger/README.md b/fishfinger/README.md
new file mode 100644
index 0000000..78c0655
--- /dev/null
+++ b/fishfinger/README.md
@@ -0,0 +1,45 @@
+Fishfinger Theme
+================
+
+This theme is my currently used theme, which is derived from quattro, so you
+need that theme to get Fishfinger working (but that wont be hard as quattro is
+one of the default themes.). It works for me with the browser I use and is not
+intended for anybody else to use ;-) If you still want to use it, ypu are free
+to do so, but please don't start making suggestions (or at least don't expect
+them to be heard).
+
+One of these things is the main menu at the right panel which is filled with
+the important links for me. A second is the width of the theme which is
+optimized for 1024px screen, which happen to be the resolution that I have
+available on my screens.
+
+Used Fonts
+==========
+
+This theme uses fonts from the internet that are free to use, but their
+creators should be honored.
+
+__As the theme uses webfonts it is not recommended for connections with limited
+bandwidth__.
+
+Fishfingers
+-----------
+
+The Fishfingers font is used in the main heading.
+
+* Font by Brittney Murphy
+* License: free for personal and non-profit use (comercial use see link below for details)
+* Download http://www.fontspace.com/brittney-murphy/fishfingers
+
+Entypo
+------
+
+The Entypo font is used for the main menu in the upper right corner of the
+screen and throughout the page whenever an icon is needed.
+
+* Font by Daniel Bruce
+* License CC-BY-SA
+* Download http://www.fontsquirrel.com/fonts/entypo
+
+
+
diff --git a/fishfinger/default.php b/fishfinger/default.php
new file mode 100644
index 0000000..8b511c3
--- /dev/null
+++ b/fishfinger/default.php
@@ -0,0 +1,42 @@
+
+
+
+ <?php if(x($page,'title')) echo $page['title'] ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/fishfinger/font/entypo/Creative Commons Attribution Share Alike License.txt b/fishfinger/font/entypo/Creative Commons Attribution Share Alike License.txt
new file mode 100644
index 0000000..9f4b50a
--- /dev/null
+++ b/fishfinger/font/entypo/Creative Commons Attribution Share Alike License.txt
@@ -0,0 +1,20 @@
+This font is licensed under a Creative Commons Attribution Share Alike license
+(http://creativecommons.org/licenses/by-sa/3.0/).
+
+Attribution-Share Alike 3.0 Unported
+
+You are free:
+
+to Share — to copy, distribute and transmit the work
+to Remix — to adapt the work
+
+Under the following conditions:
+
+Attribution. You must attribute the work in the manner specified by the author or licensor (but not in any way that suggests that they endorse you or your use of the work).
+
+Share Alike. If you alter, transform, or build upon this work, you may distribute the resulting work only under the same, similar or a compatible license.
+
+For any reuse or distribution, you must make clear to others the license terms of this work. The best way to do this is with a link to this web page.
+
+Any of the above conditions can be waived if you get permission from the copyright holder.
+Nothing in this license impairs or restricts the author's moral rights.
\ No newline at end of file
diff --git a/fishfinger/font/entypo/Entypo-webfont.eot b/fishfinger/font/entypo/Entypo-webfont.eot
new file mode 100644
index 0000000..1176708
Binary files /dev/null and b/fishfinger/font/entypo/Entypo-webfont.eot differ
diff --git a/fishfinger/font/entypo/Entypo-webfont.svg b/fishfinger/font/entypo/Entypo-webfont.svg
new file mode 100644
index 0000000..e79b4fa
--- /dev/null
+++ b/fishfinger/font/entypo/Entypo-webfont.svg
@@ -0,0 +1,165 @@
+
+
+
+
+This is a custom SVG webfont generated by Font Squirrel.
+Copyright : Creative Commons CC BYSA 2012
+Designer : Daniel Bruce
+Foundry : Daniel Bruce
+Foundry URL : wwwdanielbrucese
+
+
+
+
+
\ No newline at end of file
diff --git a/fishfinger/font/entypo/Entypo-webfont.ttf b/fishfinger/font/entypo/Entypo-webfont.ttf
new file mode 100644
index 0000000..a817dc5
Binary files /dev/null and b/fishfinger/font/entypo/Entypo-webfont.ttf differ
diff --git a/fishfinger/font/entypo/Entypo-webfont.woff b/fishfinger/font/entypo/Entypo-webfont.woff
new file mode 100644
index 0000000..f6b8ed9
Binary files /dev/null and b/fishfinger/font/entypo/Entypo-webfont.woff differ
diff --git a/fishfinger/font/entypo/Readme.txt b/fishfinger/font/entypo/Readme.txt
new file mode 100644
index 0000000..73f39b9
--- /dev/null
+++ b/fishfinger/font/entypo/Readme.txt
@@ -0,0 +1,4 @@
+Entypo Font by Daniel Bruce
+
+License: Creative Commons Attribution Share Alike License
+Available at http://www.fontsquirrel.com/fonts/entypo
diff --git a/fishfinger/font/entypo/demo.html b/fishfinger/font/entypo/demo.html
new file mode 100644
index 0000000..0a6d85d
--- /dev/null
+++ b/fishfinger/font/entypo/demo.html
@@ -0,0 +1,33 @@
+
+
+
+
+ Font Face Demo
+
+
Font-face Demo for the Entypo Font
+
+
+
+
Entypo Regular - Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
+
+ {{foreach $thread.items as $item}}
+ {{if $mode == display}}
+ {{else}}
+ {{if $item.comment_firstcollapsed}}
+
+ {{/if}}
+ {{/if}}
+
+ {{if $item.type == tag}}
+ {{include file="wall_item_tag.tpl"}}
+ {{else}}
+ {{include file="{{$item.template}}"}}
+ {{/if}}
+
+ {{/foreach}}
+
+{{/foreach}}
+
+
+
+{{if $dropping}}
+
+ {{$dropping}}
+
+{{/if}}
+
+
+
+{{if $mode == display}}
+
+{{/if}}
+
diff --git a/fishfinger/templates/events_reminder.tpl b/fishfinger/templates/events_reminder.tpl
new file mode 100644
index 0000000..b188bd4
--- /dev/null
+++ b/fishfinger/templates/events_reminder.tpl
@@ -0,0 +1,44 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+
+
+
+
+
+
{{$mail.from_name}}
+
{{$mail.date}}
+
{{$mail.subject}}
+
{{$mail.body}}
+
+
+
+
+
{{$thread_subject}}
+
+
+ {{include file="mail_conv.tpl"}}
+
+{{/foreach}}
+
+{{include file="prv_message.tpl"}}
diff --git a/fishfinger/templates/mail_list.tpl b/fishfinger/templates/mail_list.tpl
new file mode 100644
index 0000000..0090668
--- /dev/null
+++ b/fishfinger/templates/mail_list.tpl
@@ -0,0 +1,13 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+
{{$subject}}
+
{{$from_name}}
+
{{$ago}}
+
{{$count}}
+
+
+
+
+ {{if $nav.home}}
+
+ +
+ {{/if}}
+ {{if $nav.notifications}}
+
+ {{/if}}
+ {{if $nav.network}}
+
+ T
+ {{/if}}
+ , . % E @ {{/if}}
+
+
+
+
+
+{{$langselector}}
+{{$langselector}}
diff --git a/fishfinger/templates/nets.tpl b/fishfinger/templates/nets.tpl
new file mode 100644
index 0000000..dfe1332
--- /dev/null
+++ b/fishfinger/templates/nets.tpl
@@ -0,0 +1,17 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
diff --git a/fishfinger/templates/photo_view.tpl b/fishfinger/templates/photo_view.tpl
new file mode 100644
index 0000000..38b3b52
--- /dev/null
+++ b/fishfinger/templates/photo_view.tpl
@@ -0,0 +1,42 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+
+
+
+
+
+{{if $prevlink}}{{/if}}
+{{if $nextlink}}{{/if}}
+{{$desc}}
+{{if $tags}}
+{{$tags.0}}
+{{$tags.1}}
+{{/if}}
+{{if $tags.2}}{{/if}}
+
+{{if $edit}}{{$edit}}{{/if}}
+
+{{if $likebuttons}}
+
+ {{$likebuttons}}
+ {{$like}}
+ {{$dislike}}
+
+{{/if}}
+
+
+{{$paginate}}
+
diff --git a/fishfinger/templates/profile_vcard.tpl b/fishfinger/templates/profile_vcard.tpl
new file mode 100644
index 0000000..4b1ddb6
--- /dev/null
+++ b/fishfinger/templates/profile_vcard.tpl
@@ -0,0 +1,73 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+
+
+
+
+ {{if $pdesc}}
{{$profile.pdesc}}
{{/if}}
+
+
+
+
+ {{if $location}}
+
{{$location}}
+
+ {{if $profile.address}}{{$profile.address}}
{{/if}}
+
+ {{$profile.locality}} {{if $profile.locality}}, {{/if}}
+ {{$profile.region}}
+ {{$profile.postal_code}}
+
+ {{if $profile.country_name}}{{$profile.country_name}} {{/if}}
+
+
+ {{/if}}
+
+ {{if $gender}}
{{$gender}} {{$profile.gender}} {{/if}}
+
+ {{if $profile.pubkey}}
{{$profile.pubkey}}
{{/if}}
+
+ {{if $marital}}
♥ {{$marital}}{{$profile.marital}} {{/if}}
+
+ {{if $homepage}}
{{$homepage}} {{$profile.homepage}} {{/if}}
+
+ {{include file="diaspora_vcard.tpl"}}
+
+
+
{{$header}}
+
+
diff --git a/fishfinger/templates/saved_searches_aside.tpl b/fishfinger/templates/saved_searches_aside.tpl
new file mode 100644
index 0000000..6ff59af
--- /dev/null
+++ b/fishfinger/templates/saved_searches_aside.tpl
@@ -0,0 +1,20 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
diff --git a/fishfinger/templates/search_item.tpl b/fishfinger/templates/search_item.tpl
new file mode 100644
index 0000000..a5dafa6
--- /dev/null
+++ b/fishfinger/templates/search_item.tpl
@@ -0,0 +1,98 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+
+
{{$item.star.starred}}
+ {{if $item.lock}}
{{$item.lock}} {{/if}}
+
+
+
+
+
+ {{if $item.title}}
{{/if}}
+ {{$item.body}}
+
+
+
+
+
+
+ {{foreach $item.tags as $tag}}
+ {{$tag}}
+ {{/foreach}}
+
+
+
+
+
+
{{$item.like}}
+
{{$item.dislike}}
+ {{if $item.conv}}
+
+
+
+
+
+ {{$pfs.1}}
+
+
+
+
+ {{$tfs.1}}
+
+
+
+
+
+
+
+
+
+
diff --git a/fishfinger/templates/threaded_conversation.tpl b/fishfinger/templates/threaded_conversation.tpl
new file mode 100644
index 0000000..dc3e918
--- /dev/null
+++ b/fishfinger/templates/threaded_conversation.tpl
@@ -0,0 +1,45 @@
+{{*
+ * AUTOMATICALLY GENERATED TEMPLATE
+ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$live_update}}
+
+{{foreach $threads as $thread}}
+
+
+
+
+ {{if $thread.type == tag}}
+ {{include file="wall_item_tag.tpl" item=$thread}}
+ {{else}}
+ {{include file="{{$thread.template}}" item=$thread}}
+ {{/if}}
+
+
+{{/foreach}}
+
+
+
+{{if $dropping}}
+
+ {{$dropping}}
+
+
+ * Description: Plain theme derived from the quattro series. Uses webfonts so * dont use it if you have a limited bandwidth.
+ */
+function fishfinger_init(&$a) {
+$a->theme_info = array(
+ 'extends' => 'quattro',
+);
+$a->page['htmlhead'] .= <<< EOT
+
+EOT;
+}
{{/if}}
+
+