From: masensio <masensio@solidgear.es>
Date: Tue, 29 Oct 2013 13:13:24 +0000 (+0100)
Subject: Merge branch 'develop' into setup_buttons
X-Git-Tag: oc-android-1.5.5~139^2~14
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c2abbaaedb69dba35866a48b745b68f3519cbca1?hp=c217f7229b1224a7fc5526ddfad928cd73ebf1f3

Merge branch 'develop' into setup_buttons
---

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ac8c1506..f448d533 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -92,9 +92,9 @@
         <activity android:name=".ui.activity.PreferencesNewSessionewSession" >
         </activity>
         
-        <activity	android:name="com.owncloud.android.ui.preview.PreviewImageActivity" />
+        <activity	android:name=".ui.preview.PreviewImageActivity" />
 		        
-        <activity	android:name="com.owncloud.android.ui.preview.PreviewVideoActivity"
+        <activity	android:name=".ui.preview.PreviewVideoActivity"
 					android:label="@string/app_name"
 					android:theme="@style/Theme.ownCloud.Fullscreen" >
 		</activity>        
@@ -153,8 +153,8 @@
         <service android:name=".media.MediaService" />
         
         <activity android:name=".ui.activity.PinCodeActivity" />
-        <activity android:name=".extensions.ExtensionsAvailableActivity"></activity>
-        <activity android:name=".extensions.ExtensionsListActivity"></activity>
+        <activity android:name="com.owncloud.android.extensions.ExtensionsAvailableActivity"></activity>
+        <activity android:name="com.owncloud.android.extensions.ExtensionsListActivity"></activity>
         <activity android:name=".ui.activity.AccountSelectActivity" android:uiOptions="none" android:label="@string/prefs_accounts"></activity>
         <activity android:name=".ui.activity.ConflictsResolveActivity"/>
         <activity android:name=".ui.activity.GenericExplanationActivity"/>
diff --git a/res/drawable-hdpi-v11/btn_default_disabled.9.png b/res/drawable-hdpi-v11/btn_default_disabled.9.png
new file mode 100644
index 00000000..6dc67fb3
Binary files /dev/null and b/res/drawable-hdpi-v11/btn_default_disabled.9.png differ
diff --git a/res/drawable-hdpi-v11/btn_default_disabled_focused.9.png b/res/drawable-hdpi-v11/btn_default_disabled_focused.9.png
new file mode 100644
index 00000000..6fe46f82
Binary files /dev/null and b/res/drawable-hdpi-v11/btn_default_disabled_focused.9.png differ
diff --git a/res/drawable-hdpi-v11/btn_default_enabled.9.png b/res/drawable-hdpi-v11/btn_default_enabled.9.png
new file mode 100644
index 00000000..f3f40848
Binary files /dev/null and b/res/drawable-hdpi-v11/btn_default_enabled.9.png differ
diff --git a/res/drawable-hdpi-v11/btn_default_focused.9.png b/res/drawable-hdpi-v11/btn_default_focused.9.png
new file mode 100644
index 00000000..60f3b43c
Binary files /dev/null and b/res/drawable-hdpi-v11/btn_default_focused.9.png differ
diff --git a/res/drawable-hdpi-v11/btn_default_pressed.9.png b/res/drawable-hdpi-v11/btn_default_pressed.9.png
new file mode 100644
index 00000000..ba0d7ceb
Binary files /dev/null and b/res/drawable-hdpi-v11/btn_default_pressed.9.png differ
diff --git a/res/drawable-hdpi/btn_default_disabled.9.png b/res/drawable-hdpi/btn_default_disabled.9.png
new file mode 100644
index 00000000..f90d47bc
Binary files /dev/null and b/res/drawable-hdpi/btn_default_disabled.9.png differ
diff --git a/res/drawable-hdpi/btn_default_disabled_focused.9.png b/res/drawable-hdpi/btn_default_disabled_focused.9.png
new file mode 100644
index 00000000..56dfd15d
Binary files /dev/null and b/res/drawable-hdpi/btn_default_disabled_focused.9.png differ
diff --git a/res/drawable-hdpi/btn_default_enabled.9.png b/res/drawable-hdpi/btn_default_enabled.9.png
new file mode 100644
index 00000000..0af44831
Binary files /dev/null and b/res/drawable-hdpi/btn_default_enabled.9.png differ
diff --git a/res/drawable-hdpi/btn_default_focused.9.png b/res/drawable-hdpi/btn_default_focused.9.png
new file mode 100644
index 00000000..06b7790f
Binary files /dev/null and b/res/drawable-hdpi/btn_default_focused.9.png differ
diff --git a/res/drawable-hdpi/btn_default_pressed.9.png b/res/drawable-hdpi/btn_default_pressed.9.png
new file mode 100644
index 00000000..4312c27f
Binary files /dev/null and b/res/drawable-hdpi/btn_default_pressed.9.png differ
diff --git a/res/drawable-hdpi/common_error.png b/res/drawable-hdpi/common_error.png
new file mode 100644
index 00000000..213976c7
Binary files /dev/null and b/res/drawable-hdpi/common_error.png differ
diff --git a/res/drawable-hdpi/dropdown_default.9.png b/res/drawable-hdpi/dropdown_default.9.png
new file mode 100644
index 00000000..b4ab9ad8
Binary files /dev/null and b/res/drawable-hdpi/dropdown_default.9.png differ
diff --git a/res/drawable-hdpi/dropdown_disabled.9.png b/res/drawable-hdpi/dropdown_disabled.9.png
new file mode 100644
index 00000000..7a20af73
Binary files /dev/null and b/res/drawable-hdpi/dropdown_disabled.9.png differ
diff --git a/res/drawable-hdpi/dropdown_focused.9.png b/res/drawable-hdpi/dropdown_focused.9.png
new file mode 100644
index 00000000..766543c2
Binary files /dev/null and b/res/drawable-hdpi/dropdown_focused.9.png differ
diff --git a/res/drawable-hdpi/dropdown_pressed.9.png b/res/drawable-hdpi/dropdown_pressed.9.png
new file mode 100644
index 00000000..c849e2f9
Binary files /dev/null and b/res/drawable-hdpi/dropdown_pressed.9.png differ
diff --git a/res/drawable-hdpi/file.png b/res/drawable-hdpi/file.png
index 08f99372..f845918d 100644
Binary files a/res/drawable-hdpi/file.png and b/res/drawable-hdpi/file.png differ
diff --git a/res/drawable-hdpi/ic_menu_archive.png b/res/drawable-hdpi/ic_menu_archive.png
index 0bdcac5e..21ce137a 100644
Binary files a/res/drawable-hdpi/ic_menu_archive.png and b/res/drawable-hdpi/ic_menu_archive.png differ
diff --git a/res/drawable-hdpi/icon.png b/res/drawable-hdpi/icon.png
index 8a2fe193..86bf6fb6 100644
Binary files a/res/drawable-hdpi/icon.png and b/res/drawable-hdpi/icon.png differ
diff --git a/res/drawable-hdpi/logo.png b/res/drawable-hdpi/logo.png
index a920912c..709f7a3d 100644
Binary files a/res/drawable-hdpi/logo.png and b/res/drawable-hdpi/logo.png differ
diff --git a/res/drawable-hdpi/noprev.png b/res/drawable-hdpi/noprev.png
new file mode 100644
index 00000000..ea4e08e7
Binary files /dev/null and b/res/drawable-hdpi/noprev.png differ
diff --git a/res/drawable-hdpi/spinner_48_inner.png b/res/drawable-hdpi/spinner_48_inner.png
new file mode 100644
index 00000000..31fa267f
Binary files /dev/null and b/res/drawable-hdpi/spinner_48_inner.png differ
diff --git a/res/drawable-large-land-v14/filelist_item_with_border_highlighted.xml b/res/drawable-large-land-v14/filelist_item_with_border_highlighted.xml
new file mode 100644
index 00000000..9cf5b51f
--- /dev/null
+++ b/res/drawable-large-land-v14/filelist_item_with_border_highlighted.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item  android:drawable="@color/android:holo_blue_bright" />
+    <item>
+        <bitmap android:src="@drawable/freenet_right_border" android:gravity="right|fill_vertical"/>
+	</item>
+</layer-list>
\ No newline at end of file
diff --git a/res/drawable-large-land/filelist_item_with_border.xml b/res/drawable-large-land/filelist_item_with_border.xml
new file mode 100644
index 00000000..c12f37f8
--- /dev/null
+++ b/res/drawable-large-land/filelist_item_with_border.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item  android:drawable="@color/background_color" />
+    <item>
+        <bitmap android:src="@drawable/freenet_right_border" android:gravity="right|fill_vertical"/>
+	</item>
+</layer-list>
\ No newline at end of file
diff --git a/res/drawable-large-land/filelist_item_with_border_highlighted.xml b/res/drawable-large-land/filelist_item_with_border_highlighted.xml
new file mode 100644
index 00000000..99c556f8
--- /dev/null
+++ b/res/drawable-large-land/filelist_item_with_border_highlighted.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item  android:drawable="@color/owncloud_blue_bright" />
+    <item>
+        <bitmap android:src="@drawable/freenet_right_border" android:gravity="right|fill_vertical"/>
+	</item>
+</layer-list>
\ No newline at end of file
diff --git a/res/drawable-large-land/list_selector.xml b/res/drawable-large-land/list_selector.xml
new file mode 100644
index 00000000..28d1dbe8
--- /dev/null
+++ b/res/drawable-large-land/list_selector.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2,
+  as published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android" android:exitFadeDuration="@android:integer/config_mediumAnimTime">
+
+    <item android:drawable="@drawable/filelist_item_with_border_highlighted" android:state_pressed="true"/>
+    <item android:drawable="@drawable/filelist_item_with_border_highlighted" android:state_focused="true"/>
+    <item android:drawable="@drawable/filelist_item_with_border" />
+
+</selector>
\ No newline at end of file
diff --git a/res/drawable-ldpi/btn_default_disabled.9.png b/res/drawable-ldpi/btn_default_disabled.9.png
new file mode 100644
index 00000000..d549e5a6
Binary files /dev/null and b/res/drawable-ldpi/btn_default_disabled.9.png differ
diff --git a/res/drawable-ldpi/btn_default_disabled_focused.9.png b/res/drawable-ldpi/btn_default_disabled_focused.9.png
new file mode 100644
index 00000000..3fd67eb9
Binary files /dev/null and b/res/drawable-ldpi/btn_default_disabled_focused.9.png differ
diff --git a/res/drawable-ldpi/btn_default_enabled.9.png b/res/drawable-ldpi/btn_default_enabled.9.png
new file mode 100644
index 00000000..04b12c64
Binary files /dev/null and b/res/drawable-ldpi/btn_default_enabled.9.png differ
diff --git a/res/drawable-ldpi/btn_default_focused.9.png b/res/drawable-ldpi/btn_default_focused.9.png
new file mode 100644
index 00000000..a09da007
Binary files /dev/null and b/res/drawable-ldpi/btn_default_focused.9.png differ
diff --git a/res/drawable-ldpi/btn_default_pressed.9.png b/res/drawable-ldpi/btn_default_pressed.9.png
new file mode 100644
index 00000000..f5a21b21
Binary files /dev/null and b/res/drawable-ldpi/btn_default_pressed.9.png differ
diff --git a/res/drawable-ldpi/common_error.png b/res/drawable-ldpi/common_error.png
new file mode 100644
index 00000000..f1a804a6
Binary files /dev/null and b/res/drawable-ldpi/common_error.png differ
diff --git a/res/drawable-ldpi/file.png b/res/drawable-ldpi/file.png
index bbe560bb..2330918f 100644
Binary files a/res/drawable-ldpi/file.png and b/res/drawable-ldpi/file.png differ
diff --git a/res/drawable-ldpi/ic_menu_archive.png b/res/drawable-ldpi/ic_menu_archive.png
index 7818537c..194e8c2d 100644
Binary files a/res/drawable-ldpi/ic_menu_archive.png and b/res/drawable-ldpi/ic_menu_archive.png differ
diff --git a/res/drawable-ldpi/icon.png b/res/drawable-ldpi/icon.png
index f8f54b73..e1f5c025 100644
Binary files a/res/drawable-ldpi/icon.png and b/res/drawable-ldpi/icon.png differ
diff --git a/res/drawable-ldpi/logo.png b/res/drawable-ldpi/logo.png
index 7de7cb84..925ce10a 100644
Binary files a/res/drawable-ldpi/logo.png and b/res/drawable-ldpi/logo.png differ
diff --git a/res/drawable-ldpi/noprev.png b/res/drawable-ldpi/noprev.png
new file mode 100644
index 00000000..2f2070bb
Binary files /dev/null and b/res/drawable-ldpi/noprev.png differ
diff --git a/res/drawable-ldpi/spinner_48_inner.png b/res/drawable-ldpi/spinner_48_inner.png
new file mode 100644
index 00000000..f0f0827b
Binary files /dev/null and b/res/drawable-ldpi/spinner_48_inner.png differ
diff --git a/res/drawable-mdpi-v11/btn_default_disabled.9.png b/res/drawable-mdpi-v11/btn_default_disabled.9.png
new file mode 100644
index 00000000..cabb18e0
Binary files /dev/null and b/res/drawable-mdpi-v11/btn_default_disabled.9.png differ
diff --git a/res/drawable-mdpi-v11/btn_default_disabled_focused.9.png b/res/drawable-mdpi-v11/btn_default_disabled_focused.9.png
new file mode 100644
index 00000000..922fcb4d
Binary files /dev/null and b/res/drawable-mdpi-v11/btn_default_disabled_focused.9.png differ
diff --git a/res/drawable-mdpi-v11/btn_default_enabled.9.png b/res/drawable-mdpi-v11/btn_default_enabled.9.png
new file mode 100644
index 00000000..8734f992
Binary files /dev/null and b/res/drawable-mdpi-v11/btn_default_enabled.9.png differ
diff --git a/res/drawable-mdpi-v11/btn_default_focused.9.png b/res/drawable-mdpi-v11/btn_default_focused.9.png
new file mode 100644
index 00000000..b35a9279
Binary files /dev/null and b/res/drawable-mdpi-v11/btn_default_focused.9.png differ
diff --git a/res/drawable-mdpi-v11/btn_default_pressed.9.png b/res/drawable-mdpi-v11/btn_default_pressed.9.png
new file mode 100644
index 00000000..e0af15de
Binary files /dev/null and b/res/drawable-mdpi-v11/btn_default_pressed.9.png differ
diff --git a/res/drawable-mdpi/btn_default_disabled.9.png b/res/drawable-mdpi/btn_default_disabled.9.png
new file mode 100644
index 00000000..38d0160e
Binary files /dev/null and b/res/drawable-mdpi/btn_default_disabled.9.png differ
diff --git a/res/drawable-mdpi/btn_default_disabled_focused.9.png b/res/drawable-mdpi/btn_default_disabled_focused.9.png
new file mode 100644
index 00000000..552d2a18
Binary files /dev/null and b/res/drawable-mdpi/btn_default_disabled_focused.9.png differ
diff --git a/res/drawable-mdpi/btn_default_enabled.9.png b/res/drawable-mdpi/btn_default_enabled.9.png
new file mode 100644
index 00000000..a1c40458
Binary files /dev/null and b/res/drawable-mdpi/btn_default_enabled.9.png differ
diff --git a/res/drawable-mdpi/btn_default_focused.9.png b/res/drawable-mdpi/btn_default_focused.9.png
new file mode 100644
index 00000000..415b1456
Binary files /dev/null and b/res/drawable-mdpi/btn_default_focused.9.png differ
diff --git a/res/drawable-mdpi/btn_default_pressed.9.png b/res/drawable-mdpi/btn_default_pressed.9.png
new file mode 100644
index 00000000..74fd58b5
Binary files /dev/null and b/res/drawable-mdpi/btn_default_pressed.9.png differ
diff --git a/res/drawable-mdpi/common_error.png b/res/drawable-mdpi/common_error.png
new file mode 100644
index 00000000..ee60165e
Binary files /dev/null and b/res/drawable-mdpi/common_error.png differ
diff --git a/res/drawable-mdpi/dropdown_default.9.png b/res/drawable-mdpi/dropdown_default.9.png
new file mode 100644
index 00000000..4a15c637
Binary files /dev/null and b/res/drawable-mdpi/dropdown_default.9.png differ
diff --git a/res/drawable-mdpi/dropdown_disabled.9.png b/res/drawable-mdpi/dropdown_disabled.9.png
new file mode 100644
index 00000000..f54d0b4f
Binary files /dev/null and b/res/drawable-mdpi/dropdown_disabled.9.png differ
diff --git a/res/drawable-mdpi/dropdown_focused.9.png b/res/drawable-mdpi/dropdown_focused.9.png
new file mode 100644
index 00000000..0de1bb1b
Binary files /dev/null and b/res/drawable-mdpi/dropdown_focused.9.png differ
diff --git a/res/drawable-mdpi/dropdown_pressed.9.png b/res/drawable-mdpi/dropdown_pressed.9.png
new file mode 100644
index 00000000..f2f6428d
Binary files /dev/null and b/res/drawable-mdpi/dropdown_pressed.9.png differ
diff --git a/res/drawable-mdpi/file.png b/res/drawable-mdpi/file.png
index 0a1ca52d..4693f679 100644
Binary files a/res/drawable-mdpi/file.png and b/res/drawable-mdpi/file.png differ
diff --git a/res/drawable-mdpi/ic_menu_archive.png b/res/drawable-mdpi/ic_menu_archive.png
index 2c502851..001e54f3 100644
Binary files a/res/drawable-mdpi/ic_menu_archive.png and b/res/drawable-mdpi/ic_menu_archive.png differ
diff --git a/res/drawable-mdpi/icon.png b/res/drawable-mdpi/icon.png
index 42bbaad0..376b97f5 100644
Binary files a/res/drawable-mdpi/icon.png and b/res/drawable-mdpi/icon.png differ
diff --git a/res/drawable-mdpi/logo.png b/res/drawable-mdpi/logo.png
index a920912c..9caa505f 100644
Binary files a/res/drawable-mdpi/logo.png and b/res/drawable-mdpi/logo.png differ
diff --git a/res/drawable-mdpi/noprev.png b/res/drawable-mdpi/noprev.png
new file mode 100644
index 00000000..d95b10f8
Binary files /dev/null and b/res/drawable-mdpi/noprev.png differ
diff --git a/res/drawable-mdpi/spinner_48_inner.png b/res/drawable-mdpi/spinner_48_inner.png
new file mode 100644
index 00000000..11eacf8a
Binary files /dev/null and b/res/drawable-mdpi/spinner_48_inner.png differ
diff --git a/res/drawable-xhdpi/dropdown_default.9.png b/res/drawable-xhdpi/dropdown_default.9.png
new file mode 100644
index 00000000..37ad0e00
Binary files /dev/null and b/res/drawable-xhdpi/dropdown_default.9.png differ
diff --git a/res/drawable-xhdpi/dropdown_disabled.9.png b/res/drawable-xhdpi/dropdown_disabled.9.png
new file mode 100644
index 00000000..f4effa19
Binary files /dev/null and b/res/drawable-xhdpi/dropdown_disabled.9.png differ
diff --git a/res/drawable-xhdpi/dropdown_focused.9.png b/res/drawable-xhdpi/dropdown_focused.9.png
new file mode 100644
index 00000000..45961712
Binary files /dev/null and b/res/drawable-xhdpi/dropdown_focused.9.png differ
diff --git a/res/drawable-xhdpi/dropdown_pressed.9.png b/res/drawable-xhdpi/dropdown_pressed.9.png
new file mode 100644
index 00000000..12ea0548
Binary files /dev/null and b/res/drawable-xhdpi/dropdown_pressed.9.png differ
diff --git a/res/drawable-xhdpi/spinner_48_inner.png b/res/drawable-xhdpi/spinner_48_inner.png
new file mode 100644
index 00000000..7b196bce
Binary files /dev/null and b/res/drawable-xhdpi/spinner_48_inner.png differ
diff --git a/res/drawable/btn_default.xml b/res/drawable/btn_default.xml
new file mode 100644
index 00000000..ebf44cac
--- /dev/null
+++ b/res/drawable/btn_default.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012-2013  ownCloud Inc.
+  
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2,
+  as published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_window_focused="false" android:state_enabled="true"
+        android:drawable="@drawable/btn_default_enabled" />
+    <item android:state_window_focused="false" android:state_enabled="false"
+        android:drawable="@drawable/btn_default_disabled" />
+    <item android:state_pressed="true" 
+        android:drawable="@drawable/btn_default_pressed" />
+    <item android:state_focused="true" android:state_enabled="true"
+        android:drawable="@drawable/btn_default_focused" />
+    <item android:state_enabled="true"
+        android:drawable="@drawable/btn_default_enabled" />
+    <item android:state_focused="true"
+        android:drawable="@drawable/btn_default_disabled_focused" />
+    <item
+         android:drawable="@drawable/btn_default_disabled" />
+</selector>
\ No newline at end of file
diff --git a/res/drawable/downloading_file_indicator.png b/res/drawable/downloading_file_indicator.png
index 179a3f75..77b60d8b 100644
Binary files a/res/drawable/downloading_file_indicator.png and b/res/drawable/downloading_file_indicator.png differ
diff --git a/res/drawable/dropdown.xml b/res/drawable/dropdown.xml
new file mode 100644
index 00000000..13e06b97
--- /dev/null
+++ b/res/drawable/dropdown.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2,
+  as published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false"
+          android:drawable="@drawable/dropdown_disabled" />
+    <item android:state_pressed="true"
+          android:drawable="@drawable/dropdown_pressed" />
+    <item android:state_pressed="false" android:state_focused="true"
+          android:drawable="@drawable/dropdown_focused" />
+    <item android:drawable="@drawable/dropdown_default" />
+</selector>
diff --git a/res/drawable/freenet_right_border.png b/res/drawable/freenet_right_border.png
new file mode 100644
index 00000000..976f77a6
Binary files /dev/null and b/res/drawable/freenet_right_border.png differ
diff --git a/res/drawable/header.png b/res/drawable/header.png
index d377f651..4064022e 100644
Binary files a/res/drawable/header.png and b/res/drawable/header.png differ
diff --git a/res/drawable/ic_ok.png b/res/drawable/ic_ok.png
index b28b3b54..8d38b02e 100644
Binary files a/res/drawable/ic_ok.png and b/res/drawable/ic_ok.png differ
diff --git a/res/drawable/indeterminate_progress.xml b/res/drawable/indeterminate_progress.xml
new file mode 100644
index 00000000..4f19fdde
--- /dev/null
+++ b/res/drawable/indeterminate_progress.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ownCloud Android client application
+
+  Copyright (C) 2012-2013 ownCloud Inc.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2,
+  as published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!--  item>
+        <rotate
+             android:drawable="@drawable/freenet_spinner_48_outer"
+             android:pivotX="50%"
+             android:pivotY="50%"
+             android:fromDegrees="0"
+             android:toDegrees="1080" />
+    </item-->
+    <item>
+        <rotate
+             android:drawable="@drawable/spinner_48_inner"
+             android:pivotX="50%"
+             android:pivotY="50%"
+             android:fromDegrees="0"
+             android:toDegrees="720" />
+    </item>
+</layer-list>
diff --git a/res/drawable/local_file_indicator.png b/res/drawable/local_file_indicator.png
index 08a7b808..59874ab0 100644
Binary files a/res/drawable/local_file_indicator.png and b/res/drawable/local_file_indicator.png differ
diff --git a/res/drawable/main_header_bg.xml b/res/drawable/main_header_bg.xml
index 8cd82e4b..855ba2c1 100644
--- a/res/drawable/main_header_bg.xml
+++ b/res/drawable/main_header_bg.xml
@@ -19,8 +19,8 @@
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <gradient
-        android:startColor="@color/actionbar_start_color" 
-        android:endColor="@color/actionbar_end_color"
+        android:startColor="#1D2D44" 
+        android:endColor="#1D2D44"
         android:angle="270"
      />
     <corners android:radius="0dp" />
diff --git a/res/drawable/mdcloud_blue_gradient.xml b/res/drawable/mdcloud_blue_gradient.xml
new file mode 100644
index 00000000..0a5d1169
--- /dev/null
+++ b/res/drawable/mdcloud_blue_gradient.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+	android:shape="rectangle" >
+	
+	<gradient 
+	    android:angle="270"
+	    android:startColor="#2b3e5e"
+	    android:endColor="#021f3a" 
+	    />
+	
+</shape>
\ No newline at end of file
diff --git a/res/drawable/mdcloud_green_gradient.xml b/res/drawable/mdcloud_green_gradient.xml
new file mode 100644
index 00000000..9ab1d03e
--- /dev/null
+++ b/res/drawable/mdcloud_green_gradient.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+	android:shape="rectangle" >
+
+    <corners 
+        android:radius="10dp"/>
+    <padding 
+        android:left="3dp"
+        android:right="3dp"
+        android:top="3dp"
+        android:bottom="3dp"
+        />	
+	<gradient 
+	    android:angle="270"
+	    android:startColor="#9ed218"
+	    android:endColor="#5c8b1a" 
+	    />
+	
+</shape>
\ No newline at end of file
diff --git a/res/drawable/uploading_file_indicator.png b/res/drawable/uploading_file_indicator.png
index b0b5634f..554b8d9b 100644
Binary files a/res/drawable/uploading_file_indicator.png and b/res/drawable/uploading_file_indicator.png differ
diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml
index 9b800579..3500c0fd 100644
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -185,7 +185,7 @@
 						           
 	</LinearLayout>
        
-	<Button
+	<com.owncloud.android.ui.CustomButton
 		android:id="@id/buttonOK"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
@@ -198,17 +198,17 @@
 		/>
 
 	<Button
-		android:id="@+id/account_register"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_centerHorizontal="true"
-		android:layout_alignParentBottom="true"
-		android:background="@android:color/transparent"
-		android:textColor="#0000FF"
-		android:onClick="onRegisterClick"
-		android:paddingTop="5dp"
-		android:paddingBottom="5dp"
-		android:text="@string/auth_register" 
-		/>
+	    android:id="@+id/account_register"
+	    android:layout_width="wrap_content"
+	    android:layout_height="wrap_content"
+	    android:layout_alignParentBottom="true"
+	    android:layout_centerHorizontal="true"
+	    android:background="@android:color/transparent"
+	    android:onClick="onRegisterClick"
+	    android:paddingBottom="5dp"
+	    android:paddingTop="5dp"
+	    android:text="@string/auth_register"
+	    android:textColor="#0000FF"
+	    android:visibility="invisible" />
 	
 </RelativeLayout>
diff --git a/res/layout-v14/generic_explanation.xml b/res/layout-v14/generic_explanation.xml
index d3964564..dee1507b 100644
--- a/res/layout-v14/generic_explanation.xml
+++ b/res/layout-v14/generic_explanation.xml
@@ -49,14 +49,14 @@
         android:orientation="horizontal" >
 
         <!-- 'OK' / 'CANCEL' BUTTONS CHANGE THEIR ORDER FROM ANDROID 4.0 ; THANKS, GOOGLE -->
-        <Button
+        <com.owncloud.android.ui.CustomButton
             android:id="@+id/cancel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/common_cancel" />
 
-		<Button
+		<com.owncloud.android.ui.CustomButton
 		    android:id="@+id/ok"
 		    android:layout_width="wrap_content"
 		    android:layout_height="wrap_content"
diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index 543627d5..a0d5470e 100644
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -166,7 +166,7 @@
             android:gravity="center_vertical"
             android:text="@string/auth_unauthorized" />
 
-        <Button
+        <com.owncloud.android.ui.CustomButton
             android:id="@+id/buttonOK"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -182,12 +182,13 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="@android:color/transparent"
-            android:textColor="#0000FF" 
             android:onClick="onRegisterClick"
             android:paddingBottom="5dp"
             android:paddingTop="5dp"
             android:text="@string/auth_register"
-            />
+            android:textColor="#0000FF"
+            android:visibility="gone" />
+
     </LinearLayout>
 
 </ScrollView>
\ No newline at end of file
diff --git a/res/layout/extensions_available_dialog.xml b/res/layout/extensions_available_dialog.xml
index e5c3d105..61b920e3 100644
--- a/res/layout/extensions_available_dialog.xml
+++ b/res/layout/extensions_available_dialog.xml
@@ -34,14 +34,14 @@
         android:layout_margin="5dp"
         android:weightSum="1.0" >
 
-        <Button
+        <com.owncloud.android.ui.CustomButton
             android:id="@+id/buttonNo"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:text="@string/common_no"
             android:layout_weight="0.5"/>
 
-        <Button
+        <com.owncloud.android.ui.CustomButton
             android:id="@+id/buttonYes"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
diff --git a/res/layout/failed_upload_files.xml b/res/layout/failed_upload_files.xml
index b4deeed3..93350458 100644
--- a/res/layout/failed_upload_files.xml
+++ b/res/layout/failed_upload_files.xml
@@ -63,7 +63,7 @@
                 android:text="@string/failed_upload_all_cb"
                 android:textSize="8sp" />
 
-            <Button
+            <com.owncloud.android.ui.CustomButton
                 android:id="@+id/failed_upload_retry_all_btn"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -72,7 +72,7 @@
                 android:text="@string/failed_upload_headline_retryall_btn"
                 android:textSize="8sp" />
 
-            <Button
+            <com.owncloud.android.ui.CustomButton
                 android:id="@+id/failed_upload_delete_all_btn"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/res/layout/failed_upload_message_view.xml b/res/layout/failed_upload_message_view.xml
index cf205445..872f28a7 100644
--- a/res/layout/failed_upload_message_view.xml
+++ b/res/layout/failed_upload_message_view.xml
@@ -10,7 +10,7 @@
        android:layout_height="wrap_content"
        android:minWidth="100dp"/>
    
-   <Button
+   <com.owncloud.android.ui.CustomButton
     android:id="@+id/failed_uploadactivity_close_button"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
diff --git a/res/layout/generic_explanation.xml b/res/layout/generic_explanation.xml
index cd887553..fd2d05b9 100644
--- a/res/layout/generic_explanation.xml
+++ b/res/layout/generic_explanation.xml
@@ -48,14 +48,14 @@
         android:gravity="center"
         android:orientation="horizontal" >
 
-		<Button
+		<com.owncloud.android.ui.CustomButton
 		    android:id="@+id/ok"
 		    android:layout_width="wrap_content"
 		    android:layout_height="wrap_content"
 		    android:layout_weight="1"
 		    android:text="@string/common_ok" />
 		
-        <Button
+        <com.owncloud.android.ui.CustomButton
             android:id="@+id/cancel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/res/layout/log_send_file.xml b/res/layout/log_send_file.xml
index ddeac692..05f5c571 100644
--- a/res/layout/log_send_file.xml
+++ b/res/layout/log_send_file.xml
@@ -24,7 +24,8 @@
          android:layout_height="wrap_content"
          android:gravity="bottom">
         
-     <Button   	android:id="@+id/deleteLogHistoryButton"
+     <com.owncloud.android.ui.CustomButton
+            	android:id="@+id/deleteLogHistoryButton"
          		android:layout_width="match_parent"
      		   	android:layout_height="wrap_content"
      		   	android:text="@string/prefs_log_delete_history_button"/>
diff --git a/res/layout/no_account_available.xml b/res/layout/no_account_available.xml
index 0c9cf138..11c87391 100644
--- a/res/layout/no_account_available.xml
+++ b/res/layout/no_account_available.xml
@@ -39,7 +39,7 @@
             android:text="@string/main_wrn_accsetup"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
-        <Button
+        <com.owncloud.android.ui.CustomButton
             android:id="@+id/setup_account"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/res/layout/pincodelock.xml b/res/layout/pincodelock.xml
index b1b6ce82..bb13c5f7 100644
--- a/res/layout/pincodelock.xml
+++ b/res/layout/pincodelock.xml
@@ -18,7 +18,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:oc="http://schemas.android.com/apk/res/com.owncloud.android"
+    xmlns:oc="http://schemas.android.com/apk/res/de.mobilcom.debitel.cloud.android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:gravity="center_horizontal"
@@ -68,7 +68,7 @@
             style="@style/PassCodeStyle" />
     </LinearLayout>
 
-    <Button android:layout_width="wrap_content"
+    <com.owncloud.android.ui.CustomButton android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/common_cancel"
         android:textColor="@android:color/black"
diff --git a/res/layout/ssl_validator_layout.xml b/res/layout/ssl_validator_layout.xml
index 9da017bb..df3e48a2 100644
--- a/res/layout/ssl_validator_layout.xml
+++ b/res/layout/ssl_validator_layout.xml
@@ -408,21 +408,21 @@
         android:layout_height="wrap_content"
         android:gravity="center" >
 
-        <Button
+        <com.owncloud.android.ui.CustomButton
             android:id="@+id/cancel"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/common_cancel" />
 
-        <Button
+        <com.owncloud.android.ui.CustomButton
             android:id="@+id/details_btn"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/ssl_validator_btn_details_see" />
 
-        <Button
+        <com.owncloud.android.ui.CustomButton
             android:id="@+id/ok"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
diff --git a/res/layout/upload_files_layout.xml b/res/layout/upload_files_layout.xml
index 6c15ff7e..cb0206cd 100644
--- a/res/layout/upload_files_layout.xml
+++ b/res/layout/upload_files_layout.xml
@@ -35,13 +35,13 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:orientation="horizontal" >
-
        <Button
+
        <com.owncloud.android.ui.CustomButton
             android:id="@+id/upload_files_btn_cancel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/common_cancel" />
-
		<Button
+
		<com.owncloud.android.ui.CustomButton
 		    android:id="@+id/upload_files_btn_upload"
 		    android:layout_width="wrap_content"
 		    android:layout_height="wrap_content"
diff --git a/res/layout/uploader_layout.xml b/res/layout/uploader_layout.xml
index 5b314991..2b549a7b 100644
--- a/res/layout/uploader_layout.xml
+++ b/res/layout/uploader_layout.xml
@@ -33,8 +33,8 @@
 	</FrameLayout>
 	<LinearLayout android:id="@+id/linearLayout1"
 		android:layout_width="fill_parent" android:layout_alignParentBottom="true" android:layout_height="wrap_content" android:orientation="vertical">
-		<Button android:layout_gravity="bottom" android:layout_height="wrap_content"
+		<com.owncloud.android.ui.CustomButton android:layout_gravity="bottom" android:layout_height="wrap_content"
 			android:layout_width="fill_parent" android:id="@+id/uploader_choose_folder"
-			android:text="@string/uploader_btn_upload_text"></Button>
+			android:text="@string/uploader_btn_upload_text"/>
 	</LinearLayout>
 </RelativeLayout>
diff --git a/res/values-de-rDE/strings.xml b/res/values-de-rDE/strings.xml
index 87951696..e73f9696 100644
--- a/res/values-de-rDE/strings.xml
+++ b/res/values-de-rDE/strings.xml
@@ -16,7 +16,7 @@
   <string name="about_version">Version %1$s</string>
   <string name="actionbar_sync">Konto aktualisieren</string>
   <string name="actionbar_upload">Datei hochladen</string>
-  <string name="actionbar_upload_from_apps">Inhalt von anderen Apps</string>
+  <!-- string name="actionbar_upload_from_apps">Inhalt von anderen Apps</string -->
   <string name="actionbar_upload_files">Dateien</string>
   <string name="actionbar_open_with">Öffnen mit</string>
   <string name="actionbar_mkdir">Ordner anlegen</string>
@@ -37,14 +37,14 @@
   <string name="prefs_manage_accounts">Konten verwalten</string>
   <string name="prefs_pincode">App-PIN</string>
   <string name="prefs_pincode_summary">Schützen Sie Ihren Client</string>
-  <string name="prefs_instant_upload">Aktiviert den sofortigen Upload</string>
+  <!-- string name="prefs_instant_upload">Aktiviert den sofortigen Upload</string -->
   <string name="prefs_instant_upload_summary">Laden Sie Ihre Fotos von der Kamera sofort hoch</string>
   <string name="prefs_log_title">Protokollierung aktivieren</string>
   <string name="prefs_log_summary">Dies wird zur Protokollierung von Problemen genutzt</string>
   <string name="prefs_log_title_history">Protokollierungsverlauf</string>
   <string name="prefs_log_summary_history">Dies zeigt die gespeicherten Protokollierungen</string>
   <string name="prefs_log_delete_history_button">Verlauf löschen</string>
-  <string name="auth_check_server">Server überprüfen</string>
+  <!-- string name="auth_check_server">Server überprüfen</string -->
   <string name="auth_host_url">Adresse des Servers</string>
   <string name="auth_username">Benutzername</string>
   <string name="auth_password">Passwort</string>
@@ -73,9 +73,9 @@
   <string name="file_list_empty">Es sind keine Dateien im Verzeichnis vorhanden.\nNeue Dateien können mit der Menüfunktion \"Hochladen\" hinzugefügt werden.</string>
   <string name="filedetails_select_file">Klicken Sie auf eine Datei für weitere Informationen.</string>
   <string name="filedetails_size">Größe:</string>
-  <string name="filedetails_type">Art:</string>
+  <!-- string name="filedetails_type">Art:</string -->
   <string name="filedetails_created">Erstellt:</string>
-  <string name="filedetails_modified">Geändert:</string>
+  <!-- string name="filedetails_modified">Geändert:</string -->
   <string name="filedetails_download">Herunterladen</string>
   <string name="filedetails_sync_file">Datei aktualisieren</string>
   <string name="filedetails_redownload">Neu laden</string>
@@ -185,8 +185,8 @@
   <string name="auth_not_configured_message">Es scheint, als wäre Ihre Server-Installation nicht richtig konfiguriert. Bitte kontaktieren Sie Ihren Administrator, um weitere Details zu erhalten.</string>
   <string name="auth_unknown_error_title">Ein unbekannter Fehler ist aufgetreten!</string>
   <string name="auth_unknown_error_message">Ein unbekannter Fehler ist aufgetreten. Bitte kontaktieren Sie Ihren Administrator unter Zu­hil­fe­nah­me der Log-Dateien Ihres Gerätes.</string>
-  <string name="auth_unknown_host_title">Konnte den Host nicht finden.</string>
-  <string name="auth_unknown_host_message">Konnte den eingetragenen Host nicht finden. Bitte prüfen Sie den Hostnamen und die Verfügbarkeit des Servers und versuchen es erneut.</string>
+  <!-- string name="auth_unknown_host_title">Konnte den Host nicht finden.</string -->
+  <!-- string name="auth_unknown_host_message">Konnte den eingetragenen Host nicht finden. Bitte prüfen Sie den Hostnamen und die Verfügbarkeit des Servers und versuchen es erneut.</string -->
   <string name="auth_incorrect_path_title">Server-Installation nicht gefunden</string>
   <string name="auth_incorrect_path_message">Die App konnte den Server unter dem angegebenen Pfad nicht finden. Bitte überprüfen Sie den Pfad und versuchen es erneut.</string>
   <string name="auth_timeout_title">Der Server braucht zu lange für eine Antwort.</string>
@@ -221,7 +221,7 @@
   <string name="confirmation_remove_remote_and_local">Lokal und auf dem Server</string>
   <string name="remove_success_msg">Erfolgreich gelöscht</string>
   <string name="remove_fail_msg">Der Löschvorgang konnte nicht beendet werden</string>
-  <string name="rename_dialog_title">Geben Sie einen neuen Namen ein</string>
+  <!--  string name="rename_dialog_title">Geben Sie einen neuen Namen ein</string -->
   <string name="rename_local_fail_msg">Die lokale Kopie konnte nicht umbenannt werden. Versuchen Sie es mit einem anderen neuen Namen.</string>
   <string name="rename_server_fail_msg">Die Umbenennung konnte nicht abgeschlossen werden.</string>
   <string name="sync_file_fail_msg">Die entfernte Datei konnte nicht überprüft werden</string>
@@ -265,7 +265,7 @@
   <string name="placeholder_filesize">389 KB</string>
   <string name="placeholder_timestamp">18.05.2012 12:23</string>
   <string name="placeholder_media_time">12:23:45</string>
-  <string name="instant_upload_on_wifi">Fotos nur über WiFi hochladen</string>
+  <!-- string name="instant_upload_on_wifi">Fotos nur über WiFi hochladen</string -->
   <string name="instant_upload_path">/SofortUpload</string>
   <string name="conflict_title">Konflikt beim Update</string>
   <string name="conflict_message">Serverdatei %s ist nicht synchronisiert mit der lokalen Datei. Weitermachen bedeutet, dass der Inhalt der Datei auf dem Server ersetzt wird.</string>
diff --git a/res/values-de-rDE/z_custom_strings.xml b/res/values-de-rDE/z_custom_strings.xml
new file mode 100644
index 00000000..04ed9bd2
--- /dev/null
+++ b/res/values-de-rDE/z_custom_strings.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Custom strings for mdCloud. 
+	 File name begins with 'z' character to grant that its contents will be processed AFTER strings.xml by the resource builder; 
+	 this way, the values here will overwrite any value set in strings.xml for the same string resources -->
+<resources>
+  <string name="actionbar_upload_from_apps">Eigene Bilder / Musik</string>
+  <string name="auth_unknown_host_title">mdCloud kann den Host nicht finden.</string>
+  <string name="auth_unknown_host_message">mdCloud kann den eingetragenen Host nicht finden. Bitte prüfen Sie den Hostnamen und die Verfügbarkeit des Servers und versuchen Sie es erneut.</string>
+  
+  <string name="recommend_subject">Sehen Sie sich die mobilcom-debitel Cloud an!</string>
+  <string name="recommend_text">"Hallo,\n\nals Kunde der mobilcom-debitel kann ich mit meiner Cloud-Anwendung alle meine Dateien von überall aus verwalten, ansehen und teilen.\n\nInformieren Sie sich über die tollen Möglichkeiten der mobilcom-debitel Cloud unter\n\nhttp://www.md.de/cloud\n\nViele Grüße,\n%1$s"</string>
+  
+  <string name="rename_dialog_title">Datei umbenennen</string>
+  
+  <string name="prefs_instant_upload">Sofort-Upload</string>
+  <string name="instant_upload_on_wifi">Upload nur über WLAN</string>
+  
+  <string name="auth_login_details">Zugangsdaten</string>
+  
+  <string name="auth_check_server">Server prüfen</string>
+  
+  <string name="filedetails_type">Dateiformat:</string>
+  <string name="filedetails_modified">geändert am:</string>
+  
+</resources>
\ No newline at end of file
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index f32a5e4b..69d2bb80 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -16,7 +16,7 @@
   <string name="about_version">Version %1$s</string>
   <string name="actionbar_sync">Konto aktualisieren</string>
   <string name="actionbar_upload">Datei hochladen</string>
-  <string name="actionbar_upload_from_apps">Inhalt von anderen Apps</string>
+  <!-- string name="actionbar_upload_from_apps">Inhalt von anderen Apps</string -->
   <string name="actionbar_upload_files">Dateien</string>
   <string name="actionbar_open_with">Öffnen mit</string>
   <string name="actionbar_mkdir">Ordner anlegen</string>
@@ -37,14 +37,14 @@
   <string name="prefs_manage_accounts">Konten verwalten</string>
   <string name="prefs_pincode">App-PIN</string>
   <string name="prefs_pincode_summary">Schütze Deinen Client</string>
-  <string name="prefs_instant_upload">Aktiviert den sofortigen Upload</string>
+  <!--  string name="prefs_instant_upload">Aktiviert den sofortigen Upload</string -->
   <string name="prefs_instant_upload_summary">Lade Deine Fotos von der Kamera sofort hoch</string>
   <string name="prefs_log_title">Protokollierung aktivieren</string>
   <string name="prefs_log_summary">Dies wird zur Protokollierung von Problemen genutzt</string>
   <string name="prefs_log_title_history">Protokollierungsverlauf</string>
   <string name="prefs_log_summary_history">Dies zeigt die gespeicherten Protokollierungen</string>
   <string name="prefs_log_delete_history_button">Verlauf löschen</string>
-  <string name="auth_check_server">Überprüfe den Server</string>
+  <!-- string name="auth_check_server">Überprüfe den Server</string -->
   <string name="auth_host_url">Adresse des Servers</string>
   <string name="auth_username">Benutzername</string>
   <string name="auth_password">Passwort</string>
@@ -73,9 +73,9 @@
   <string name="file_list_empty">Es sind keine Dateien im Verzeichnis vorhanden.\nNeue Dateien können mit der \"Hochladen\" Menüfunktion hinzugefügt werden.</string>
   <string name="filedetails_select_file">Klicken Sie auf eine Datei für weitere Informationen.</string>
   <string name="filedetails_size">Größe:</string>
-  <string name="filedetails_type">Art:</string>
+  <!-- string name="filedetails_type">Art:</string -->
   <string name="filedetails_created">Erstellt:</string>
-  <string name="filedetails_modified">Geändert:</string>
+  <!-- string name="filedetails_modified">Geändert:</string -->
   <string name="filedetails_download">Herunterladen</string>
   <string name="filedetails_sync_file">Datei aktualisieren</string>
   <string name="filedetails_redownload">Neu laden</string>
@@ -185,8 +185,8 @@
   <string name="auth_not_configured_message">Es scheint, als wäre Deine Server-Installation nicht richtig konfiguriert. Bitte kontaktiere Deinen Administrator, um weitere Details zu erhalten.</string>
   <string name="auth_unknown_error_title">Ein unbekannter Fehler ist aufgetreten!</string>
   <string name="auth_unknown_error_message">Ein unbekannter Fehler ist aufgetreten. Bitte kontaktiere Deinen Administrator unter Zu­hil­fe­nah­me der Log-Dateien Deines Gerätes.</string>
-  <string name="auth_unknown_host_title">Konnte den Host nicht finden.</string>
-  <string name="auth_unknown_host_message">Konnte den eingetragenen Host nicht finden. Bitte prüfe den Hostnamen und die Verfügbarkeit des Servers und versuche es erneut.</string>
+  <!-- string name="auth_unknown_host_title">Konnte den Host nicht finden.</string -->
+  <!-- string name="auth_unknown_host_message">Konnte den eingetragenen Host nicht finden. Bitte prüfe den Hostnamen und die Verfügbarkeit des Servers und versuche es erneut.</string -->
   <string name="auth_incorrect_path_title">Server-Installation nicht gefunden</string>
   <string name="auth_incorrect_path_message">Die App konnte den Server unter dem angegebenen Pfad nicht finden. Bitte überprüfe den Pfad und versuche es erneut.</string>
   <string name="auth_timeout_title">Der Server braucht zu lange für eine Antwort.</string>
@@ -265,7 +265,7 @@
   <string name="placeholder_filesize">389 KB</string>
   <string name="placeholder_timestamp">18.5.2012 12:23</string>
   <string name="placeholder_media_time">12:23:45</string>
-  <string name="instant_upload_on_wifi">Fotos nur über WiFi hochladen</string>
+  <!-- string name="instant_upload_on_wifi">Fotos nur über WiFi hochladen</string -->
   <string name="instant_upload_path">/SofortUpload</string>
   <string name="conflict_title">Konflikt beim Update</string>
   <string name="conflict_message">Serverdatei %s ist nicht synchronisiert mit der lokalen Datei. Weitermachen bedeutet, dass der Inhalt der Datei auf dem Server ersetzt wird.</string>
diff --git a/res/values-de/z_custom_strings.xml b/res/values-de/z_custom_strings.xml
new file mode 100644
index 00000000..2eaf4cbe
--- /dev/null
+++ b/res/values-de/z_custom_strings.xml
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Custom strings for mdCloud. 
+	 File name begins with 'z' character to grant that its contents will be processed AFTER strings.xml by the resource builder; 
+	 this way, the values here will overwrite any value set in strings.xml for the same string resources -->
+<resources>
+  <string name="actionbar_upload_from_apps">Eigene Bilder / Musik</string>
+  <string name="auth_unknown_host_title">mdcloud kann den Host nicht finden.</string>
+  <string name="auth_unknown_host_message">mdcloud kann den eingetragenen Host nicht finden. Bitte prüfen Sie den Hostnamen und die Verfügbarkeit des Servers und versuchen Sie es erneut.</string>
+  
+  <string name="recommend_subject">Sehen Sie sich die mobilcom-debitel Cloud an!</string>
+  <string name="recommend_text">"Hallo,\n\nals Kunde der mobilcom-debitel kann ich mit meiner Cloud-Anwendung alle meine Dateien von überall aus verwalten, ansehen und teilen.\n\nInformieren Sie sich über die tollen Möglichkeiten der mobilcom-debitel Cloud unter\n\nhttp://www.md.de/cloud\n\nViele Grüße,\n%1$s"</string>
+  
+  <string name="rename_dialog_title">Datei umbenennen</string>
+  
+  <string name="prefs_instant_upload">Sofort-Upload</string>
+  <string name="instant_upload_on_wifi">Upload nur über WLAN</string>
+  
+  <string name="auth_login_details">Zugangsdaten</string>
+  
+  <string name="auth_check_server">Server prüfen</string>
+  
+  <string name="filedetails_type">Dateiformat:</string>
+  <string name="filedetails_modified">geändert am:</string>
+  
+</resources>
\ No newline at end of file
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index ff58d92b..abe24d35 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -16,7 +16,7 @@
   <string name="about_version">versión %1$s</string>
   <string name="actionbar_sync">Actualizar cuenta</string>
   <string name="actionbar_upload">Subir archivo</string>
-  <string name="actionbar_upload_from_apps">Contenido de otras aplicaciones</string>
+  <!-- string name="actionbar_upload_from_apps">Contenido de otras aplicaciones</string -->
   <string name="actionbar_upload_files">Archivos</string>
   <string name="actionbar_open_with">Abrir con</string>
   <string name="actionbar_mkdir">Crear directorio</string>
@@ -185,8 +185,8 @@
   <string name="auth_not_configured_message">Parece que tu servidor no está correctamente configurado. Contacta a tu administrador para más detalles.</string>
   <string name="auth_unknown_error_title">Ocurrió un error desconocido</string>
   <string name="auth_unknown_error_message">Ocurrió un error desconocido. Por favor, contacta a los autores e incluye los registros de tu dispositivo.</string>
-  <string name="auth_unknown_host_title">No se pudo encontrar la dirección</string>
-  <string name="auth_unknown_host_message">No se pudo encontrar el dirección introducida. Consulte la disponibilidad del servidor y la dirección e intenta nuevamete.</string>
+  <!-- string name="auth_unknown_host_title">No se pudo encontrar la dirección</string -->
+  <!-- string name="auth_unknown_host_message">No se pudo encontrar el dirección introducida. Consulte la disponibilidad del servidor y la dirección e intenta nuevamete.</string -->
   <string name="auth_incorrect_path_title">Instancia de servidor no encontrada</string>
   <string name="auth_incorrect_path_message">La aplicación no pudo encontrar la instancia del servidor en la ruta de acceso dada. Por favor, compruebe la ruta de acceso e inténtelo de nuevo.</string>
   <string name="auth_timeout_title">El servidor ha tardado demasiado en responder</string>
diff --git a/res/values-es/z_custom_strings.xml b/res/values-es/z_custom_strings.xml
new file mode 100644
index 00000000..591d4705
--- /dev/null
+++ b/res/values-es/z_custom_strings.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Custom strings for mdCloud. 
+	 File name begins with 'z' character to grant that its contents will be processed AFTER strings.xml by the resource builder; 
+	 this way, the values here will overwrite any value set in strings.xml for the same string resources -->
+<resources>
+  <string name="actionbar_upload_from_apps">Mis imágenes / música</string>
+  <string name="auth_unknown_host_title">mdCloud no puede encontrar el servidor.</string>
+  <string name="auth_unknown_host_message">mdCloud no puede encontrar el servidor. Por favor, compruebe la disponibilidad del mismo y pruebe de nuevo.</string>
+  
+  <string name="recommend_subject">¡Explora la nube mobilcom-debitel!</string>
+  <string name="recommend_text">"Hola,\n\nComo cliente de mobilcom-debitel, con mi aplicación de nube puedo gestionar, ver y compartir mis archivos desde cualquier lugar.\n\nInfórmese sobre las grandes posibilidades de la nube mobilcom-debitel en\n\nhttp://www.md.de/cloud\n\nSaludos cordiales,\n%1$s"</string>
+</resources>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index ce9b2d1f..371120c9 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -22,4 +22,9 @@
     <color name="filelist_icon_backgorund">#DDDDDD</color>
     <color name="owncloud_blue_bright">#00ddff</color>
     
+    <color name="freenet_green_01">#84bc34</color>
+    <color name="freenet_green_02">#a0d92d</color>
+    <color name="mdcloud_green">#83b324</color>
+    <color name="mdcloud_grey">#e3e3e3</color> <!-- login background color -->
+    
 </resources>
\ No newline at end of file
diff --git a/res/values/setup.xml b/res/values/setup.xml
index cc816d15..e2460d95 100644
--- a/res/values/setup.xml
+++ b/res/values/setup.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- App name  and other strings-->
-    <string name="app_name">ownCloud</string>
-    <string name="account_type">owncloud</string>
-    <string name="authority">org.owncloud</string>
-    <string name ="db_file">owncloud.db</string>
-    <string name ="db_name">ownCloud</string>
-    <string name ="data_folder">owncloud</string>
-    <string name ="log_name">Owncloud_</string>
+    <string name="app_name">mdCloud</string>
+    <string name="account_type">de.mobilcom.debitel.cloud</string>
+    <string name="authority">de.mobilcom.debitel</string>
+    <string name ="db_file">mdcloud.db</string>
+    <string name ="db_name">mdcloud</string>
+    <string name ="data_folder">mfcloud</string>
+    <string name ="log_name">mdCloud_</string>
     
     <!-- Server URL -->
-    <string name="server_url"></string>
+    <string name="server_url">beta.owncloud.com/owncloud</string>
     <bool name="show_server_url_input">true</bool>
     
     <!-- Flags to setup the authentication methods available in the app -->
@@ -18,24 +18,29 @@
     <string name="auth_method_saml_web_sso">off</string>
     
     <!-- Colors -->
-    <color name="login_background_color">#FFFFFF</color>
+    <color name="login_background_color">#e3e3e3</color>
     <color name="background_color">#F7F7F7</color>
     <color name="actionbar_start_color">#1D2D44</color>
     <color name="actionbar_end_color">#1D2D44</color>
     
+    <!-- Button -->
+    <bool name="custom_buttons">true</bool> <!-- enable background customization -->
+    <color name="button_text_color">#FFFFFF</color>
+    
     <!-- Multiaccount support -->
-    <bool name="multiaccount_support">true</bool>
+    <bool name="multiaccount_support">false</bool>
     
     <!-- Help, imprint and feedback -->
-    <bool name="help_enabled">false</bool>
-    <bool name="imprint_enabled">false</bool> 
-    <bool name="recommend_enabled">false</bool>
-    <bool name="feedback_enabled">false</bool>
-    <string name="url_help">https://owncloud.com/mobile/help</string>
-    <string name="url_imprint"></string>
+    <bool name="help_enabled">true</bool>
+    <bool name="imprint_enabled">true</bool> 
+    <bool name="recommend_enabled">true</bool>
+    <bool name="feedback_enabled">true</bool>
+    <string name="url_help">http://www2.mobilcom-debitel.de/kontakt/faqs?cat=42</string>
+    <string name="url_imprint">"https://webapi.md.de/about/imprint"</string>
     <string name="mail_recommend">"mailto:"</string>
-    <string name="mail_feedback">"mailto:apps@owncloud.com"</string>
-    <string name="url_app_download">"https://play.google.com/store/apps/details?id=com.owncloud.android"</string>
+    <string name="mail_feedback">"mailto:appservice@cloud.md.de"</string>
+    <!-- string name="url_app_download">"https://play.google.com/store/apps/details?id=com.owncloud.android"</string -->
 
 </resources>
 
+
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 85080147..ba1e1762 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -17,7 +17,7 @@
     <string name="about_version">version %1$s</string>
     <string name="actionbar_sync">Refresh account</string>
     <string name="actionbar_upload">Upload</string>
-    <string name="actionbar_upload_from_apps">Content from other apps</string>
+    <!-- string name="actionbar_upload_from_apps">Content from other apps</string -->
     <string name="actionbar_upload_files">Files</string>
     <string name="actionbar_open_with">Open with</string>
     <string name="actionbar_mkdir">Create directory</string>
@@ -52,8 +52,8 @@
     <string name="prefs_feedback">Feedback</string>
     <string name="prefs_imprint">Imprint</string>
     
-	<string name="recommend_subject">"Try %1$s on your smartphone!"</string>
-	<string name="recommend_text">"I want to invite you to use %1$s on your smartphone!\nDownload here: %2$s"</string>  
+	<!-- string name="recommend_subject">"Try %1$s on your smartphone!"</string -->
+	<!-- string name="recommend_text">"I want to invite you to use %1$s on your smartphone!\nDownload here: %2$s"</string -->  
 
     <string name="auth_check_server">Check Server</string>
     <string name="auth_account_name">Account name</string>
@@ -201,8 +201,8 @@
     <string name="auth_account_not_the_same">The entered user does not match the user of this account</string>
     <string name="auth_unknown_error_title">Unknown error occurred!</string>
     <string name="auth_unknown_error_message">An unknown error occurred. Please contact support and include logs from your device.</string>
-    <string name="auth_unknown_host_title">Couldn\'t find host</string>
-    <string name="auth_unknown_host_message">Couldn\'t find the entered host. Please check hostname and server availability and try again.</string>
+    <!-- string name="auth_unknown_host_title">Couldn\'t find host</string -->
+    <!-- string name="auth_unknown_host_message">Couldn\'t find the entered host. Please check hostname and server availability and try again.</string -->
     <string name="auth_incorrect_path_title">Server instance not found</string>
     <string name="auth_incorrect_path_message">Application couldn\'t find a server instance at the given path. Please check your path and try again.</string>
     <string name="auth_timeout_title">The server took too long to respond</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 3ad0151a..b2ecee3a 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -24,36 +24,58 @@
 	<style name="Theme.ownCloud" parent="style/Theme.Sherlock.Light.DarkActionBar">
     	<item name="android:actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
     	<item name="actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
+    	<item name="android:buttonStyle">@style/Theme.ownCloud.ButtonStyle</item>
+    	<item name="actionDropDownStyle">@style/DropDownStyle</item>
+    	<item name="android:actionDropDownStyle">@style/DropDownStyle</item>
 	</style>
 	
 	<style name="Theme.ownCloud.noActionBar" parent="style/Theme.Sherlock.Light.NoActionBar">
       <item name="android:actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
       <item name="actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
+      <item name="android:buttonStyle">@style/Theme.ownCloud.ButtonStyle</item>
+      <item name="actionDropDownStyle">@style/DropDownStyle</item>
+      <item name="android:actionDropDownStyle">@style/DropDownStyle</item>
     </style>
 	
 	<style name="Theme.ownCloud.Fullscreen" parent="style/Theme.Sherlock.NoActionBar">
       <item name="android:actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
       <item name="actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
       <item name="android:windowFullscreen">true</item>
+      <item name="actionDropDownStyle">@style/DropDownStyle</item>
+      <item name="android:actionDropDownStyle">@style/DropDownStyle</item>
     </style>
 	
 	
 	<style name="Theme.ownCloud.Widget.ActionBar" parent="style/Widget.Sherlock.Light.ActionBar.Solid.Inverse">
-    	<item name="android:background">@drawable/main_header_bg</item>
-    	<item name="background">@drawable/main_header_bg</item>
+    	<item name="android:background">@drawable/mdcloud_blue_gradient</item>
+    	<item name="background">@drawable/mdcloud_blue_gradient</item>
     	<item name="android:textColor">#ffffff</item>
     	<item name="android:shadowColor">#222222</item>
     	<item name="android:shadowRadius">1</item>
     	<item name="android:shadowDy">1</item>
     	<item name="android:backgroundSplit">@drawable/split_action_bg</item>
+    	<item name="android:indeterminateProgressStyle">@style/IndeterminateStyle</item>
+    	<item name="indeterminateProgressStyle">@style/IndeterminateStyle</item>
+	</style>
+
+	<!-- DropDown -->
+	<style name="DropDownStyle" parent="style/Widget.Sherlock.Spinner.DropDown.ActionBar">
+	    <item name="android:background">@drawable/dropdown</item>
+	</style>
+	<style name="IndeterminateStyle" parent="style/Widget.Sherlock.ProgressBar">
+	    <item name="android:indeterminateDrawable">@drawable/indeterminate_progress</item>
 	</style>
 
-		
 	<!-- Dialogs -->
 	<style name="Theme.ownCloud.Dialog" parent="style/Theme.Sherlock.Light.Dialog">
 	</style>
 	
-	
+	<!-- Buttons -->
+    <style name="Theme.ownCloud.ButtonStyle" parent="@android:style/Widget.Button">
+        <item name="android:background">@android:drawable/btn_default</item>
+        <item name="android:textColor">@color/button_text_color</item>
+    </style>
+
 	<!-- PopDownMenu -->
 	<style name="Animations.PopDownMenu" />
 	
diff --git a/res/values/urls.xml b/res/values/urls.xml
index 98d2ddd2..4b97a956 100644
--- a/res/values/urls.xml
+++ b/res/values/urls.xml
@@ -17,5 +17,5 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <resources>
-    <string name="url_account_register">"https://owncloud.com/mobile/new"</string>
+    <string name="url_account_register">none</string>
 </resources>
\ No newline at end of file
diff --git a/res/values/z_custom_strings.xml b/res/values/z_custom_strings.xml
new file mode 100644
index 00000000..df9a52fe
--- /dev/null
+++ b/res/values/z_custom_strings.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Custom strings for mdCloud. 
+	 File name begins with 'z' character to grant that its contents will be processed AFTER strings.xml by the resource builder; 
+	 this way, the values here will overwrite any value set in strings.xml for the same string resources -->
+<resources>
+  <string name="actionbar_upload_from_apps">My pictures / music</string>
+  <string name="auth_unknown_host_title">mdCloud can not find the host.</string>
+  <string name="auth_unknown_host_message">mdCloud can not find the registered host. Please check the host name and the availability of the server and try again.</string>
+  
+  <string name="recommend_subject">Explore the mobilcom-debitel cloud!</string>
+  <string name="recommend_text">"Hello,\n\nAs a customer of mobilcom-debitel I can manage, view and share all my files from anywhere with my cloud application.\n\nFind out about the great possibilities of mobilcom-debitel cloud under\n\nhttp://www.md.de/cloud\n\nBest regards,\n%1$s"</string>  
+</resources>
\ No newline at end of file
diff --git a/src/com/owncloud/android/Uploader.java b/src/com/owncloud/android/Uploader.java
index 7dc64909..ddd3f4ca 100644
--- a/src/com/owncloud/android/Uploader.java
+++ b/src/com/owncloud/android/Uploader.java
@@ -26,6 +26,14 @@ import java.util.List;
 import java.util.Stack;
 import java.util.Vector;
 
+import com.owncloud.android.R;
+import com.owncloud.android.authentication.AccountAuthenticator;
+import com.owncloud.android.datamodel.DataStorageManager;
+import com.owncloud.android.datamodel.FileDataStorageManager;
+import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.files.services.FileUploader;
+import com.owncloud.android.ui.CustomButton;
+
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.app.AlertDialog;
@@ -49,18 +57,11 @@ import android.view.View;
 import android.view.Window;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
-import android.widget.Button;
 import android.widget.EditText;
 import android.widget.SimpleAdapter;
 import android.widget.Toast;
 
-import com.owncloud.android.authentication.AccountAuthenticator;
-import com.owncloud.android.datamodel.DataStorageManager;
-import com.owncloud.android.datamodel.FileDataStorageManager;
-import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.files.services.FileUploader;
 
-import com.owncloud.android.R;
 
 /**
  * This can be used to upload things to an ownCloud instance.
@@ -310,7 +311,7 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
                                                 new String[] {"dirname"},
                                                 new int[] {R.id.textView1});
             setListAdapter(sa);
-            Button btn = (Button) findViewById(R.id.uploader_choose_folder);
+            CustomButton btn = (CustomButton) findViewById(R.id.uploader_choose_folder);
             btn.setOnClickListener(this);
             getListView().setOnItemClickListener(this);
         }
diff --git a/src/com/owncloud/android/authentication/AccountAuthenticator.java b/src/com/owncloud/android/authentication/AccountAuthenticator.java
index ff72d73c..a2a38e89 100644
--- a/src/com/owncloud/android/authentication/AccountAuthenticator.java
+++ b/src/com/owncloud/android/authentication/AccountAuthenticator.java
@@ -18,6 +18,10 @@
 
 package com.owncloud.android.authentication;
 
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.MainApp;
+import com.owncloud.android.R;
+
 import android.accounts.*;
 import android.content.Context;
 import android.content.Intent;
@@ -25,10 +29,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.widget.Toast;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.MainApp;
 
-import com.owncloud.android.R;
 
 
 /**
diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
index 53f18bb4..69872d73 100644
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -49,7 +49,6 @@ import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
-import android.widget.Toast;
 
 import com.actionbarsherlock.app.SherlockDialogFragment;
 import com.owncloud.android.Log_OC;
@@ -64,11 +63,13 @@ import com.owncloud.android.operations.OwnCloudServerCheckOperation;
 import com.owncloud.android.operations.RemoteOperation;
 import com.owncloud.android.operations.RemoteOperationResult;
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
+import com.owncloud.android.ui.CustomButton;
 import com.owncloud.android.ui.dialog.SamlWebViewDialog;
 import com.owncloud.android.ui.dialog.SslValidatorDialog;
 import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener;
 import com.owncloud.android.utils.OwnCloudVersion;
 
+
 import eu.alefzero.webdav.WebdavClient;
 
 /**
@@ -187,7 +188,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
         mOAuthAuthEndpointText = (TextView)findViewById(R.id.oAuthEntryPoint_1);
         mOAuthTokenEndpointText = (TextView)findViewById(R.id.oAuthEntryPoint_2);
         mOAuth2Check = (CheckBox) findViewById(R.id.oauth_onOff_check);
-        mOkButton = findViewById(R.id.buttonOK);
+        mOkButton = (CustomButton) findViewById(R.id.buttonOK);
         mAuthStatusLayout = (TextView) findViewById(R.id.auth_status_text); 
         
         /// set Host Url Input Enabled
@@ -197,9 +198,14 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
         /// complete label for 'register account' button
         Button b = (Button) findViewById(R.id.account_register);
         if (b != null) {
-            b.setText(String.format(getString(R.string.auth_register), getString(R.string.app_name)));
+            b.setText(String.format(getString(R.string.auth_register), getString(R.string.app_name)));            
         }
 
+//        /// complete background of 'OK' button
+//        boolean customButtons = getResources().getBoolean(R.bool.custom_buttons);
+//        if (customButtons)
+//            mOkButton.setBackgroundResource(R.drawable.btn_default);
+        
         /// initialization
         mAccountMgr = AccountManager.get(this);
         mNewCapturedUriFromOAuth2Redirection = null;
diff --git a/src/com/owncloud/android/authentication/SsoWebViewClient.java b/src/com/owncloud/android/authentication/SsoWebViewClient.java
index 4f26a805..5c97931e 100644
--- a/src/com/owncloud/android/authentication/SsoWebViewClient.java
+++ b/src/com/owncloud/android/authentication/SsoWebViewClient.java
@@ -21,6 +21,7 @@ import java.lang.ref.WeakReference;
 
 import com.owncloud.android.Log_OC;
 
+
 import android.graphics.Bitmap;
 import android.os.Handler;
 import android.os.Message;
diff --git a/src/com/owncloud/android/datamodel/FileDataStorageManager.java b/src/com/owncloud/android/datamodel/FileDataStorageManager.java
index a067f107..9933e360 100644
--- a/src/com/owncloud/android/datamodel/FileDataStorageManager.java
+++ b/src/com/owncloud/android/datamodel/FileDataStorageManager.java
@@ -30,6 +30,7 @@ import com.owncloud.android.MainApp;
 import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;
 import com.owncloud.android.utils.FileStorageUtils;
 
+
 import android.accounts.Account;
 import android.content.ContentProviderClient;
 import android.content.ContentProviderOperation;
diff --git a/src/com/owncloud/android/datamodel/OCFile.java b/src/com/owncloud/android/datamodel/OCFile.java
index 6b8e1785..76fb6b2f 100644
--- a/src/com/owncloud/android/datamodel/OCFile.java
+++ b/src/com/owncloud/android/datamodel/OCFile.java
@@ -22,6 +22,7 @@ import java.io.File;
 
 import com.owncloud.android.Log_OC;
 
+
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.webkit.MimeTypeMap;
diff --git a/src/com/owncloud/android/extensions/ExtensionsAvailableDialog.java b/src/com/owncloud/android/extensions/ExtensionsAvailableDialog.java
index 15db896b..efd4e01f 100644
--- a/src/com/owncloud/android/extensions/ExtensionsAvailableDialog.java
+++ b/src/com/owncloud/android/extensions/ExtensionsAvailableDialog.java
@@ -20,6 +20,8 @@ package com.owncloud.android.extensions;
 
 import com.owncloud.android.Log_OC;
 import com.owncloud.android.R;
+import com.owncloud.android.ui.CustomButton;
+
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
@@ -27,7 +29,6 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.View.OnClickListener;
-import android.widget.Button;
 
 public class ExtensionsAvailableDialog extends DialogFragment implements
         OnClickListener {
@@ -40,8 +41,9 @@ public class ExtensionsAvailableDialog extends DialogFragment implements
             Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.extensions_available_dialog,
                 container);
-        Button btnYes = (Button) view.findViewById(R.id.buttonYes);
-        Button btnNo = (Button) view.findViewById(R.id.buttonNo);
+        CustomButton btnYes = (CustomButton) view.findViewById(R.id.buttonYes);
+        CustomButton btnNo = (CustomButton) view.findViewById(R.id.buttonNo);
+        
         btnYes.setOnClickListener(this);
         btnNo.setOnClickListener(this);
         getDialog().setTitle(R.string.extensions_avail_title);
diff --git a/src/com/owncloud/android/extensions/ExtensionsListActivity.java b/src/com/owncloud/android/extensions/ExtensionsListActivity.java
index 2f7290e8..02fb4a9f 100644
--- a/src/com/owncloud/android/extensions/ExtensionsListActivity.java
+++ b/src/com/owncloud/android/extensions/ExtensionsListActivity.java
@@ -31,6 +31,7 @@ import com.owncloud.android.Log_OC;
 import com.owncloud.android.utils.OwnCloudVersion;
 
 
+
 import android.R;
 import android.app.ListActivity;
 import android.os.Bundle;
diff --git a/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java b/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
index 0e6ad9e0..fbb6888b 100644
--- a/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
+++ b/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
@@ -20,9 +20,13 @@ package com.owncloud.android.files;
 
 import java.io.File;
 
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.MainApp;
 import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.db.DbHandler;
 import com.owncloud.android.files.services.FileUploader;
+import com.owncloud.android.utils.FileStorageUtils;
+
 
 import android.accounts.Account;
 import android.content.BroadcastReceiver;
@@ -36,9 +40,6 @@ import android.preference.PreferenceManager;
 import android.provider.MediaStore.Images.Media;
 import android.webkit.MimeTypeMap;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.MainApp;
-import com.owncloud.android.utils.FileStorageUtils;
 
 public class InstantUploadBroadcastReceiver extends BroadcastReceiver {
 
diff --git a/src/com/owncloud/android/files/OwnCloudFileObserver.java b/src/com/owncloud/android/files/OwnCloudFileObserver.java
index 2ea90c9a..8f2e3ee6 100644
--- a/src/com/owncloud/android/files/OwnCloudFileObserver.java
+++ b/src/com/owncloud/android/files/OwnCloudFileObserver.java
@@ -29,6 +29,7 @@ import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.ui.activity.ConflictsResolveActivity;
 
 
+
 import android.accounts.Account;
 import android.content.Context;
 import android.content.Intent;
diff --git a/src/com/owncloud/android/files/managers/OCNotificationManager.java b/src/com/owncloud/android/files/managers/OCNotificationManager.java
index 55e98ee8..11a8c377 100644
--- a/src/com/owncloud/android/files/managers/OCNotificationManager.java
+++ b/src/com/owncloud/android/files/managers/OCNotificationManager.java
@@ -21,12 +21,13 @@ package com.owncloud.android.files.managers;
 import java.util.HashMap;
 import java.util.Map;
 
+import com.owncloud.android.R;
+
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.content.Context;
 import android.widget.RemoteViews;
 
-import com.owncloud.android.R;
 
 public class OCNotificationManager {
 
diff --git a/src/com/owncloud/android/files/services/FileDownloader.java b/src/com/owncloud/android/files/services/FileDownloader.java
index f71ce331..09103a1e 100644
--- a/src/com/owncloud/android/files/services/FileDownloader.java
+++ b/src/com/owncloud/android/files/services/FileDownloader.java
@@ -28,11 +28,12 @@ import java.util.Vector;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.MainApp;
+import com.owncloud.android.R;
 import com.owncloud.android.authentication.AuthenticatorActivity;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
-import eu.alefzero.webdav.OnDatatransferProgressListener;
-
 import com.owncloud.android.network.OwnCloudClientUtils;
 import com.owncloud.android.operations.DownloadFileOperation;
 import com.owncloud.android.operations.RemoteOperationResult;
@@ -42,6 +43,9 @@ import com.owncloud.android.ui.activity.FileDisplayActivity;
 import com.owncloud.android.ui.preview.PreviewImageActivity;
 import com.owncloud.android.ui.preview.PreviewImageFragment;
 
+import eu.alefzero.webdav.OnDatatransferProgressListener;
+
+
 import android.accounts.Account;
 import android.accounts.AccountsException;
 import android.app.Notification;
@@ -58,9 +62,6 @@ import android.os.Message;
 import android.os.Process;
 import android.widget.RemoteViews;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.MainApp;
-import com.owncloud.android.R;
 import eu.alefzero.webdav.WebdavClient;
 
 public class FileDownloader extends Service implements OnDatatransferProgressListener {
diff --git a/src/com/owncloud/android/files/services/FileObserverService.java b/src/com/owncloud/android/files/services/FileObserverService.java
index 8a6fd5a6..7aa3fa9a 100644
--- a/src/com/owncloud/android/files/services/FileObserverService.java
+++ b/src/com/owncloud/android/files/services/FileObserverService.java
@@ -30,6 +30,7 @@ import com.owncloud.android.files.OwnCloudFileObserver;
 import com.owncloud.android.operations.SynchronizeFileOperation;
 import com.owncloud.android.utils.FileStorageUtils;
 
+
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.app.Service;
diff --git a/src/com/owncloud/android/files/services/FileUploader.java b/src/com/owncloud/android/files/services/FileUploader.java
index 997a9a49..51f8238a 100644
--- a/src/com/owncloud/android/files/services/FileUploader.java
+++ b/src/com/owncloud/android/files/services/FileUploader.java
@@ -33,10 +33,15 @@ import org.apache.jackrabbit.webdav.DavConstants;
 import org.apache.jackrabbit.webdav.MultiStatus;
 import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
 
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.MainApp;
+import com.owncloud.android.R;
 import com.owncloud.android.authentication.AccountAuthenticator;
 import com.owncloud.android.authentication.AuthenticatorActivity;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.db.DbHandler;
+import com.owncloud.android.network.OwnCloudClientUtils;
 import com.owncloud.android.operations.ChunkedUploadFileOperation;
 import com.owncloud.android.operations.CreateFolderOperation;
 import com.owncloud.android.operations.ExistenceCheckOperation;
@@ -44,13 +49,19 @@ import com.owncloud.android.operations.RemoteOperation;
 import com.owncloud.android.operations.RemoteOperationResult;
 import com.owncloud.android.operations.UploadFileOperation;
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
+import com.owncloud.android.ui.activity.FailedUploadActivity;
+import com.owncloud.android.ui.activity.FileActivity;
+import com.owncloud.android.ui.activity.FileDisplayActivity;
+import com.owncloud.android.ui.activity.InstantUploadActivity;
+import com.owncloud.android.ui.preview.PreviewImageActivity;
+import com.owncloud.android.ui.preview.PreviewImageFragment;
 import com.owncloud.android.utils.OwnCloudVersion;
 
+
 import eu.alefzero.webdav.OnDatatransferProgressListener;
 import eu.alefzero.webdav.WebdavEntry;
 import eu.alefzero.webdav.WebdavUtils;
 
-import com.owncloud.android.network.OwnCloudClientUtils;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
@@ -70,16 +81,6 @@ import android.os.Process;
 import android.webkit.MimeTypeMap;
 import android.widget.RemoteViews;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.MainApp;
-import com.owncloud.android.R;
-import com.owncloud.android.db.DbHandler;
-import com.owncloud.android.ui.activity.FailedUploadActivity;
-import com.owncloud.android.ui.activity.FileActivity;
-import com.owncloud.android.ui.activity.FileDisplayActivity;
-import com.owncloud.android.ui.activity.InstantUploadActivity;
-import com.owncloud.android.ui.preview.PreviewImageActivity;
-import com.owncloud.android.ui.preview.PreviewImageFragment;
 
 import eu.alefzero.webdav.WebdavClient;
 
diff --git a/src/com/owncloud/android/location/LocationUpdateService.java b/src/com/owncloud/android/location/LocationUpdateService.java
index 7fe2ee9f..e1f529b5 100644
--- a/src/com/owncloud/android/location/LocationUpdateService.java
+++ b/src/com/owncloud/android/location/LocationUpdateService.java
@@ -17,6 +17,9 @@
  */
 package com.owncloud.android.location;
 
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.R;
+
 import android.app.IntentService;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -29,8 +32,6 @@ import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.widget.Toast;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.R;
 
 public class LocationUpdateService extends IntentService implements
         LocationListener {
diff --git a/src/com/owncloud/android/media/MediaControlView.java b/src/com/owncloud/android/media/MediaControlView.java
index 8047f02e..b257bd37 100644
--- a/src/com/owncloud/android/media/MediaControlView.java
+++ b/src/com/owncloud/android/media/MediaControlView.java
@@ -42,6 +42,7 @@ import java.util.Locale;
 
 import com.owncloud.android.R;
 
+
 /**
  * View containing controls for a {@link MediaPlayer}. 
  * 
diff --git a/src/com/owncloud/android/media/MediaService.java b/src/com/owncloud/android/media/MediaService.java
index 992bc7dd..eb57222c 100644
--- a/src/com/owncloud/android/media/MediaService.java
+++ b/src/com/owncloud/android/media/MediaService.java
@@ -43,6 +43,7 @@ import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.ui.activity.FileActivity;
 import com.owncloud.android.ui.activity.FileDisplayActivity;
 
+
 /**
  * Service that handles media playback, both audio and video. 
  * 
diff --git a/src/com/owncloud/android/network/AdvancedSslSocketFactory.java b/src/com/owncloud/android/network/AdvancedSslSocketFactory.java
index da9a0ffc..6a698713 100644
--- a/src/com/owncloud/android/network/AdvancedSslSocketFactory.java
+++ b/src/com/owncloud/android/network/AdvancedSslSocketFactory.java
@@ -41,6 +41,7 @@ import org.apache.http.conn.ssl.X509HostnameVerifier;
 
 import com.owncloud.android.Log_OC;
 
+
 /**
  * AdvancedSSLProtocolSocketFactory allows to create SSL {@link Socket}s with 
  * a custom SSLContext and an optional Hostname Verifier.
diff --git a/src/com/owncloud/android/network/AdvancedX509TrustManager.java b/src/com/owncloud/android/network/AdvancedX509TrustManager.java
index ad4feb37..81dcdbd7 100644
--- a/src/com/owncloud/android/network/AdvancedX509TrustManager.java
+++ b/src/com/owncloud/android/network/AdvancedX509TrustManager.java
@@ -33,6 +33,7 @@ import javax.net.ssl.X509TrustManager;
 
 import com.owncloud.android.Log_OC;
 
+
 /**
  * @author David A. Velasco
  */
diff --git a/src/com/owncloud/android/network/BearerAuthScheme.java b/src/com/owncloud/android/network/BearerAuthScheme.java
index a4267340..16791c23 100644
--- a/src/com/owncloud/android/network/BearerAuthScheme.java
+++ b/src/com/owncloud/android/network/BearerAuthScheme.java
@@ -29,6 +29,7 @@ import org.apache.commons.httpclient.auth.MalformedChallengeException;
 
 import com.owncloud.android.Log_OC;
 
+
 /**
  * Bearer authentication scheme as defined in RFC 6750.
  * 
diff --git a/src/com/owncloud/android/network/OwnCloudClientUtils.java b/src/com/owncloud/android/network/OwnCloudClientUtils.java
index 43104d08..bb299381 100644
--- a/src/com/owncloud/android/network/OwnCloudClientUtils.java
+++ b/src/com/owncloud/android/network/OwnCloudClientUtils.java
@@ -36,11 +36,12 @@ import org.apache.commons.httpclient.protocol.Protocol;
 import org.apache.http.conn.ssl.BrowserCompatHostnameVerifier;
 import org.apache.http.conn.ssl.X509HostnameVerifier;
 
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.MainApp;
 import com.owncloud.android.authentication.AccountAuthenticator;
 import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.authentication.AccountUtils.AccountNotFoundException;
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.MainApp;
+
 
 import eu.alefzero.webdav.WebdavClient;
 
diff --git a/src/com/owncloud/android/operations/ChunkedUploadFileOperation.java b/src/com/owncloud/android/operations/ChunkedUploadFileOperation.java
index 02e1ad04..2649d197 100644
--- a/src/com/owncloud/android/operations/ChunkedUploadFileOperation.java
+++ b/src/com/owncloud/android/operations/ChunkedUploadFileOperation.java
@@ -31,6 +31,7 @@ import com.owncloud.android.Log_OC;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.network.ProgressiveDataTransferer;
 
+
 import android.accounts.Account;
 
 import eu.alefzero.webdav.ChunkFromFileChannelRequestEntity;
diff --git a/src/com/owncloud/android/operations/CreateFolderOperation.java b/src/com/owncloud/android/operations/CreateFolderOperation.java
index 5745ec21..b3456ee2 100644
--- a/src/com/owncloud/android/operations/CreateFolderOperation.java
+++ b/src/com/owncloud/android/operations/CreateFolderOperation.java
@@ -26,6 +26,7 @@ import com.owncloud.android.Log_OC;
 import com.owncloud.android.datamodel.DataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 
+
 import eu.alefzero.webdav.WebdavClient;
 import eu.alefzero.webdav.WebdavUtils;
 
diff --git a/src/com/owncloud/android/operations/DownloadFileOperation.java b/src/com/owncloud/android/operations/DownloadFileOperation.java
index 02098b81..db986f47 100644
--- a/src/com/owncloud/android/operations/DownloadFileOperation.java
+++ b/src/com/owncloud/android/operations/DownloadFileOperation.java
@@ -38,6 +38,7 @@ import com.owncloud.android.operations.RemoteOperation;
 import com.owncloud.android.operations.RemoteOperationResult;
 import com.owncloud.android.utils.FileStorageUtils;
 
+
 import eu.alefzero.webdav.OnDatatransferProgressListener;
 import eu.alefzero.webdav.WebdavClient;
 import eu.alefzero.webdav.WebdavUtils;
diff --git a/src/com/owncloud/android/operations/ExistenceCheckOperation.java b/src/com/owncloud/android/operations/ExistenceCheckOperation.java
index 136fe224..24336bd6 100644
--- a/src/com/owncloud/android/operations/ExistenceCheckOperation.java
+++ b/src/com/owncloud/android/operations/ExistenceCheckOperation.java
@@ -22,6 +22,7 @@ import org.apache.commons.httpclient.methods.HeadMethod;
 
 import com.owncloud.android.Log_OC;
 
+
 import eu.alefzero.webdav.WebdavClient;
 import eu.alefzero.webdav.WebdavUtils;
 import android.content.Context;
diff --git a/src/com/owncloud/android/operations/OAuth2GetAccessToken.java b/src/com/owncloud/android/operations/OAuth2GetAccessToken.java
index 5d468041..09a6e1e5 100644
--- a/src/com/owncloud/android/operations/OAuth2GetAccessToken.java
+++ b/src/com/owncloud/android/operations/OAuth2GetAccessToken.java
@@ -12,6 +12,7 @@ import com.owncloud.android.Log_OC;
 import com.owncloud.android.authentication.OAuth2Constants;
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
 
+
 import eu.alefzero.webdav.WebdavClient;
 
 public class OAuth2GetAccessToken extends RemoteOperation {
diff --git a/src/com/owncloud/android/operations/OwnCloudServerCheckOperation.java b/src/com/owncloud/android/operations/OwnCloudServerCheckOperation.java
index d95b3055..62342249 100644
--- a/src/com/owncloud/android/operations/OwnCloudServerCheckOperation.java
+++ b/src/com/owncloud/android/operations/OwnCloudServerCheckOperation.java
@@ -26,6 +26,7 @@ import com.owncloud.android.Log_OC;
 import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.utils.OwnCloudVersion;
 
+
 import eu.alefzero.webdav.WebdavClient;
 import android.content.Context;
 import android.net.ConnectivityManager;
diff --git a/src/com/owncloud/android/operations/RemoteOperation.java b/src/com/owncloud/android/operations/RemoteOperation.java
index 191bde0a..fbb93e61 100644
--- a/src/com/owncloud/android/operations/RemoteOperation.java
+++ b/src/com/owncloud/android/operations/RemoteOperation.java
@@ -26,6 +26,7 @@ import com.owncloud.android.network.BearerCredentials;
 import com.owncloud.android.network.OwnCloudClientUtils;
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
 
+
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AccountsException;
diff --git a/src/com/owncloud/android/operations/RemoteOperationResult.java b/src/com/owncloud/android/operations/RemoteOperationResult.java
index 4e137c42..8d9b3ee2 100644
--- a/src/com/owncloud/android/operations/RemoteOperationResult.java
+++ b/src/com/owncloud/android/operations/RemoteOperationResult.java
@@ -33,13 +33,14 @@ import org.apache.commons.httpclient.HttpException;
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.jackrabbit.webdav.DavException;
 
-import android.accounts.Account;
-import android.accounts.AccountsException;
-
 import com.owncloud.android.Log_OC;
 import com.owncloud.android.authentication.AccountUtils.AccountNotFoundException;
 import com.owncloud.android.network.CertificateCombinedException;
 
+import android.accounts.Account;
+import android.accounts.AccountsException;
+
+
 /**
  * The result of a remote operation required to an ownCloud server.
  * 
diff --git a/src/com/owncloud/android/operations/RemoveFileOperation.java b/src/com/owncloud/android/operations/RemoveFileOperation.java
index 9dabfafd..f8a6c4ab 100644
--- a/src/com/owncloud/android/operations/RemoveFileOperation.java
+++ b/src/com/owncloud/android/operations/RemoveFileOperation.java
@@ -24,6 +24,7 @@ import com.owncloud.android.Log_OC;
 import com.owncloud.android.datamodel.DataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 
+
 import eu.alefzero.webdav.WebdavClient;
 import eu.alefzero.webdav.WebdavUtils;
 
diff --git a/src/com/owncloud/android/operations/RenameFileOperation.java b/src/com/owncloud/android/operations/RenameFileOperation.java
index fddb8499..86d27122 100644
--- a/src/com/owncloud/android/operations/RenameFileOperation.java
+++ b/src/com/owncloud/android/operations/RenameFileOperation.java
@@ -21,15 +21,16 @@ import java.io.File;
 import java.io.IOException;
 
 import org.apache.jackrabbit.webdav.client.methods.DavMethodBase;
-//import org.apache.jackrabbit.webdav.client.methods.MoveMethod;
-
-import android.accounts.Account;
 
 import com.owncloud.android.Log_OC;
 import com.owncloud.android.datamodel.DataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.utils.FileStorageUtils;
+//import org.apache.jackrabbit.webdav.client.methods.MoveMethod;
+
+import android.accounts.Account;
+
 
 import eu.alefzero.webdav.WebdavClient;
 import eu.alefzero.webdav.WebdavUtils;
diff --git a/src/com/owncloud/android/operations/SynchronizeFileOperation.java b/src/com/owncloud/android/operations/SynchronizeFileOperation.java
index 7a81b84e..211ba705 100644
--- a/src/com/owncloud/android/operations/SynchronizeFileOperation.java
+++ b/src/com/owncloud/android/operations/SynchronizeFileOperation.java
@@ -23,10 +23,6 @@ import org.apache.jackrabbit.webdav.DavConstants;
 import org.apache.jackrabbit.webdav.MultiStatus;
 import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
 
-import android.accounts.Account;
-import android.content.Context;
-import android.content.Intent;
-
 import com.owncloud.android.Log_OC;
 import com.owncloud.android.datamodel.DataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
@@ -34,6 +30,11 @@ import com.owncloud.android.files.services.FileDownloader;
 import com.owncloud.android.files.services.FileUploader;
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
 
+import android.accounts.Account;
+import android.content.Context;
+import android.content.Intent;
+
+
 import eu.alefzero.webdav.WebdavClient;
 import eu.alefzero.webdav.WebdavEntry;
 import eu.alefzero.webdav.WebdavUtils;
diff --git a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
index c7791cc7..25f7ed35 100644
--- a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
+++ b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
@@ -33,15 +33,16 @@ import org.apache.jackrabbit.webdav.DavConstants;
 import org.apache.jackrabbit.webdav.MultiStatus;
 import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
 
-import android.accounts.Account;
-import android.content.Context;
-
 import com.owncloud.android.Log_OC;
 import com.owncloud.android.datamodel.DataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.utils.FileStorageUtils;
 
+import android.accounts.Account;
+import android.content.Context;
+
+
 import eu.alefzero.webdav.WebdavClient;
 import eu.alefzero.webdav.WebdavEntry;
 import eu.alefzero.webdav.WebdavUtils;
diff --git a/src/com/owncloud/android/operations/UpdateOCVersionOperation.java b/src/com/owncloud/android/operations/UpdateOCVersionOperation.java
index 1643377b..2e116ac6 100644
--- a/src/com/owncloud/android/operations/UpdateOCVersionOperation.java
+++ b/src/com/owncloud/android/operations/UpdateOCVersionOperation.java
@@ -22,16 +22,17 @@ import org.apache.commons.httpclient.methods.GetMethod;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.content.Context;
-
+import com.owncloud.android.Log_OC;
 import com.owncloud.android.authentication.AccountAuthenticator;
 import com.owncloud.android.authentication.AccountUtils;
-import com.owncloud.android.Log_OC;
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.utils.OwnCloudVersion;
 
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.content.Context;
+
+
 import eu.alefzero.webdav.WebdavClient;
 
 /**
diff --git a/src/com/owncloud/android/operations/UploadFileOperation.java b/src/com/owncloud/android/operations/UploadFileOperation.java
index cae1f179..936ac01e 100644
--- a/src/com/owncloud/android/operations/UploadFileOperation.java
+++ b/src/com/owncloud/android/operations/UploadFileOperation.java
@@ -33,8 +33,6 @@ import org.apache.commons.httpclient.methods.RequestEntity;
 import org.apache.http.HttpStatus;
 
 import com.owncloud.android.Log_OC;
-import android.accounts.Account;
-
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.services.FileUploader;
 import com.owncloud.android.network.ProgressiveDataTransferer;
@@ -43,6 +41,9 @@ import com.owncloud.android.operations.RemoteOperationResult;
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.utils.FileStorageUtils;
 
+import android.accounts.Account;
+
+
 import eu.alefzero.webdav.FileRequestEntity;
 import eu.alefzero.webdav.OnDatatransferProgressListener;
 import eu.alefzero.webdav.WebdavClient;
diff --git a/src/com/owncloud/android/providers/FileContentProvider.java b/src/com/owncloud/android/providers/FileContentProvider.java
index b933be4d..7f6a1a4f 100644
--- a/src/com/owncloud/android/providers/FileContentProvider.java
+++ b/src/com/owncloud/android/providers/FileContentProvider.java
@@ -26,6 +26,7 @@ import com.owncloud.android.db.ProviderMeta;
 import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;
 
 
+
 import android.content.ContentProvider;
 import android.content.ContentUris;
 import android.content.ContentValues;
diff --git a/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java b/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java
index 72414028..47730995 100644
--- a/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java
+++ b/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java
@@ -32,6 +32,7 @@ import com.owncloud.android.authentication.AccountUtils.AccountNotFoundException
 import com.owncloud.android.datamodel.DataStorageManager;
 import com.owncloud.android.network.OwnCloudClientUtils;
 
+
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AuthenticatorException;
diff --git a/src/com/owncloud/android/syncadapter/ContactSyncAdapter.java b/src/com/owncloud/android/syncadapter/ContactSyncAdapter.java
index f65e28c2..b07c048a 100644
--- a/src/com/owncloud/android/syncadapter/ContactSyncAdapter.java
+++ b/src/com/owncloud/android/syncadapter/ContactSyncAdapter.java
@@ -27,6 +27,7 @@ import org.apache.http.entity.ByteArrayEntity;
 import com.owncloud.android.authentication.AccountAuthenticator;
 import com.owncloud.android.authentication.AccountUtils;
 
+
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AuthenticatorException;
diff --git a/src/com/owncloud/android/syncadapter/FileSyncAdapter.java b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
index 33e8dc3d..a0ca9881 100644
--- a/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
+++ b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
@@ -39,6 +39,7 @@ import com.owncloud.android.operations.UpdateOCVersionOperation;
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.ui.activity.ErrorsWhileCopyingHandlerActivity;
 
+
 import android.accounts.Account;
 import android.accounts.AccountsException;
 import android.app.Notification;
diff --git a/src/com/owncloud/android/ui/CustomButton.java b/src/com/owncloud/android/ui/CustomButton.java
new file mode 100644
index 00000000..ab4db65d
--- /dev/null
+++ b/src/com/owncloud/android/ui/CustomButton.java
@@ -0,0 +1,46 @@
+package com.owncloud.android.ui;
+
+import com.owncloud.android.R;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.Button;
+/**
+ * @author masensio
+ *
+ * Button for customizing the button background
+ */
+
+public class CustomButton extends Button {
+    
+    public CustomButton(Context context) {
+        super(context);
+        
+        boolean customButtons = getResources().getBoolean(R.bool.custom_buttons);
+        if (customButtons)
+        {
+            this.setBackgroundResource(R.drawable.btn_default);
+        }
+    }
+
+    public CustomButton(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        boolean customButtons = getResources().getBoolean(R.bool.custom_buttons);
+        if (customButtons)
+        {
+            this.setBackgroundResource(R.drawable.btn_default);
+        }
+    }
+
+    public CustomButton(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        
+        boolean customButtons = getResources().getBoolean(R.bool.custom_buttons);
+        if (customButtons)
+        {
+            this.setBackgroundResource(R.drawable.btn_default);
+        }
+    }
+
+}
diff --git a/src/com/owncloud/android/ui/QuickAction.java b/src/com/owncloud/android/ui/QuickAction.java
index 8ae71ec4..86fe3fe3 100644
--- a/src/com/owncloud/android/ui/QuickAction.java
+++ b/src/com/owncloud/android/ui/QuickAction.java
@@ -38,6 +38,7 @@ import java.util.ArrayList;
 
 import com.owncloud.android.R;
 
+
 /**
  * Popup window, shows action list as icon and text like the one in Gallery3D
  * app.
diff --git a/src/com/owncloud/android/ui/activity/AccountSelectActivity.java b/src/com/owncloud/android/ui/activity/AccountSelectActivity.java
index 1b73c86e..80e38f79 100644
--- a/src/com/owncloud/android/ui/activity/AccountSelectActivity.java
+++ b/src/com/owncloud/android/ui/activity/AccountSelectActivity.java
@@ -47,13 +47,13 @@ import com.actionbarsherlock.app.SherlockListActivity;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
-import com.owncloud.android.authentication.AccountAuthenticator;
-import com.owncloud.android.authentication.AuthenticatorActivity;
-import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.Log_OC;
 import com.owncloud.android.MainApp;
-
 import com.owncloud.android.R;
+import com.owncloud.android.authentication.AccountAuthenticator;
+import com.owncloud.android.authentication.AccountUtils;
+import com.owncloud.android.authentication.AuthenticatorActivity;
+
 
 public class AccountSelectActivity extends SherlockListActivity implements
         AccountManagerCallback<Boolean> {
diff --git a/src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java b/src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java
index d61626c0..fc9afcde 100644
--- a/src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java
+++ b/src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java
@@ -33,7 +33,6 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
-import android.widget.Button;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -43,10 +42,12 @@ import com.owncloud.android.Log_OC;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.ui.CustomButton;
 import com.owncloud.android.ui.dialog.IndeterminateProgressDialog;
 import com.owncloud.android.utils.FileStorageUtils;
 
 
+
 /**
  * Activity reporting errors occurred when local files uploaded to an ownCloud account with an app in
  * version under 1.3.16 where being copied to the ownCloud local folder.
@@ -116,8 +117,9 @@ public class ErrorsWhileCopyingHandlerActivity  extends SherlockFragmentActivity
         }
         
         /// customize buttons
-        Button cancelBtn = (Button) findViewById(R.id.cancel);
-        Button okBtn = (Button) findViewById(R.id.ok);
+        CustomButton cancelBtn = (CustomButton) findViewById(R.id.cancel);
+        CustomButton okBtn = (CustomButton) findViewById(R.id.ok);
+        
         okBtn.setText(R.string.foreign_files_move);
         cancelBtn.setOnClickListener(this);
         okBtn.setOnClickListener(this);
diff --git a/src/com/owncloud/android/ui/activity/FailedUploadActivity.java b/src/com/owncloud/android/ui/activity/FailedUploadActivity.java
index 4c13fb27..76f2ba41 100644
--- a/src/com/owncloud/android/ui/activity/FailedUploadActivity.java
+++ b/src/com/owncloud/android/ui/activity/FailedUploadActivity.java
@@ -17,14 +17,15 @@
 
 package com.owncloud.android.ui.activity;
 
+import com.owncloud.android.R;
+import com.owncloud.android.ui.CustomButton;
+
 import android.app.Activity;
 import android.os.Bundle;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.widget.Button;
 import android.widget.TextView;
 
-import com.owncloud.android.R;
 
 /**
  * This Activity is used to display a detail message for failed uploads
@@ -44,8 +45,9 @@ public class FailedUploadActivity extends Activity {
         String message = getIntent().getStringExtra(MESSAGE);
         TextView textView = (TextView) findViewById(R.id.faild_upload_message);
         textView.setText(message);
-        Button close_button = (Button) findViewById(R.id.failed_uploadactivity_close_button);
-        close_button.setOnClickListener(new OnClickListener() {
+        CustomButton closeBtn = (CustomButton) findViewById(R.id.failed_uploadactivity_close_button);
+        
+        closeBtn.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
                 finish();
diff --git a/src/com/owncloud/android/ui/activity/FileActivity.java b/src/com/owncloud/android/ui/activity/FileActivity.java
index 1faf8b1f..cddf9b66 100644
--- a/src/com/owncloud/android/ui/activity/FileActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileActivity.java
@@ -35,6 +35,7 @@ import com.owncloud.android.R;
 import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.datamodel.OCFile;
 
+
 import eu.alefzero.webdav.WebdavUtils;
 
 /**
diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 33cdadfb..a7097060 100644
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -64,9 +64,9 @@ import com.owncloud.android.datamodel.DataStorageManager;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.services.FileDownloader;
-import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
 import com.owncloud.android.files.services.FileObserverService;
 import com.owncloud.android.files.services.FileUploader;
+import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
 import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
 import com.owncloud.android.operations.CreateFolderOperation;
 import com.owncloud.android.operations.OnRemoteOperationListener;
@@ -86,10 +86,10 @@ import com.owncloud.android.ui.fragment.FileDetailFragment;
 import com.owncloud.android.ui.fragment.FileFragment;
 import com.owncloud.android.ui.fragment.OCFileListFragment;
 import com.owncloud.android.ui.preview.PreviewImageActivity;
-import com.owncloud.android.ui.preview.PreviewImageFragment;
 import com.owncloud.android.ui.preview.PreviewMediaFragment;
 import com.owncloud.android.ui.preview.PreviewVideoActivity;
 
+
 /**
  * Displays, what files the user has available in his ownCloud.
  * 
diff --git a/src/com/owncloud/android/ui/activity/GenericExplanationActivity.java b/src/com/owncloud/android/ui/activity/GenericExplanationActivity.java
index 4c433a93..b971c40c 100644
--- a/src/com/owncloud/android/ui/activity/GenericExplanationActivity.java
+++ b/src/com/owncloud/android/ui/activity/GenericExplanationActivity.java
@@ -33,6 +33,7 @@ import android.widget.TextView;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.owncloud.android.R;
 
+
 /**
  * Activity showing a text message and, optionally, a couple list of single or paired text strings.
  * 
diff --git a/src/com/owncloud/android/ui/activity/InstantUploadActivity.java b/src/com/owncloud/android/ui/activity/InstantUploadActivity.java
index f0ee7219..ce7ef798 100644
--- a/src/com/owncloud/android/ui/activity/InstantUploadActivity.java
+++ b/src/com/owncloud/android/ui/activity/InstantUploadActivity.java
@@ -19,6 +19,15 @@ package com.owncloud.android.ui.activity;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.R;
+import com.owncloud.android.authentication.AccountUtils;
+import com.owncloud.android.db.DbHandler;
+import com.owncloud.android.files.InstantUploadBroadcastReceiver;
+import com.owncloud.android.files.services.FileUploader;
+import com.owncloud.android.ui.CustomButton;
+import com.owncloud.android.utils.FileStorageUtils;
+
 import android.accounts.Account;
 import android.app.Activity;
 import android.content.Intent;
@@ -41,13 +50,6 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.R;
-import com.owncloud.android.authentication.AccountUtils;
-import com.owncloud.android.db.DbHandler;
-import com.owncloud.android.files.InstantUploadBroadcastReceiver;
-import com.owncloud.android.files.services.FileUploader;
-import com.owncloud.android.utils.FileStorageUtils;
 
 /**
  * This Activity is used to display a list with images they could not be
@@ -76,14 +78,14 @@ public class InstantUploadActivity extends Activity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.failed_upload_files);
 
-        Button delete_all_btn = (Button) findViewById(R.id.failed_upload_delete_all_btn);
-        delete_all_btn.setOnClickListener(getDeleteListner());
-        Button retry_all_btn = (Button) findViewById(R.id.failed_upload_retry_all_btn);
-        retry_all_btn.setOnClickListener(getRetryListner());
+        CustomButton deleteAllBtn = (CustomButton) findViewById(R.id.failed_upload_delete_all_btn);
+        deleteAllBtn.setOnClickListener(getDeleteListner());
+        CustomButton retryAllBtn = (CustomButton) findViewById(R.id.failed_upload_retry_all_btn);
+        retryAllBtn.setOnClickListener(getRetryListner());
         this.failed_upload_all_cb = (CheckBox) findViewById(R.id.failed_upload_headline_cb);
         failed_upload_all_cb.setOnCheckedChangeListener(getCheckAllListener());
         listView = (LinearLayout) findViewById(R.id.failed_upload_scrollviewlayout);
-
+        
         loadListView(true);
 
     }
diff --git a/src/com/owncloud/android/ui/activity/LandingActivity.java b/src/com/owncloud/android/ui/activity/LandingActivity.java
index 45ed279d..a6ada6ce 100644
--- a/src/com/owncloud/android/ui/activity/LandingActivity.java
+++ b/src/com/owncloud/android/ui/activity/LandingActivity.java
@@ -17,6 +17,8 @@
 package com.owncloud.android.ui.activity;
 
 import com.actionbarsherlock.app.SherlockFragmentActivity;
+import com.owncloud.android.MainApp;
+import com.owncloud.android.R;
 import com.owncloud.android.ui.adapter.LandingScreenAdapter;
 
 import android.accounts.Account;
@@ -33,8 +35,6 @@ import android.widget.AdapterView.OnItemClickListener;
 import android.widget.GridView;
 import android.widget.Toast;
 
-import com.owncloud.android.MainApp;
-import com.owncloud.android.R;
 
 /**
  * This activity is used as a landing page when the user first opens this app.
diff --git a/src/com/owncloud/android/ui/activity/LogHistoryActivity.java b/src/com/owncloud/android/ui/activity/LogHistoryActivity.java
index 0c99fcfa..0aa84753 100644
--- a/src/com/owncloud/android/ui/activity/LogHistoryActivity.java
+++ b/src/com/owncloud/android/ui/activity/LogHistoryActivity.java
@@ -26,18 +26,19 @@ import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.widget.Button;
 import android.widget.ListView;
 
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockPreferenceActivity;
 import com.actionbarsherlock.view.MenuItem;
 import com.owncloud.android.R;
+import com.owncloud.android.ui.CustomButton;
 import com.owncloud.android.ui.adapter.LogListAdapter;
 import com.owncloud.android.utils.FileStorageUtils;
 
 
 
+
 public class LogHistoryActivity extends SherlockPreferenceActivity implements OnPreferenceChangeListener {
     String logpath = FileStorageUtils.getLogPath();
     File logDIR = null;
@@ -51,7 +52,8 @@ public class LogHistoryActivity extends SherlockPreferenceActivity implements On
         ActionBar actionBar = getSherlock().getActionBar();
         actionBar.setDisplayHomeAsUpEnabled(true);
         ListView listView = (ListView) findViewById(android.R.id.list);
-        Button deleteHistoryButton = (Button) findViewById(R.id.deleteLogHistoryButton);
+        CustomButton deleteHistoryButton = (CustomButton) findViewById(R.id.deleteLogHistoryButton);
+        
         deleteHistoryButton.setOnClickListener(new OnClickListener() {
             
             @Override
diff --git a/src/com/owncloud/android/ui/activity/PinCodeActivity.java b/src/com/owncloud/android/ui/activity/PinCodeActivity.java
index 215ea45f..068461a8 100644
--- a/src/com/owncloud/android/ui/activity/PinCodeActivity.java
+++ b/src/com/owncloud/android/ui/activity/PinCodeActivity.java
@@ -19,8 +19,9 @@ package com.owncloud.android.ui.activity;
 import java.util.Arrays;
 
 import com.actionbarsherlock.app.SherlockFragmentActivity;
-
 import com.owncloud.android.R;
+import com.owncloud.android.ui.CustomButton;
+
 
 import android.app.AlertDialog;
 import android.content.DialogInterface;
@@ -35,7 +36,6 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.View.OnFocusChangeListener;
 import android.view.View.OnKeyListener;
-import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
 
@@ -45,7 +45,7 @@ public class PinCodeActivity extends SherlockFragmentActivity {
     public final static String EXTRA_ACTIVITY = "com.owncloud.android.ui.activity.PinCodeActivity.ACTIVITY";
     public final static String EXTRA_NEW_STATE = "com.owncloud.android.ui.activity.PinCodeActivity.NEW_STATE";
     
-    Button bCancel;
+    CustomButton bCancel;
     TextView mPinHdr;
     TextView mPinHdrExplanation;
     EditText mText1;
@@ -71,7 +71,7 @@ public class PinCodeActivity extends SherlockFragmentActivity {
         Intent intent = getIntent();
         activity = intent.getStringExtra(EXTRA_ACTIVITY);
      
-        bCancel = (Button) findViewById(R.id.cancel);
+        bCancel = (CustomButton) findViewById(R.id.cancel);
         mPinHdr = (TextView) findViewById(R.id.pinHdr);
         mPinHdrExplanation = (TextView) findViewById(R.id.pinHdrExpl);
         mText1 = (EditText) findViewById(R.id.txt1);
@@ -81,8 +81,6 @@ public class PinCodeActivity extends SherlockFragmentActivity {
         mText3 = (EditText) findViewById(R.id.txt3);
         mText4 = (EditText) findViewById(R.id.txt4);
         
-        
-        
         SharedPreferences appPrefs = PreferenceManager
                 .getDefaultSharedPreferences(getApplicationContext());
         
diff --git a/src/com/owncloud/android/ui/activity/Preferences.java b/src/com/owncloud/android/ui/activity/Preferences.java
index cd87f31a..20c14bc6 100644
--- a/src/com/owncloud/android/ui/activity/Preferences.java
+++ b/src/com/owncloud/android/ui/activity/Preferences.java
@@ -19,6 +19,7 @@ package com.owncloud.android.ui.activity;
 
 import java.util.Vector;
 
+import android.accounts.Account;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
@@ -32,7 +33,6 @@ import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceManager;
-import android.preference.PreferenceScreen;
 
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockPreferenceActivity;
@@ -41,8 +41,10 @@ import com.actionbarsherlock.view.MenuItem;
 import com.owncloud.android.Log_OC;
 import com.owncloud.android.OwnCloudSession;
 import com.owncloud.android.R;
+import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.db.DbHandler;
 
+
 /**
  * An Activity that allows the user to change the application's settings.
  * 
@@ -140,14 +142,14 @@ public class Preferences extends SherlockPreferenceActivity implements OnPrefere
 
                         Intent intent = new Intent(Intent.ACTION_SENDTO); 
                         intent.setType("text/plain");
-                        //Account currentAccount = AccountUtils.getCurrentOwnCloudAccount(Preferences.this);
+                        Account currentAccount = AccountUtils.getCurrentOwnCloudAccount(Preferences.this);
                         String appName = getString(R.string.app_name);
-                        //String username = currentAccount.name.substring(0, currentAccount.name.lastIndexOf('@')); 
-                        //String recommendSubject = String.format(getString(R.string.recommend_subject), username, appName);
-                        String recommendSubject = String.format(getString(R.string.recommend_subject), appName);
+                        String username = currentAccount.name.substring(0, currentAccount.name.lastIndexOf('@')); 
+                        String recommendSubject = String.format(getString(R.string.recommend_subject), username, appName);
+                        //String recommendSubject = String.format(getString(R.string.recommend_subject), appName);
                         intent.putExtra(Intent.EXTRA_SUBJECT, recommendSubject);
-                        //String recommendText = String.format(getString(R.string.recommend_text), getString(R.string.app_name), username);
-                        String recommendText = String.format(getString(R.string.recommend_text), getString(R.string.app_name), getString(R.string.url_app_download));
+                        String recommendText = String.format(getString(R.string.recommend_text), getString(R.string.app_name), username);
+                        //String recommendText = String.format(getString(R.string.recommend_text), getString(R.string.app_name), getString(R.string.url_app_download));
                         intent.putExtra(Intent.EXTRA_TEXT, recommendText);
 
                         intent.setData(Uri.parse(getString(R.string.mail_recommend))); 
diff --git a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
index a6031cdb..ab7bb463 100644
--- a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
+++ b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
@@ -29,20 +29,20 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
-import android.widget.Button;
 import android.widget.TextView;
 
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.ActionBar.OnNavigationListener;
 import com.actionbarsherlock.view.MenuItem;
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.R;
+import com.owncloud.android.ui.CustomButton;
 import com.owncloud.android.ui.dialog.IndeterminateProgressDialog;
 import com.owncloud.android.ui.fragment.ConfirmationDialogFragment;
 import com.owncloud.android.ui.fragment.LocalFileListFragment;
 import com.owncloud.android.ui.fragment.ConfirmationDialogFragment.ConfirmationDialogFragmentListener;
 import com.owncloud.android.utils.FileStorageUtils;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.R;
 
 /**
  * Displays local files and let the user choose what of them wants to upload
@@ -58,8 +58,8 @@ public class UploadFilesActivity extends FileActivity implements
     private ArrayAdapter<String> mDirectories;
     private File mCurrentDir = null;
     private LocalFileListFragment mFileListFragment;
-    private Button mCancelBtn;
-    private Button mUploadBtn;
+    private CustomButton mCancelBtn;
+    private CustomButton mUploadBtn;
     private Account mAccountOnCreation;
     private DialogFragment mCurrentDialog;
     
@@ -103,10 +103,11 @@ public class UploadFilesActivity extends FileActivity implements
         
         
         // Set input controllers
-        mCancelBtn = (Button) findViewById(R.id.upload_files_btn_cancel);
+        mCancelBtn = (CustomButton) findViewById(R.id.upload_files_btn_cancel);
         mCancelBtn.setOnClickListener(this);
-        mUploadBtn = (Button) findViewById(R.id.upload_files_btn_upload);
+        mUploadBtn = (CustomButton) findViewById(R.id.upload_files_btn_upload);
         mUploadBtn.setOnClickListener(this);
+        
             
         // Action bar setup
         ActionBar actionBar = getSupportActionBar();
diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 3e8eecd5..a2651fac 100644
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@ -28,6 +28,9 @@ import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
 
+
+import java.util.Vector;
+
 import com.owncloud.android.DisplayUtils;
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.AccountUtils;
@@ -37,8 +40,6 @@ import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
 import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
 import com.owncloud.android.ui.activity.TransferServiceGetter;
 
-import java.util.Vector;
-
 
 /**
  * This Adapter populates a ListView with all files and folders in an ownCloud
@@ -54,9 +55,6 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
     private DataStorageManager mStorageManager;
     private Account mAccount;
     private TransferServiceGetter mTransferServiceGetter;
-    //total size of a directory (recursive)
-    private Long totalSizeOfDirectoriesRecursive = null;
-    private Long lastModifiedOfAllSubdirectories = null;
     
     public FileListListAdapter(Context context, TransferServiceGetter transferServiceGetter) {
         mContext = context;
diff --git a/src/com/owncloud/android/ui/adapter/LandingScreenAdapter.java b/src/com/owncloud/android/ui/adapter/LandingScreenAdapter.java
index f77ce520..cea48941 100644
--- a/src/com/owncloud/android/ui/adapter/LandingScreenAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/LandingScreenAdapter.java
@@ -17,6 +17,8 @@
  */
 package com.owncloud.android.ui.adapter;
 
+
+import com.owncloud.android.R;
 import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.ui.activity.FileDisplayActivity;
 import com.owncloud.android.ui.activity.Preferences;
@@ -29,7 +31,6 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
-import com.owncloud.android.R;
 
 /**
  * Populates the landing screen icons.
diff --git a/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java b/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
index c93a2d9c..ff883c56 100644
--- a/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
@@ -24,6 +24,7 @@ import java.util.Comparator;
 import com.owncloud.android.DisplayUtils;
 import com.owncloud.android.R;
 
+
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/src/com/owncloud/android/ui/adapter/LogListAdapter.java b/src/com/owncloud/android/ui/adapter/LogListAdapter.java
index 6b6e8f6f..ae4335ef 100644
--- a/src/com/owncloud/android/ui/adapter/LogListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/LogListAdapter.java
@@ -2,6 +2,8 @@ package com.owncloud.android.ui.adapter;
 
 import java.io.File;
 
+import com.owncloud.android.R;
+
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
@@ -13,7 +15,6 @@ import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.TextView;
 
-import com.owncloud.android.R;
 
 
 public class LogListAdapter extends ArrayAdapter<String> {
diff --git a/src/com/owncloud/android/ui/dialog/ChangelogDialog.java b/src/com/owncloud/android/ui/dialog/ChangelogDialog.java
index 1822ce0a..676bea57 100644
--- a/src/com/owncloud/android/ui/dialog/ChangelogDialog.java
+++ b/src/com/owncloud/android/ui/dialog/ChangelogDialog.java
@@ -26,6 +26,7 @@ import android.webkit.WebView;
 import com.actionbarsherlock.app.SherlockDialogFragment;
 import com.owncloud.android.R;
 
+
 /**
  * Dialog to show the contents of res/raw/CHANGELOG.txt
  */
diff --git a/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java b/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java
index 6da58bc1..1998fcb8 100644
--- a/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java
+++ b/src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java
@@ -29,6 +29,7 @@ import com.actionbarsherlock.app.SherlockDialogFragment;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.owncloud.android.R;
 
+
 /**
  * Dialog which will be displayed to user upon keep-in-sync file conflict.
  * 
diff --git a/src/com/owncloud/android/ui/dialog/EditNameDialog.java b/src/com/owncloud/android/ui/dialog/EditNameDialog.java
index d45140e2..4d6243af 100644
--- a/src/com/owncloud/android/ui/dialog/EditNameDialog.java
+++ b/src/com/owncloud/android/ui/dialog/EditNameDialog.java
@@ -32,6 +32,7 @@ import com.actionbarsherlock.app.SherlockDialogFragment;
 import com.owncloud.android.R;
 
 
+
 /**
  * Dialog to request the user to input a name, optionally initialized with a former name.
  * 
diff --git a/src/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java b/src/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java
index 1dd586dc..dbd3d991 100644
--- a/src/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java
+++ b/src/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java
@@ -27,6 +27,7 @@ import android.view.KeyEvent;
 import com.actionbarsherlock.app.SherlockDialogFragment;
 import com.owncloud.android.R;
 
+
 public class IndeterminateProgressDialog extends SherlockDialogFragment {
 
     private static final String ARG_MESSAGE_ID = IndeterminateProgressDialog.class.getCanonicalName() + ".ARG_MESSAGE_ID";
diff --git a/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java b/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java
index a5219a22..516fce10 100644
--- a/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java
+++ b/src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java
@@ -40,6 +40,7 @@ import com.owncloud.android.R;
 import com.owncloud.android.authentication.SsoWebViewClient;
 import com.owncloud.android.authentication.SsoWebViewClient.SsoWebViewClientListener;
 
+
 import eu.alefzero.webdav.WebdavClient;
 
 /**
diff --git a/src/com/owncloud/android/ui/dialog/SslValidatorDialog.java b/src/com/owncloud/android/ui/dialog/SslValidatorDialog.java
index 6ae4156d..82ecd6bc 100644
--- a/src/com/owncloud/android/ui/dialog/SslValidatorDialog.java
+++ b/src/com/owncloud/android/ui/dialog/SslValidatorDialog.java
@@ -29,19 +29,20 @@ import java.util.Map;
 
 import javax.security.auth.x500.X500Principal;
 
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.R;
+import com.owncloud.android.network.CertificateCombinedException;
+import com.owncloud.android.network.OwnCloudClientUtils;
+import com.owncloud.android.operations.RemoteOperationResult;
+import com.owncloud.android.ui.CustomButton;
+
 import android.app.Dialog;
 import android.content.Context;
 import android.os.Bundle;
 import android.view.View;
 import android.view.Window;
-import android.widget.Button;
 import android.widget.TextView;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.R;
-import com.owncloud.android.network.CertificateCombinedException;
-import com.owncloud.android.network.OwnCloudClientUtils;
-import com.owncloud.android.operations.RemoteOperationResult;
 
 /**
  * Dialog to request the user about a certificate that could not be validated with the certificates store in the system.
@@ -142,11 +143,11 @@ public class SslValidatorDialog extends Dialog {
                        View detailsScroll = findViewById(R.id.details_scroll);
                        if (detailsScroll.getVisibility() == View.VISIBLE) {
                            detailsScroll.setVisibility(View.GONE);
-                           ((Button)v).setText(R.string.ssl_validator_btn_details_see);
+                           ((CustomButton)v).setText(R.string.ssl_validator_btn_details_see);
                            
                        } else {
                            detailsScroll.setVisibility(View.VISIBLE);
-                           ((Button)v).setText(R.string.ssl_validator_btn_details_hide);
+                           ((CustomButton)v).setText(R.string.ssl_validator_btn_details_hide);
                        }
                     }
                 });
diff --git a/src/com/owncloud/android/ui/fragment/ConfirmationDialogFragment.java b/src/com/owncloud/android/ui/fragment/ConfirmationDialogFragment.java
index d528b341..869cb266 100644
--- a/src/com/owncloud/android/ui/fragment/ConfirmationDialogFragment.java
+++ b/src/com/owncloud/android/ui/fragment/ConfirmationDialogFragment.java
@@ -26,6 +26,7 @@ import android.os.Bundle;
 import com.actionbarsherlock.app.SherlockDialogFragment;
 import com.owncloud.android.Log_OC;
 
+
 public class ConfirmationDialogFragment extends SherlockDialogFragment {
 
     public final static String ARG_CONF_RESOURCE_ID = "resource_id";
diff --git a/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java b/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
index 3e519a8b..a57fb095 100644
--- a/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
@@ -23,6 +23,7 @@ import com.owncloud.android.Log_OC;
 import com.owncloud.android.R;
 import com.owncloud.android.ui.ExtendedListView;
 
+
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
index ffe464ac..317b98c5 100644
--- a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
+++ b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
@@ -48,17 +48,17 @@ import com.owncloud.android.Log_OC;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
 import com.owncloud.android.files.services.FileObserverService;
 import com.owncloud.android.files.services.FileUploader;
+import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
 import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
 import com.owncloud.android.operations.OnRemoteOperationListener;
 import com.owncloud.android.operations.RemoteOperation;
 import com.owncloud.android.operations.RemoteOperationResult;
-import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.operations.RemoveFileOperation;
 import com.owncloud.android.operations.RenameFileOperation;
 import com.owncloud.android.operations.SynchronizeFileOperation;
+import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.ui.activity.ConflictsResolveActivity;
 import com.owncloud.android.ui.activity.FileActivity;
 import com.owncloud.android.ui.activity.FileDisplayActivity;
@@ -66,6 +66,7 @@ import com.owncloud.android.ui.dialog.EditNameDialog;
 import com.owncloud.android.ui.dialog.EditNameDialog.EditNameDialogListener;
 import com.owncloud.android.ui.preview.PreviewImageFragment;
 
+
 import eu.alefzero.webdav.OnDatatransferProgressListener;
 
 /**
diff --git a/src/com/owncloud/android/ui/fragment/FileFragment.java b/src/com/owncloud/android/ui/fragment/FileFragment.java
index 4c6f3e71..b6c65749 100644
--- a/src/com/owncloud/android/ui/fragment/FileFragment.java
+++ b/src/com/owncloud/android/ui/fragment/FileFragment.java
@@ -24,6 +24,7 @@ import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.FileHandler;
 import com.owncloud.android.ui.activity.TransferServiceGetter;
 
+
 /**
  * Common methods for {@link Fragment}s containing {@link OCFile}s
  * 
diff --git a/src/com/owncloud/android/ui/fragment/LandingPageFragment.java b/src/com/owncloud/android/ui/fragment/LandingPageFragment.java
index 9d87a45a..63a95fdd 100644
--- a/src/com/owncloud/android/ui/fragment/LandingPageFragment.java
+++ b/src/com/owncloud/android/ui/fragment/LandingPageFragment.java
@@ -18,6 +18,7 @@
 package com.owncloud.android.ui.fragment;
 
 import com.actionbarsherlock.app.SherlockFragment;
+import com.owncloud.android.R;
 import com.owncloud.android.ui.activity.LandingActivity;
 import com.owncloud.android.ui.adapter.LandingScreenAdapter;
 
@@ -26,7 +27,6 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ListView;
-import com.owncloud.android.R;
 
 /**
  * Used on the Landing page to display what Components of the ownCloud there
diff --git a/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java b/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
index 24421fa5..40c03a46 100644
--- a/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
@@ -19,8 +19,11 @@ package com.owncloud.android.ui.fragment;
 
 import java.io.File;
 
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.R;
 import com.owncloud.android.ui.adapter.LocalFileListAdapter;
 
+
 import android.app.Activity;
 import android.os.Bundle;
 import android.os.Environment;
@@ -32,8 +35,6 @@ import android.widget.AdapterView;
 import android.widget.ImageView;
 import android.widget.ListView;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.R;
 
 /**
  * A Fragment that lists all files and folders in a given LOCAL path.
diff --git a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index be596eb1..2c3f939f 100644
--- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -43,6 +43,7 @@ import com.owncloud.android.ui.fragment.ConfirmationDialogFragment.ConfirmationD
 import com.owncloud.android.ui.preview.PreviewImageFragment;
 import com.owncloud.android.ui.preview.PreviewMediaFragment;
 
+
 import android.accounts.Account;
 import android.app.Activity;
 import android.os.Bundle;
diff --git a/src/com/owncloud/android/ui/preview/FileDownloadFragment.java b/src/com/owncloud/android/ui/preview/FileDownloadFragment.java
index d3d5fe91..306df1f7 100644
--- a/src/com/owncloud/android/ui/preview/FileDownloadFragment.java
+++ b/src/com/owncloud/android/ui/preview/FileDownloadFragment.java
@@ -19,6 +19,12 @@ package com.owncloud.android.ui.preview;
 
 import java.lang.ref.WeakReference;
 
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.R;
+import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
+import com.owncloud.android.ui.fragment.FileFragment;
+
 import android.accounts.Account;
 import android.app.Activity;
 import android.os.Bundle;
@@ -31,12 +37,7 @@ import android.widget.ImageButton;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
-import com.owncloud.android.ui.fragment.FileFragment;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.R;
 
 import eu.alefzero.webdav.OnDatatransferProgressListener;
 
diff --git a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
index 5ab92e40..87ddd562 100644
--- a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
@@ -35,21 +35,21 @@ import android.view.View.OnTouchListener;
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.view.MenuItem;
 import com.actionbarsherlock.view.Window;
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.R;
 import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.datamodel.DataStorageManager;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.services.FileDownloader;
-import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
 import com.owncloud.android.files.services.FileUploader;
+import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
 import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
 import com.owncloud.android.ui.activity.FileActivity;
 import com.owncloud.android.ui.activity.FileDisplayActivity;
 import com.owncloud.android.ui.dialog.LoadingDialog;
 import com.owncloud.android.ui.fragment.FileFragment;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.R;
 
 /**
  *  Holds a swiping galley where image files contained in an ownCloud directory are shown
diff --git a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
index 578c56e8..9ef4db4b 100644
--- a/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImageFragment.java
@@ -50,6 +50,8 @@ import android.widget.Toast;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.R;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.operations.OnRemoteOperationListener;
@@ -59,8 +61,6 @@ import com.owncloud.android.operations.RemoveFileOperation;
 import com.owncloud.android.ui.fragment.ConfirmationDialogFragment;
 import com.owncloud.android.ui.fragment.FileFragment;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.R;
 import eu.alefzero.webdav.WebdavUtils;
 
 
diff --git a/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java b/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java
index 3db62e96..d17d35f7 100644
--- a/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java
@@ -22,15 +22,16 @@ import java.util.Map;
 import java.util.Set;
 import java.util.Vector;
 
+import com.owncloud.android.datamodel.DataStorageManager;
+import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.ui.fragment.FileFragment;
+
 import android.accounts.Account;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentStatePagerAdapter;
 import android.view.ViewGroup;
 
-import com.owncloud.android.datamodel.DataStorageManager;
-import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.ui.fragment.FileFragment;
 
 /**
  * Adapter class that provides Fragment instances  
diff --git a/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java b/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
index 5ffd52ed..815dbbde 100644
--- a/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
+++ b/src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
@@ -52,6 +52,8 @@ import android.widget.VideoView;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.R;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.media.MediaControlView;
@@ -66,8 +68,6 @@ import com.owncloud.android.ui.activity.FileDisplayActivity;
 import com.owncloud.android.ui.fragment.ConfirmationDialogFragment;
 import com.owncloud.android.ui.fragment.FileFragment;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.R;
 import eu.alefzero.webdav.WebdavUtils;
 
 /**
diff --git a/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java b/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java
index 0cab2e2b..56972c65 100644
--- a/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java
+++ b/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java
@@ -17,6 +17,16 @@
 
 package com.owncloud.android.ui.preview;
 
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.R;
+import com.owncloud.android.authentication.AccountUtils;
+import com.owncloud.android.authentication.AccountUtils.AccountNotFoundException;
+import com.owncloud.android.datamodel.DataStorageManager;
+import com.owncloud.android.datamodel.FileDataStorageManager;
+import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.media.MediaService;
+import com.owncloud.android.ui.activity.FileActivity;
+
 import android.accounts.Account;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
@@ -30,15 +40,6 @@ import android.os.Bundle;
 import android.widget.MediaController;
 import android.widget.VideoView;
 
-import com.owncloud.android.Log_OC;
-import com.owncloud.android.R;
-import com.owncloud.android.datamodel.DataStorageManager;
-import com.owncloud.android.datamodel.FileDataStorageManager;
-import com.owncloud.android.authentication.AccountUtils;
-import com.owncloud.android.authentication.AccountUtils.AccountNotFoundException;
-import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.media.MediaService;
-import com.owncloud.android.ui.activity.FileActivity;
 
 /**
  *  Activity implementing a basic video player.
diff --git a/src/com/owncloud/android/utils/FileStorageUtils.java b/src/com/owncloud/android/utils/FileStorageUtils.java
index 55399525..0c7e9911 100644
--- a/src/com/owncloud/android/utils/FileStorageUtils.java
+++ b/src/com/owncloud/android/utils/FileStorageUtils.java
@@ -19,15 +19,16 @@ package com.owncloud.android.utils;
 
 import java.io.File;
 
+import com.owncloud.android.MainApp;
+import com.owncloud.android.R;
+import com.owncloud.android.datamodel.OCFile;
+
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.net.Uri;
 import android.os.Environment;
 import android.os.StatFs;
 
-import com.owncloud.android.MainApp;
-import com.owncloud.android.R;
-import com.owncloud.android.datamodel.OCFile;
 
 /**
  * Static methods to help in access to local file system.
diff --git a/src/com/owncloud/android/widgets/ActionEditText.java b/src/com/owncloud/android/widgets/ActionEditText.java
index efa6655b..1077d154 100644
--- a/src/com/owncloud/android/widgets/ActionEditText.java
+++ b/src/com/owncloud/android/widgets/ActionEditText.java
@@ -22,6 +22,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
 import com.owncloud.android.R;
+
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
diff --git a/src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java b/src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java
index 103cd04a..a91b64ea 100644
--- a/src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java
+++ b/src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java
@@ -32,6 +32,7 @@ import org.apache.commons.httpclient.methods.RequestEntity;
 import com.owncloud.android.Log_OC;
 import com.owncloud.android.network.ProgressiveDataTransferer;
 
+
 import eu.alefzero.webdav.OnDatatransferProgressListener;
 
 
diff --git a/src/eu/alefzero/webdav/FileRequestEntity.java b/src/eu/alefzero/webdav/FileRequestEntity.java
index a8f01d63..1d525c43 100644
--- a/src/eu/alefzero/webdav/FileRequestEntity.java
+++ b/src/eu/alefzero/webdav/FileRequestEntity.java
@@ -34,6 +34,7 @@ import org.apache.commons.httpclient.methods.RequestEntity;
 import com.owncloud.android.Log_OC;
 import com.owncloud.android.network.ProgressiveDataTransferer;
 
+
 import eu.alefzero.webdav.OnDatatransferProgressListener;
 
 
diff --git a/src/eu/alefzero/webdav/WebdavClient.java b/src/eu/alefzero/webdav/WebdavClient.java
index c0eba542..6cb4b83e 100644
--- a/src/eu/alefzero/webdav/WebdavClient.java
+++ b/src/eu/alefzero/webdav/WebdavClient.java
@@ -43,10 +43,11 @@ import org.apache.http.params.CoreProtocolPNames;
 
 import com.owncloud.android.Log_OC;
 import com.owncloud.android.MainApp;
-
 import com.owncloud.android.network.BearerAuthScheme;
 import com.owncloud.android.network.BearerCredentials;
 
+
+
 import android.net.Uri;
 
 public class WebdavClient extends HttpClient {
diff --git a/src/eu/alefzero/webdav/WebdavEntry.java b/src/eu/alefzero/webdav/WebdavEntry.java
index 46923c66..bdf1b35a 100644
--- a/src/eu/alefzero/webdav/WebdavEntry.java
+++ b/src/eu/alefzero/webdav/WebdavEntry.java
@@ -25,6 +25,7 @@ import org.apache.jackrabbit.webdav.property.DavPropertySet;
 
 import com.owncloud.android.Log_OC;
 
+
 import android.net.Uri;
 
 public class WebdavEntry {
diff --git a/tests/.classpath b/tests/.classpath
index 2731f9c5..657a459b 100644
--- a/tests/.classpath
+++ b/tests/.classpath
@@ -4,6 +4,7 @@
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/owncloud-android"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 8c613c20..b6312efd 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.owncloud.android.test"
+          package="com.owncloud.androidcloud.android.test"
           android:versionCode="1"
           android:versionName="1.0">
     <!-- We add an application tag here just so that we can indicate that
@@ -12,10 +12,10 @@
     </application>
     <!--
     This declares that this application uses the instrumentation test runner targeting
-    the package of com.owncloud.android.test.  To run the tests use the command:
-    "adb shell am instrument -w com.owncloud.android.tests/android.test.InstrumentationTestRunner"
+    thde.mobilcom.debitel.cloud.androidlcom.debitel.cloud.android.test.  To run the tests use the command:
+    "ade.mobilcom.debitel.cloud.androidnt -w de.mobilcom.debitel.cloud.android.tests/android.test.InstrumentationTestRunner"
     -->
     <instrumentation android:name="android.test.InstrumentationTestRunner"
-                     android:targetPackage="com.owncloud.android"
-                     android:label="Tests for com.owncloud.android"/>
+     android:targetPackage="com.owncloud.android"
+     android:label="Tests for com.owncloud.android"/>
 </manifest>
diff --git a/tests/src/com/owncloud/android/test/AccountUtilsTest.java b/tests/src/com/owncloud/android/test/AccountUtilsTest.java
index 51030a55..0af91839 100644
--- a/tests/src/com/owncloud/android/test/AccountUtilsTest.java
+++ b/tests/src/com/owncloud/android/test/AccountUtilsTest.java
@@ -18,10 +18,9 @@
 
 package com.owncloud.android.test;
 
-import android.test.AndroidTestCase;
+import com.owncloud.android.authentication.Accocom.owncloud.androiddroid.utils.OwnCloudVersion;
 
-import com.owncloud.android.authentication.AccountUtils;
-import com.owncloud.android.utils.OwnCloudVersion;
+importcom.owncloud.android
 
 public class AccountUtilsTest extends AndroidTestCase {
     
@@ -34,21 +33,21 @@ public class AccountUtilsTest extends AndroidTestCase {
         OwnCloudVersion ocv45 = new OwnCloudVersion(0x040500);
         OwnCloudVersion ocv70 = new OwnCloudVersion(0x070000);
 
-        assertTrue(AccountUtils.getWebdavPath(ocv12, false).equals("/webdav/owncloud.php"));
-        assertTrue(AccountUtils.getWebdavPath(ocv12s, false).equals("/webdav/owncloud.php"));
-        assertTrue(AccountUtils.getWebdavPath(ocv22, false).equals("/files/webdav.php"));
-        assertTrue(AccountUtils.getWebdavPath(ocv30,false).equals("/files/webdav.php"));
-        assertTrue(AccountUtils.getWebdavPath(ocv33s, false).equals("/files/webdav.php"));
-        assertTrue(AccountUtils.getWebdavPath(ocv45, false).equals("/remote.php/webdav"));
-        assertTrue(AccountUtils.getWebdavPath(ocv70, false).equals("/remote.php/webdav"));
-        assertNull(AccountUtils.getWebdavPath(null, false));
-        assertTrue(AccountUtils.getWebdavPath(ocv12, true).equals("/remote.php/odav"));
-        assertTrue(AccountUtils.getWebdavPath(ocv12s, true).equals("/remote.php/odav"));
-        assertTrue(AccountUtils.getWebdavPath(ocv22, true).equals("/remote.php/odav"));
-        assertTrue(AccountUtils.getWebdavPath(ocv30, true).equals("/remote.php/odav"));
-        assertTrue(AccountUtils.getWebdavPath(ocv33s, true).equals("/remote.php/odav"));
-        assertTrue(AccountUtils.getWebdavPath(ocv45, true).equals("/remote.php/odav"));
-        assertTrue(AccountUtils.getWebdavPath(ocv70, true).equals("/remote.php/odav"));
+        assertTrue(AccountUtils.getWebdavPath(ocv12, false, false).equals("/webdav/owncloud.php"));
+        assertTrue(AccountUtils.getWebdavPath(ocv12s, false, false).equals("/webdav/owncloud.php"));
+        assertTrue(AccountUtils.getWebdavPath(ocv22, false, false).equals("/files/webdav.php"));
+        assertTrue(AccountUtils.getWebdavPath(ocv30,false, false).equals("/files/webdav.php"));
+        assertTrue(AccountUtils.getWebdavPath(ocv33s, false, false).equals("/files/webdav.php"));
+        assertTrue(AccountUtils.getWebdavPath(ocv45, false, false).equals("/remote.php/webdav"));
+        assertTrue(AccountUtils.getWebdavPath(ocv70, false, false).equals("/remote.php/webdav"));
+        assertNull(AccountUtils.getWebdavPath(null, false, false));
+        assertTrue(AccountUtils.getWebdavPath(ocv12, true, false).equals("/remote.php/odav"));
+        assertTrue(AccountUtils.getWebdavPath(ocv12s, true, false).equals("/remote.php/odav"));
+        assertTrue(AccountUtils.getWebdavPath(ocv22, true, false).equals("/remote.php/odav"));
+        assertTrue(AccountUtils.getWebdavPath(ocv30, true, false).equals("/remote.php/odav"));
+        assertTrue(AccountUtils.getWebdavPath(ocv33s, true, false).equals("/remote.php/odav"));
+        assertTrue(AccountUtils.getWebdavPath(ocv45, true, false).equals("/remote.php/odav"));
+        assertTrue(AccountUtils.getWebdavPath(ocv70, true, false).equals("/remote.php/odav"));
 
         OwnCloudVersion invalidVer = new OwnCloudVersion("a.b.c");
         assertFalse(invalidVer.isVersionValid());
diff --git a/tests/src/com/owncloud/android/test/FileContentProviderTest.java b/tests/src/com/owncloud/android/test/FileContentProviderTest.java
index e0345e78..f68dc237 100644
--- a/tests/src/com/owncloud/android/test/FileContentProviderTest.java
+++ b/tests/src/com/owncloud/android/test/FileContentProviderTest.java
@@ -1,7 +1,7 @@
 package com.owncloud.android.test;
 
-import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;
-import com.owncloud.android.providers.FileContentProvider;
+import com.owncloud.androideta.ProviderTableMeta;
+import com.owncloud.com.owncloud.androidider;
 
 import android.annotation.TargetApi;
 import android.net.Uri;
@@ -24,9 +24,7 @@ public class FileContentProviderTest extends ProviderTestCase2<FileContentProvid
 	}
 	
 	public FileContentProviderTest() {
-		super(FileContentProvider.class, "com.owncloud.android.providers.FileContentProvider");
-	}
-	
+		super(FileContentProvider.class, "com.owncloud.android.provicom.owncloud.android	
 	@Override
 	public void setUp() {
 		Log.i(TAG, "Entered setup");