diff --git a/plugins/kolab_zpush/kolab_zpush.php b/plugins/kolab_zpush/kolab_zpush.php
index c7469f1d..7624cd00 100644
--- a/plugins/kolab_zpush/kolab_zpush.php
+++ b/plugins/kolab_zpush/kolab_zpush.php
@@ -6,7 +6,7 @@
  * @version 0.2
  * @author Thomas Bruederli <bruederli@kolabsys.com>
  *
- * Copyright (C) 2011, Kolab Systems AG <contact@kolabsys.com>
+ * Copyright (C) 2012, Kolab Systems AG <contact@kolabsys.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -286,7 +286,7 @@ class kolab_zpush extends rcube_plugin
             }
             // fetch folder data from server
             else {
-                $this->folders = $this->rc->imap->list_unsubscribed();
+                $this->folders = $this->rc->imap->list_folders();
                 foreach ($this->folders as $folder) {
                     $folderdata = $this->rc->imap->get_metadata($folder, array(self::ACTIVESYNC_KEY, self::CTYPE_KEY));
                     $foldertype = explode('.', $folderdata[$folder][self::CTYPE_KEY]);
diff --git a/plugins/kolab_zpush/package.xml b/plugins/kolab_zpush/package.xml
index 6313d1e3..250d1a66 100644
--- a/plugins/kolab_zpush/package.xml
+++ b/plugins/kolab_zpush/package.xml
@@ -4,7 +4,7 @@
     http://pear.php.net/dtd/package-2.0
     http://pear.php.net/dtd/package-2.0.xsd">
 	<name>kolab_zpush</name>
-    <uri>http://kolabsys.com</uri>
+    <uri>http://git.kolab.org/roundcube-plugins-kolab/</uri>
 	<summary>Z-Push configuration utility for Kolab accounts</summary>
 	<description></description>
 	<lead>
@@ -16,7 +16,7 @@
 	<date>2011-11-14</date>
 	<time>12:12:00</time>
 	<version>
-		<release>0.2</release>
+		<release>0.3</release>
 	</version>
 	<stability>
 		<release>stable</release>
@@ -38,6 +38,13 @@
 			<file name="skins/default/foldertypes.png" role="data"></file>
 			<file name="skins/default/pointer-left.gif" role="data"></file>
 			<file name="skins/default/synchronize.png" role="data"></file>
+			<file name="skins/larry/templates/config.html" role="data"></file>
+			<file name="skins/larry/config.css" role="data"></file>
+			<file name="skins/larry/alarm-clock.png" role="data"></file>
+			<file name="skins/larry/deviceactions.png" role="data"></file>
+			<file name="skins/larry/foldertypes.png" role="data"></file>
+			<file name="skins/larry/pointer-left.png" role="data"></file>
+			<file name="skins/larry/synchronize.png" role="data"></file>
 			<file name="README" role="data"></file>
 			<file name="LICENSE" role="data"></file>
 		</dir>
diff --git a/plugins/kolab_zpush/skins/larry/alarm-clock.png b/plugins/kolab_zpush/skins/larry/alarm-clock.png
new file mode 100755
index 00000000..518bdc11
Binary files /dev/null and b/plugins/kolab_zpush/skins/larry/alarm-clock.png differ
diff --git a/plugins/kolab_zpush/skins/larry/config.css b/plugins/kolab_zpush/skins/larry/config.css
new file mode 100644
index 00000000..c7bc1fbb
--- /dev/null
+++ b/plugins/kolab_zpush/skins/larry/config.css
@@ -0,0 +1,140 @@
+/* Stylesheets for the Kolab Z-Push configuration UI */
+
+#configform {
+	padding-top: 15px;
+}
+
+#sectionslist {
+	width: 220px;
+}
+
+#prefs-box {
+	position: absolute;
+	top: 0;
+	left: 232px;
+	right: 0;
+	bottom: 0;
+}
+
+#devices-table {
+	width: 100%;
+	table-layout: fixed;
+}
+
+#devices-table td {
+	cursor: pointer;
+}
+
+#devices-table td span.devicetype {
+	padding-left: 1em;
+	font-style: italic;
+	color: #69939e;
+}
+
+.boxfooter a.button.delete,
+.boxfooter a.buttonPas.delete {
+	background-image: url(deviceactions.png);
+}
+
+div.subscriptionblock {
+	float: left;
+	margin: 0 3em 2em 0;
+	padding: 0;
+}
+
+div.subscriptionblock h3 {
+	font-size: 14px;
+	color: #333;
+	margin: 0 0 0.6em 0;
+	padding: 2px 4px 2px 30px;
+	background: url(foldertypes.png) 4px 2px no-repeat;
+}
+
+div.subscriptionblock h3.contact {
+	background-position: 4px -18px;
+}
+
+div.subscriptionblock h3.event {
+	background-position: 4px -38px;
+}
+
+div.subscriptionblock h3.task {
+	background-position: 4px -58x;
+}
+
+div.subscriptionblock h3.note {
+	background-position: 4px -78px;
+}
+
+#foldersubscriptions thead td {
+	color: #69939e;
+	font-weight: bold;
+	padding: 3px 5px;
+	min-width: 2em;
+	background: #d6eaf3;
+	border-bottom: 2px solid #fff;
+}
+
+#foldersubscriptions tbody td {
+	background: #eee;
+	padding: 2px 5px;
+	border-bottom: 2px solid #fff;
+}
+
+#foldersubscriptions td label {
+	display: block;
+}
+
+#foldersubscriptions td.mailbox {
+	padding-right: 3em;
+	padding-left: 2px;
+	min-width: 12em;
+}
+
+#foldersubscriptions td.virtual {
+	color: #999;
+}
+
+#foldersubscriptions {
+	overflow: auto;
+	max-height: 400px;
+	margin-top: 0.5em;
+}
+
+#introtext {
+	position: absolute;
+	top: 16px;
+	left: 5px;
+	padding-left: 10px;
+	max-width: 40em;
+}
+
+#introtext .pointer-left {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 12px;
+	height: 80%;
+	background: url(pointer-left.png) right center no-repeat;
+}
+
+#introtext .inner {
+	color: #eee;
+	padding: 12px;
+	border: 1px solid #333;
+	border-radius: 4px;
+	text-shadow: 0px 1px 1px #333;
+	background: #5b5b5b;
+	background: -moz-linear-gradient(top, #5b5b5b 0%, #3a3a3a 100%);
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#5b5b5b), color-stop(100%,#3a3a3a));
+	background: -o-linear-gradient(top, #5b5b5b 0%, #3a3a3a 100%);
+	background: -ms-linear-gradient(top, #5b5b5b 0%, #3a3a3a 100%);
+	background: linear-gradient(top, #5b5b5b 0%, #3a3a3a 100%);
+	-webkit-box-shadow: inset 0px 0px 0px 1px #7e7e7e, 0 2px 6px 0 #333;
+	-moz-box-shadow: inset 0px 0px 0px 1px #7e7e7e, 0 2px 6px 0 #333;
+	box-shadow: inset 0px 0px 0px 1px #7e7e7e, 0 2px 6px 0 #333;
+}
+
+#introtext a {
+	color: #b0ccd7;
+}
diff --git a/plugins/kolab_zpush/skins/larry/deviceactions.png b/plugins/kolab_zpush/skins/larry/deviceactions.png
new file mode 100644
index 00000000..d2429531
Binary files /dev/null and b/plugins/kolab_zpush/skins/larry/deviceactions.png differ
diff --git a/plugins/kolab_zpush/skins/larry/foldertypes.png b/plugins/kolab_zpush/skins/larry/foldertypes.png
new file mode 100644
index 00000000..4950296a
Binary files /dev/null and b/plugins/kolab_zpush/skins/larry/foldertypes.png differ
diff --git a/plugins/kolab_zpush/skins/larry/pointer-left.png b/plugins/kolab_zpush/skins/larry/pointer-left.png
new file mode 100644
index 00000000..bfa7e86c
Binary files /dev/null and b/plugins/kolab_zpush/skins/larry/pointer-left.png differ
diff --git a/plugins/kolab_zpush/skins/larry/synchronize.png b/plugins/kolab_zpush/skins/larry/synchronize.png
new file mode 100755
index 00000000..ba5ebd1f
Binary files /dev/null and b/plugins/kolab_zpush/skins/larry/synchronize.png differ
diff --git a/plugins/kolab_zpush/skins/larry/templates/config.html b/plugins/kolab_zpush/skins/larry/templates/config.html
new file mode 100644
index 00000000..9671bc6a
--- /dev/null
+++ b/plugins/kolab_zpush/skins/larry/templates/config.html
@@ -0,0 +1,71 @@
+<roundcube:object name="doctype" value="html5" />
+<html>
+<head>
+<title><roundcube:object name="pagetitle" /></title>
+<roundcube:include file="/includes/links.html" />
+</head>
+<body>
+
+<roundcube:include file="/includes/header.html" />
+
+<div id="mainscreen" class="offset">
+
+<roundcube:include file="/includes/settingstabs.html" />
+
+<div id="settings-right">
+
+<div id="sectionslist" class="uibox listbox">
+<h2 id="directorylist-title" class="boxtitle"><roundcube:label name="kolab_zpush.devices" /></h2>
+<div class="boxlistcontent">
+	<roundcube:object name="plugin.devicelist" id="devices-table" class="listing" cellspacing="0" />
+</div>
+<div class="boxfooter">
+	<roundcube:button type="link" command="plugin.delete-device" title="kolab_zpush.deletedevice" class="listbutton delete disabled" classAct="listbutton delete" innerClass="inner" content="x" />
+</div>
+</div>
+
+<div id="prefs-box" class="uibox contentbox">
+	<h1 class="boxtitle" style="display:none"><roundcube:label name="kolab_zpush.syncsettings"></h1>
+	<form action="#" method="post" id="configform" class="boxcontent tabbed" style="display:none">
+		<fieldset>
+			<legend><roundcube:label name="kolab_zpush.folderstosync" /></legend>
+			<roundcube:object name="plugin.foldersubscriptions" form="configform" id="foldersubscriptions" syncicon="synchronize.png" alarmicon="alarm-clock.png" />
+		</fieldset>
+		<fieldset>
+			<legend><roundcube:label name="kolab_zpush.deviceconfig" /></legend>
+			<roundcube:object name="plugin.deviceconfigform" form="configform" class="propform" />
+		</fieldset>
+
+		<p class="formbuttons">
+			<roundcube:button type="input" class="button mainaction" command="plugin.save-config" label="save" />
+			<roundcube:button type="input" class="button" command="plugin.delete-device" label="kolab_zpush.deletedevice" />
+		</p>
+	</form>
+
+	<div id="introtext">
+		<div class="inner">
+			<roundcube:if condition="env:devicecount" />
+				<roundcube:label name="kolab_zpush.introtext" />
+			<roundcube:else />
+				<roundcube:label name="kolab_zpush.nodevices" html="true" />
+			<roundcube:endif />
+		</div>
+		<div class="pointer-left"></div>
+	</div>
+
+	<roundcube:object name="message" id="message" class="statusbar" />
+</div>
+
+</div>
+
+<roundcube:include file="/includes/footer.html" />
+
+<script type="text/javascript">
+
+	var viewsplit = new rcube_splitter({ id:'devicelistsplitter', p1:'#sectionslist', p2:'#prefs-box', orientation:'v', relative:true, start:226, min:150, size:12 });
+	rcmail.add_onload('viewsplit.init()');
+
+</script>
+
+</body>
+</html>