diff --git a/MeditationTracker/AndroidManifest.xml b/MeditationTracker/AndroidManifest.xml
index 4a69eba..51227ab 100755
--- a/MeditationTracker/AndroidManifest.xml
+++ b/MeditationTracker/AndroidManifest.xml
@@ -1,18 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    android:installLocation="auto"
     package="com.meditationtracker"
     android:versionCode="6"
-    android:versionName="Torma" android:installLocation="auto">
+    android:versionName="Torma" >
+
+    <uses-sdk android:minSdkVersion="4" />
+
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <!-- uses-permission android:name="android.permission.INTERNET" / -->
 
     <application
         android:allowBackup="true"
         android:backupAgent="com.meditationtracker.sync.backup.BackupAgent"
-        android:debuggable="true"
+        android:debuggable="false"
         android:hardwareAccelerated="true"
         android:icon="@drawable/launcher_48"
         android:label="@string/app_name"
         android:restoreAnyVersion="true"
-        android:theme="@android:style/Theme.Light.NoTitleBar">
+        android:theme="@android:style/Theme.Light.NoTitleBar" >
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name" >
@@ -44,11 +50,10 @@
 
         <activity android:name="SessionActivity" >
         </activity>
-    </application>
 
-    <uses-sdk android:minSdkVersion="4" />
-
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <!-- uses-permission android:name="android.permission.INTERNET" / -->
+        <meta-data
+            android:name="com.google.android.backup.api_key"
+            android:value="AEdPqrEAAAAIPxIT_3FPso7HrtSQo4huTN2PCr5nWrp9uScIAA" />
+    </application>
 
 </manifest>
\ No newline at end of file
diff --git a/MeditationTracker/gen/com/meditationtracker/R.java b/MeditationTracker/gen/com/meditationtracker/R.java
index d42d7a9..93740a9 100755
--- a/MeditationTracker/gen/com/meditationtracker/R.java
+++ b/MeditationTracker/gen/com/meditationtracker/R.java
@@ -62,7 +62,7 @@ public static final class id {
         public static final int LinearLayout01=0x7f090005;
         public static final int LinearLayout02=0x7f090012;
         public static final int LinearLayout03=0x7f09000f;
-        public static final int RelativeLayout01=0x7f09002b;
+        public static final int RelativeLayout01=0x7f09002c;
         public static final int ScrollView01=0x7f090004;
         public static final int TableLayout01=0x7f090020;
         public static final int TableLayout02=0x7f090024;
@@ -80,7 +80,6 @@ public static final class id {
         public static final int editPracticeButton=0x7f09001e;
         public static final int headerLayout=0x7f090000;
         public static final int imageSourceGroup=0x7f09003b;
-        public static final int imgMore=0x7f09002d;
         public static final int imgPractice=0x7f09001f;
         public static final int linearLayout1=0x7f090002;
         public static final int menuBar=0x7f09000b;
@@ -89,7 +88,7 @@ public static final class id {
         public static final int openPractice=0x7f09003e;
         public static final int pickerScheduledEndDate=0x7f090033;
         public static final int practiceImage=0x7f09000c;
-        public static final int practiceImg=0x7f09002c;
+        public static final int practiceImg=0x7f09002d;
         public static final int practiceProgressBar=0x7f090023;
         public static final int practiceTitle=0x7f09002e;
         public static final int prefTimePicker=0x7f090038;
@@ -110,7 +109,7 @@ public static final class id {
         public static final int textMalaSize=0x7f090016;
         public static final int textPracticeName=0x7f09000e;
         public static final int textRepetitionCount=0x7f090011;
-        public static final int textScheduledEndDate=0x7f09002a;
+        public static final int textScheduledEndDate=0x7f09002b;
         public static final int textScheduledForToday=0x7f090025;
         public static final int textTimer=0x7f090034;
         public static final int textVersion=0x7f090003;
@@ -124,6 +123,7 @@ public static final class id {
         public static final int titlePracticeName=0x7f09000d;
         public static final int titleRepetitionCount=0x7f090010;
         public static final int titleReqRepetitions=0x7f090021;
+        public static final int titleScheduledCompletionDate=0x7f09002a;
         public static final int titleScheduledForToday=0x7f090026;
     }
     public static final class layout {
diff --git a/MeditationTracker/gen/doo/util/root/R.java b/MeditationTracker/gen/doo/util/root/R.java
index 20350f1..eb2d852 100755
--- a/MeditationTracker/gen/doo/util/root/R.java
+++ b/MeditationTracker/gen/doo/util/root/R.java
@@ -62,7 +62,7 @@ public static final class id {
         public static final int LinearLayout01=0x7f090005;
         public static final int LinearLayout02=0x7f090012;
         public static final int LinearLayout03=0x7f09000f;
-        public static final int RelativeLayout01=0x7f09002b;
+        public static final int RelativeLayout01=0x7f09002c;
         public static final int ScrollView01=0x7f090004;
         public static final int TableLayout01=0x7f090020;
         public static final int TableLayout02=0x7f090024;
@@ -80,7 +80,6 @@ public static final class id {
         public static final int editPracticeButton=0x7f09001e;
         public static final int headerLayout=0x7f090000;
         public static final int imageSourceGroup=0x7f09003b;
-        public static final int imgMore=0x7f09002d;
         public static final int imgPractice=0x7f09001f;
         public static final int linearLayout1=0x7f090002;
         public static final int menuBar=0x7f09000b;
@@ -89,7 +88,7 @@ public static final class id {
         public static final int openPractice=0x7f09003e;
         public static final int pickerScheduledEndDate=0x7f090033;
         public static final int practiceImage=0x7f09000c;
-        public static final int practiceImg=0x7f09002c;
+        public static final int practiceImg=0x7f09002d;
         public static final int practiceProgressBar=0x7f090023;
         public static final int practiceTitle=0x7f09002e;
         public static final int prefTimePicker=0x7f090038;
@@ -110,7 +109,7 @@ public static final class id {
         public static final int textMalaSize=0x7f090016;
         public static final int textPracticeName=0x7f09000e;
         public static final int textRepetitionCount=0x7f090011;
-        public static final int textScheduledEndDate=0x7f09002a;
+        public static final int textScheduledEndDate=0x7f09002b;
         public static final int textScheduledForToday=0x7f090025;
         public static final int textTimer=0x7f090034;
         public static final int textVersion=0x7f090003;
@@ -124,6 +123,7 @@ public static final class id {
         public static final int titlePracticeName=0x7f09000d;
         public static final int titleRepetitionCount=0x7f090010;
         public static final int titleReqRepetitions=0x7f090021;
+        public static final int titleScheduledCompletionDate=0x7f09002a;
         public static final int titleScheduledForToday=0x7f090026;
     }
     public static final class layout {
diff --git a/MeditationTracker/res/layout-land/session.xml b/MeditationTracker/res/layout-land/session.xml
old mode 100644
new mode 100755
index 62a2dc5..0635360
--- a/MeditationTracker/res/layout-land/session.xml
+++ b/MeditationTracker/res/layout-land/session.xml
@@ -13,15 +13,15 @@
 		android:layout_height="fill_parent" android:orientation="horizontal">
 
 		<ScrollView android:id="@+id/ScrollView01"
-			android:background="#ffffff" android:keepScreenOn="true"
-			android:layout_height="wrap_content" android:layout_width="wrap_content">
-			<LinearLayout android:layout_height="fill_parent"
+			android:keepScreenOn="true"
+			android:layout_height="wrap_content" android:layout_width="wrap_content" android:paddingRight="10dp">
+			<LinearLayout android:layout_height="wrap_content"
 				android:background="#ffffff" android:orientation="vertical"
-				android:layout_width="fill_parent" android:padding="10px">
+				android:layout_width="fill_parent">
 
 				<ImageView android:layout_height="wrap_content"
-					android:src="@drawable/karmapa" android:padding="10dip" android:id="@+id/imgPractice"
-					android:layout_width="wrap_content" android:layout_gravity="center"></ImageView>
+					android:src="@drawable/karmapa" android:id="@+id/imgPractice"
+					android:layout_width="wrap_content" android:layout_gravity="center" android:paddingLeft="10dp"></ImageView>
 				<TextView android:layout_width="wrap_content"
 					android:layout_height="wrap_content" android:layout_gravity="center"
 					android:text="10:00:00" android:textSize="35sp" android:id="@+id/textTimer"
diff --git a/MeditationTracker/res/layout/main.xml b/MeditationTracker/res/layout/main.xml
old mode 100644
new mode 100755
index 8f295e3..9c7b8a2
--- a/MeditationTracker/res/layout/main.xml
+++ b/MeditationTracker/res/layout/main.xml
@@ -20,7 +20,7 @@
 
 		<LinearLayout android:id="@+id/LinearLayout01"
 			android:orientation="vertical" android:layout_width="fill_parent"
-			android:layout_height="fill_parent" android:addStatesFromChildren="true">
+			android:layout_height="wrap_content" android:addStatesFromChildren="true">
 
 			<TextView android:layout_height="wrap_content"
 				android:textStyle="bold" android:textColor="#000000" android:text="@string/ngondroTitle"
@@ -37,7 +37,7 @@
 			<TextView android:layout_height="wrap_content" android:text="@string/myMeditationsTitle"
 				android:textColor="#000000" android:textStyle="bold"
 				android:textSize="23sp" android:id="@+id/customPracticesTitle"
-				android:layout_below="@id/ngondroList" android:paddingLeft="10dip"
+				android:paddingLeft="10dip"
 				android:layout_width="fill_parent" android:background="#ffffff"
 				android:layout_marginTop="20dip"></TextView>
 			<com.meditationtracker.controls.NoScrollListView
diff --git a/MeditationTracker/res/layout/new_meditation.xml b/MeditationTracker/res/layout/new_meditation.xml
old mode 100644
new mode 100755
index 51136e9..1d77e2e
--- a/MeditationTracker/res/layout/new_meditation.xml
+++ b/MeditationTracker/res/layout/new_meditation.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:doo="http://schemas.durilka.com/doo"
-	android:layout_height="fill_parent" android:background="#ffffff"
+	android:layout_height="fill_parent" 
 	android:layout_width="fill_parent">
-	<LinearLayout android:background="#ffffff"
+	<LinearLayout 
 		android:layout_width="fill_parent" android:orientation="vertical"
-		android:layout_height="fill_parent">
+		android:layout_height="wrap_content">
 
 		<com.meditationtracker.controls.MenuBar
 			android:layout_height="wrap_content" android:layout_width="fill_parent"
@@ -18,30 +18,27 @@
 			android:scaleType="fitCenter"></ImageView>
 
 		<TextView android:layout_width="wrap_content"
-			android:layout_height="wrap_content" android:layout_below="@id/practiceImage"
+			android:layout_height="wrap_content" 
 			android:id="@+id/titlePracticeName" android:text="@string/practiceName"
 			android:layout_marginLeft="10dip" android:textColor="#000000"></TextView>
 		<EditText android:text="" android:id="@+id/textPracticeName"
 			android:layout_height="wrap_content" android:layout_width="fill_parent"
-			android:layout_below="@id/titlePracticeName"
-			android:layout_marginLeft="10dip" android:layout_marginRight="10dip"></EditText>
+			android:layout_marginLeft="10dip" android:layout_marginRight="10dip" android:inputType="text|textCapSentences|textAutoCorrect"></EditText>
 
 		<LinearLayout android:id="@+id/LinearLayout03"
-			android:layout_height="wrap_content" android:layout_width="fill_parent">
+			android:layout_height="wrap_content" android:layout_width="fill_parent" android:baselineAligned="false">
 			<LinearLayout android:id="@+id/LinearLayout01"
 				android:layout_width="wrap_content" android:layout_height="wrap_content"
 				android:orientation="vertical" android:layout_weight="1">
 				<TextView android:layout_width="wrap_content"
-					android:layout_height="wrap_content" android:layout_below="@id/textPracticeName"
+					android:layout_height="wrap_content" 
 					android:id="@+id/titleRepetitionCount" android:text="@string/requiredRepetitions"
-					android:layout_marginLeft="10dip" android:layout_weight="1"
+					android:layout_marginLeft="10dip" 
 					android:textColor="#000000"></TextView>
 
 
 				<EditText android:text="" android:id="@+id/textRepetitionCount"
-					android:layout_height="wrap_content" android:layout_below="@id/titleRepetitionCount"
-					android:layout_alignRight="@id/titleRepetitionCount"
-					android:layout_alignLeft="@id/titleRepetitionCount"
+					android:layout_height="wrap_content" 
 					android:layout_width="fill_parent" android:layout_marginLeft="10dip"
 					android:inputType="number"></EditText>
 			</LinearLayout>
@@ -50,25 +47,21 @@
 				android:layout_width="wrap_content" android:layout_height="wrap_content"
 				android:orientation="vertical" android:layout_weight="1">
 				<TextView android:layout_width="wrap_content"
-					android:layout_height="wrap_content" android:layout_below="@id/textPracticeName"
+					android:layout_height="wrap_content" 
 					android:id="@+id/titleCompletedCount" android:text="@string/completedRepetitions"
-					android:layout_toLeftOf="@id/titleRepetitionCount"
-					android:layout_alignParentRight="true" android:layout_marginRight="10dip"
-					android:layout_weight="1" android:textColor="#000000"></TextView>
+					android:layout_marginRight="10dip"
+					android:textColor="#000000"></TextView>
 
 				<EditText android:text="" android:id="@+id/textCompletedRepetitions"
-					android:layout_height="wrap_content" android:layout_below="@id/titleCompletedCount"
-					android:layout_alignParentRight="true" android:layout_toRightOf="@id/textRepetitionCount"
-					android:layout_alignLeft="@id/titleCompletedCount"
-					android:layout_alignRight="@id/titleCompletedCount"
+					android:layout_height="wrap_content" 
 					android:layout_width="fill_parent" android:layout_marginRight="10dip"
-					android:layout_weight="0.5" android:inputType="number"></EditText>
+					android:inputType="number"></EditText>
 			</LinearLayout>
 
 		</LinearLayout>
 
 		<TextView android:layout_width="wrap_content"
-			android:layout_height="wrap_content" android:layout_marginLeft="10dip" android:layout_weight="1"
+			android:layout_height="0dip" android:layout_marginLeft="10dip" android:layout_weight="1"
 			android:textColor="#000000" android:id="@+id/titleMalaSize" android:text="@string/customMalaSize"></TextView>
 
 
diff --git a/MeditationTracker/res/layout/post_install.xml b/MeditationTracker/res/layout/post_install.xml
old mode 100644
new mode 100755
index 36436db..9babce7
--- a/MeditationTracker/res/layout/post_install.xml
+++ b/MeditationTracker/res/layout/post_install.xml
@@ -1,19 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent" android:layout_height="fill_parent"
-	android:orientation="vertical">
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/scrollView1"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content" >
 
-	<ScrollView android:layout_width="fill_parent"
-		android:layout_height="wrap_content" android:id="@+id/scrollView1">
-		<LinearLayout android:layout_width="fill_parent"
-			android:id="@+id/linearLayout1" android:layout_height="fill_parent" android:orientation="vertical">
-			<TextView android:text="@string/postInstallWelcome"
-				android:id="@+id/textView1" android:layout_width="wrap_content"
-				android:layout_height="wrap_content" android:layout_margin="10dp" android:textColor="#f0f0f0"></TextView>
+    <LinearLayout
+        android:id="@+id/linearLayout1"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" >
 
-			<TextView android:text="@string/appUrl" android:id="@+id/textView2"
-				android:layout_width="wrap_content" android:layout_height="wrap_content" android:clickable="true" android:gravity="center" android:lines="1" android:ellipsize="marquee" android:maxLines="1" android:layout_margin="10dp" android:textColor="#f0f0f0" android:autoLink="web"></TextView>
+        <TextView
+            android:id="@+id/textView1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            android:text="@string/postInstallWelcome"
+            android:textColor="#f0f0f0" >
+        </TextView>
 
-		</LinearLayout>
-	</ScrollView>
-</LinearLayout>
+        <TextView
+            android:id="@+id/textView2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            android:autoLink="web"
+            android:clickable="true"
+            android:ellipsize="marquee"
+            android:gravity="center"
+            android:lines="1"
+            android:maxLines="1"
+            android:text="@string/appUrl"
+            android:textColor="#f0f0f0" >
+        </TextView>
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/MeditationTracker/res/layout/practice.xml b/MeditationTracker/res/layout/practice.xml
old mode 100644
new mode 100755
index 4443ad2..59f053a
--- a/MeditationTracker/res/layout/practice.xml
+++ b/MeditationTracker/res/layout/practice.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:background="#ffffff" android:orientation="vertical"
+	android:orientation="vertical"
 	android:layout_height="fill_parent" android:layout_width="fill_parent">
 
 	<LinearLayout android:layout_width="fill_parent"
@@ -34,7 +34,7 @@
 					android:id="@+id/imgPractice" android:layout_margin="10dip"></ImageView>
 
 				<TableLayout android:id="@+id/TableLayout01"
-					android:layout_height="wrap_content" android:layout_toRightOf="@id/imgPractice"
+					android:layout_height="wrap_content" 
 					android:layout_width="fill_parent" android:layout_marginRight="10dip">
 
 
@@ -109,7 +109,7 @@
 					android:layout_height="wrap_content" android:id="@+id/rowScheduledCompletion">
 					<TextView android:layout_width="wrap_content"
 						android:layout_height="wrap_content" android:text="@string/scheduledCompletionDate"
-						android:textColor="#000000" android:id="@+id/titleScheduledForToday"></TextView>
+						android:textColor="#000000" android:id="@+id/titleScheduledCompletionDate"></TextView>
 
 					<TextView android:layout_height="wrap_content"
 						android:text="02/02/2013" android:textColor="#000000"
diff --git a/MeditationTracker/res/layout/practice_list_item.xml b/MeditationTracker/res/layout/practice_list_item.xml
old mode 100644
new mode 100755
index e197932..aa679ff
--- a/MeditationTracker/res/layout/practice_list_item.xml
+++ b/MeditationTracker/res/layout/practice_list_item.xml
@@ -4,49 +4,22 @@
 
 	android:layout_width="fill_parent" android:padding="6dip" android:layout_height="wrap_content">
 
-	<!--
-
-		?android:attr/listPreferredItemHeight <ImageView
-		android:id="@+id/icon" android:src="@drawable/icon_refuge"
-		android:layout_height="wrap_content"
-		android:layout_width="wrap_content"/> <ImageView
-		android:id="@+id/ImageView01" android:layout_height="wrap_content"
-		android:src="@drawable/more" android:layout_alignParentRight="true"
-		android:layout_alignParentTop="true"
-		android:layout_width="wrap_content"
-		android:layout_centerVertical="true"></ImageView> <TextView
-		android:id="@+id/secondLine" android:singleLine="true"
-		android:text="Simple application that shows how to use RelativeLayout
-		and let's make it longer than usual"
-		android:layout_width="wrap_content"
-		android:layout_alignParentBottom="true" android:layout_height="26dip"
-		android:layout_toRightOf="@id/icon" android:ellipsize="marquee"/>
-
-		<TextView android:layout_height="wrap_content"
-
-		android:layout_alignParentRight="true"
-		android:layout_alignParentTop="true"
-		android:layout_above="@id/secondLine"
-		android:gravity="center_vertical" android:text="My Application"
-		android:layout_alignWithParentIfMissing="true"
-		android:layout_toRightOf="@id/icon"
-		android:layout_width="wrap_content"/>
-	-->
-
 	<ImageView android:layout_width="wrap_content" android:src="@drawable/icon_refuge"
 		android:layout_height="wrap_content" android:id="@+id/practiceImg"
 		android:scaleType="center"></ImageView>
 
-	<ImageView android:layout_width="wrap_content"
-		android:layout_height="wrap_content" android:src="@drawable/more"
-		android:layout_alignParentRight="true" android:id="@+id/imgMore"></ImageView>
-
-	<TextView android:layout_alignParentTop="true"
-		android:layout_height="wrap_content" android:paddingLeft="6dip"
-		android:textStyle="bold" android:textColor="#000000" android:textSize="25sp"
-		android:layout_toRightOf="@id/practiceImg" android:id="@+id/practiceTitle"
-		android:text="Refuge" android:layout_width="fill_parent"
-		android:layout_toLeftOf="@id/imgMore"></TextView>
+	<TextView
+	    android:id="@+id/practiceTitle"
+	    android:layout_width="fill_parent"
+	    android:layout_height="wrap_content"
+	    android:layout_alignParentTop="true"
+	    android:layout_toRightOf="@id/practiceImg"
+	    android:paddingLeft="6dip"
+	    android:text="Refuge"
+	    android:textColor="#000000"
+	    android:textSize="25sp"
+	    android:textStyle="bold" >
+</TextView>
 
 
 	<TextView android:paddingLeft="6dip" android:textColor="#909090"
diff --git a/MeditationTracker/res/layout/schedule.xml b/MeditationTracker/res/layout/schedule.xml
old mode 100644
new mode 100755
index 0dedb21..8cb5fa8
--- a/MeditationTracker/res/layout/schedule.xml
+++ b/MeditationTracker/res/layout/schedule.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:doo="http://schemas.android.com/apk/res/com.meditationtracker"
-	android:background="#ffffff" android:layout_height="fill_parent"
+	android:layout_height="fill_parent"
 	android:layout_width="fill_parent">
 
 	<LinearLayout android:layout_width="fill_parent"
-		android:layout_height="fill_parent" android:orientation="vertical"
+		android:layout_height="wrap_content" android:orientation="vertical"
 		android:padding="10dip">
 
 		<com.meditationtracker.controls.MenuBar
diff --git a/MeditationTracker/res/layout/session.xml b/MeditationTracker/res/layout/session.xml
old mode 100644
new mode 100755
index 5fe9668..f809dae
--- a/MeditationTracker/res/layout/session.xml
+++ b/MeditationTracker/res/layout/session.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/LinearLayout01" android:background="#ffffff" android:layout_width="fill_parent" android:orientation="vertical" android:layout_height="fill_parent">
+	android:id="@+id/LinearLayout01" android:layout_width="fill_parent" android:orientation="vertical" android:layout_height="fill_parent">
 
 	<com.meditationtracker.controls.MenuBar
 		android:layout_height="wrap_content" android:layout_width="fill_parent"
 		android:id="@+id/menuBar" />
 
 	<ScrollView android:id="@+id/ScrollView01"
-		android:layout_width="fill_parent" android:background="#ffffff" android:keepScreenOn="true" android:layout_height="wrap_content">
-		<LinearLayout android:layout_height="fill_parent"
-			android:layout_width="fill_parent" android:background="#ffffff"
+		android:layout_width="fill_parent" android:keepScreenOn="true" android:layout_height="wrap_content">
+		<LinearLayout android:layout_height="wrap_content"
+			android:layout_width="fill_parent" 
 			android:orientation="vertical">
 
 			<ImageView android:layout_height="wrap_content"
diff --git a/MeditationTracker/res/values-de/strings.xml b/MeditationTracker/res/values-de/strings.xml
old mode 100644
new mode 100755
index 2bb076f..5fa2864
--- a/MeditationTracker/res/values-de/strings.xml
+++ b/MeditationTracker/res/values-de/strings.xml
@@ -57,7 +57,7 @@
 
 	<string name="appUrl">http://dooreelkow.blogspot.com/2011/05/iv-ii.html
 	</string>
-	<string name="about">Über...</string>
+	<string name="about">Über&#8230;</string>
 	<string name="hi">Hi!</string>
 	<string name="version">v5 \'108\'
 		\n\nProgrammierung von Doo Reelkow.
@@ -73,9 +73,11 @@
 	<string name="dimNightSummary">Sitzungsfenster wird während später Meditationen
 		abgeblendet</string>
 	<string name="versionInfo">Version</string>
-	<string name="postInstallWelcome">Willkommen zum neuen Meditations Tracker.
+	<string name="postInstallWelcome">Grüezi und willkommen zum neuen Meditations Tracker.
 		\n\nDas ist immer noch nicht die \"Google
-		Documents\" version. Das einzelne was geändert wird ist besseres support für
-		den übungsbildwahl. Und dass ist die letzte mit support für android 1.5.
-		\n\nGrüss, Doo Reelkow.</string>
+		Documents\" version. Besser. Ab jetzt Meditationen und deren Stand wird automatisch synchroniziert in neuen
+		Geräten durch google cloud. Dass heisst dass Datenexport für Analyse ist jetzt etwa unnötig aber vielleicht
+		mache ich es trotzdem. Später.
+		\n\nMeditiern!
+		\n\nGrüsse, Doo Reelkow.</string>
 </resources>
diff --git a/MeditationTracker/res/values-es/strings.xml b/MeditationTracker/res/values-es/strings.xml
old mode 100644
new mode 100755
index 15481e5..fd91ce1
--- a/MeditationTracker/res/values-es/strings.xml
+++ b/MeditationTracker/res/values-es/strings.xml
@@ -56,7 +56,7 @@
 	<string name="setMalaCount">Nuevo tamaño de mala</string>
 	
 	<string name="appUrl">http://dooreelkow.blogspot.com/2011/05/iv-ii.html</string>
-	<string name="about">Sobre...</string>
+	<string name="about">Sobre&#8230;</string>
     <string name="hi">Hola!</string>
     <string name="version">v5 \'108\'
     \n\nProgramación de Doo Reelkow.
diff --git a/MeditationTracker/res/values-it/strings.xml b/MeditationTracker/res/values-it/strings.xml
old mode 100644
new mode 100755
index c5bca85..d919a2d
--- a/MeditationTracker/res/values-it/strings.xml
+++ b/MeditationTracker/res/values-it/strings.xml
@@ -59,7 +59,7 @@
 
 	<string name="appUrl">http://dooreelkow.blogspot.com/2011/05/iv-ii.html
 	</string>
-	<string name="about">Su...</string>
+	<string name="about">Su&#8230;</string>
 	<string name="hi">Ciao!</string>
 	<string name="version">v5 \'108\'
 	    \n\nScritta da Doo Reelkow.\n
diff --git a/MeditationTracker/res/values-pl/strings.xml b/MeditationTracker/res/values-pl/strings.xml
old mode 100644
new mode 100755
index b57bfbe..3e155d3
--- a/MeditationTracker/res/values-pl/strings.xml
+++ b/MeditationTracker/res/values-pl/strings.xml
@@ -53,7 +53,7 @@
 	<string name="addMala">Dodaj male</string>
 	<string name="setMalaCount">Ustaw ilość</string>
 	<string name="appUrl">http://dooreelkow.blogspot.com/2011/05/iv-ii.html</string>
-	<string name="about">O programie...</string>
+	<string name="about">O programie&#8230;</string>
 	<string name="hi">Witaj!</string>
 	<string name="version">v5 \'108\'
 	\n\nAutor: Doo Reelkow
diff --git a/MeditationTracker/res/values-ru/strings.xml b/MeditationTracker/res/values-ru/strings.xml
old mode 100644
new mode 100755
index 9ef0ade..dc48234
--- a/MeditationTracker/res/values-ru/strings.xml
+++ b/MeditationTracker/res/values-ru/strings.xml
@@ -56,7 +56,7 @@
 	<string name="addMala">Добавить</string>
 	<string name="setMalaCount">Задать число</string>
 
-	<string name="about">О программе...</string>
+	<string name="about">О программе&#8230;</string>
 	<string name="hi">Привет!</string>
 	<string name="version">v5 \'108\'
 		\n\nНаписана Doo Reelkow
@@ -75,8 +75,9 @@
 	</string>
 	<string name="versionInfo">Версия</string>
 	<string name="postInstallWelcome">Приветствую в новом трекере!\n\nЭто ещё не версия с 
-	    Гуглодокументами. На самом деле, всё что изменилось - это вроде бы окончательно
-	    работает выбор картинки для практики. И ещё этот релиз - последний с поддержкой
-	    андроида 1.5\nУдачной практики!
+	    Гуглодокументами. Лучше. Это версия, синхронизирующая своё состояние через интернет. Теперь при покупке новго
+	    телефона все данные о практиках и прогрессе будут автоматически синхронизироваться.
+	    \nНу и теперь экспорт данных для графиков в экселе стал малозначительным.
+	    \n\nУдачной практики!
 	    \n\nВаш, Doo Reelkow.</string>
 </resources>
diff --git a/MeditationTracker/res/values-uk/strings.xml b/MeditationTracker/res/values-uk/strings.xml
old mode 100644
new mode 100755
index a8a6a0c..2a469c8
--- a/MeditationTracker/res/values-uk/strings.xml
+++ b/MeditationTracker/res/values-uk/strings.xml
@@ -56,7 +56,7 @@
 	<string name="addMala">Додати</string>
 	<string name="setMalaCount">Вказати кількість</string>
 
-	<string name="about">Про програму...</string>
+	<string name="about">Про програму&#8230;</string>
 	<string name="hi">Вітання!</string>
 	<string name="version">v5 \'108\'
 	    \n\nНаписана Doo Reelkow\n
@@ -74,9 +74,10 @@
 	<string name="dimNightSummary">Затемнювати екран сесії ввечері</string>
 	<string name="versionInfo">Версія</string>
 	<string name="postInstallWelcome">Вітаю в новому трекері!\n
-		\nЦе ще не реліз з Гугль-документами. Насправді все що змінилось - сподіваюсь остаточно
-		працює обирання картинок для практики. До цього ж цей реліз останній з підртимкой андроїда 1.5.
-		\nПрактикуймо!\n
+		\nЦе ще не реліз з Гугль-документами. Ліпше. Відтепер дані про практики та прогрес автоматично будуть 
+		синхронизувати через інтернет в	нових телефонах після покупки.
+		Експорт в ексель тепер непотрібний але мо колись й зроблю.
+		\n\nПрактикуймо!\n
 		\nВаш,
 		Doo Reelkow.</string>
 </resources>
\ No newline at end of file
diff --git a/MeditationTracker/res/values/strings.xml b/MeditationTracker/res/values/strings.xml
old mode 100644
new mode 100755
index cc42528..83d4a28
--- a/MeditationTracker/res/values/strings.xml
+++ b/MeditationTracker/res/values/strings.xml
@@ -11,7 +11,7 @@
     <string name="editPractice">Edit meditation</string>
     <string name="countDown">Countdown</string>
     <string name="stopWatch">Stopwatch</string>
-    <string name="useStopWatch">Stop watch or countdown?</string>
+    <string name="useStopWatch">Stopwatch or countdown?</string>
     <string name="timerNotification">Play sound</string>
     <string name="sessionLength">Session length min.</string>
     <string name="malaSize">Mala size</string>
@@ -57,7 +57,7 @@
     <string name="setMalaCount">Set count</string>
     <string name="appUrl">http://dooreelkow.blogspot.com/2011/05/iv-ii.html
 	</string>
-    <string name="about">About...</string>
+    <string name="about">About&#8230;</string>
     <string name="hi">Hi!</string>
     <string name="version">v5 \'108\'
         \n\nWritten by Doo Reelkow.\n
@@ -74,10 +74,12 @@
     <string name="dimNightSummary">Dim session screen during late meditations</string>
     <string name="versionInfo">Version</string>
     <string name="postInstallWelcome">Welcome to the new meditation tracker.
-        \n\nThis is not the promised big google-synchronising release. In fact the only change is 
-	    hopefully final fix for image picking(please check if it still works) and 
-	    decision that this is the last release supporting android 1.5.
-	    \nKeep up your practices!
+        \n\nThis is not the promised big google-synchronising release. 
+        It\'s better. It\'s a small google-synchronizing release. For devices running 2.2 and up 
+        Meditation Tracker will now keep its state in android settings cloud. This means that
+        when you download this app to the new phone it\'ll automatically synchronize your practices and progress.
+        \nExporting practice entries for reporting and graphs is postponed and I guess is somewhat irrelevant now.
+	    \n\nKeep up your practices!
 	    \n\nYours, Doo Reelkow.</string>
 
 </resources>
\ No newline at end of file
diff --git a/MeditationTracker/src/com/meditationtracker/PracticeImageProvider.java b/MeditationTracker/src/com/meditationtracker/PracticeImageProvider.java
index 80a8fd8..ca49c4b 100755
--- a/MeditationTracker/src/com/meditationtracker/PracticeImageProvider.java
+++ b/MeditationTracker/src/com/meditationtracker/PracticeImageProvider.java
@@ -37,7 +37,7 @@ public ParcelFileDescriptor openFile(Uri uri, String mode) throws FileNotFoundEx
 	}
 
 	@Override
-	public int delete(Uri uri, String selection, String[] selectionArgs)
+	public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder)
 	{
 		throw new UnsupportedOperationException(NOT_SUPPORTED_BY_THIS_PROVIDER);
 	}
@@ -45,31 +45,30 @@ public int delete(Uri uri, String selection, String[] selectionArgs)
 	@Override
 	public String getType(Uri uri)
 	{
-		throw new UnsupportedOperationException(NOT_SUPPORTED_BY_THIS_PROVIDER);
+		return android.provider.MediaStore.Images.Media.CONTENT_TYPE;
 	}
 
 	@Override
-	public Uri insert(Uri uri, ContentValues values)
+	public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs)
 	{
 		throw new UnsupportedOperationException(NOT_SUPPORTED_BY_THIS_PROVIDER);
 	}
 
 	@Override
-	public boolean onCreate()
+	public int delete(Uri uri, String selection, String[] selectionArgs)
 	{
-		return true;
+		throw new UnsupportedOperationException(NOT_SUPPORTED_BY_THIS_PROVIDER);
 	}
 
 	@Override
-	public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder)
+	public Uri insert(Uri uri, ContentValues values)
 	{
 		throw new UnsupportedOperationException(NOT_SUPPORTED_BY_THIS_PROVIDER);
 	}
 
 	@Override
-	public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs)
+	public boolean onCreate()
 	{
-		throw new UnsupportedOperationException(NOT_SUPPORTED_BY_THIS_PROVIDER);
+		return true;
 	}
-
 }
diff --git a/MeditationTracker/src/com/meditationtracker/controls/NoScrollListView.java b/MeditationTracker/src/com/meditationtracker/controls/NoScrollListView.java
old mode 100644
new mode 100755
index 64cf758..a14d957
--- a/MeditationTracker/src/com/meditationtracker/controls/NoScrollListView.java
+++ b/MeditationTracker/src/com/meditationtracker/controls/NoScrollListView.java
@@ -3,7 +3,6 @@
 import android.content.Context;
 import android.graphics.Rect;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.ListView;
@@ -60,7 +59,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec)
 		if (newChildHeight != 0)
 			fullHeight = getListPaddingTop() + getListPaddingBottom() +  /*getVerticalFadingEdgeLength() * 2*/ + newChildHeight;
 
-		Log.d("MTRK", String.format("Measured. Cnt: %d, ChildCnt: %d, childHeight: %d, fullHeight: %d", getCount(), getChildCount(), childHeight, fullHeight));
+//		Log.d("MTRK", String.format("Measured. Cnt: %d, ChildCnt: %d, childHeight: %d, fullHeight: %d", getCount(), getChildCount(), childHeight, fullHeight));
 		setMeasuredDimension(getMeasuredWidth(), fullHeight);
 	}
 	
@@ -68,21 +67,21 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec)
 
 	@Override
 	public boolean requestChildRectangleOnScreen(View child, Rect rect, boolean immediate) {
-		Log.d("MTRK", "=====    requestChildRectangleOnScreen");
+//		Log.d("MTRK", "=====    requestChildRectangleOnScreen");
 		forceRelayoutIfNeeded();
 		return super.requestChildRectangleOnScreen(child, rect, immediate);
 	}
 
 	@Override
 	public boolean onTouchEvent(MotionEvent ev) {
-		Log.d("MTRK", "=====    onTouchEvent");
+//		Log.d("MTRK", "=====    onTouchEvent");
 		forceRelayoutIfNeeded();
 		return super.onTouchEvent(ev);
 	}
 
 	@Override
 	protected void layoutChildren() {
-		Log.d("MTRK", "=====    layoutChildren");
+//		Log.d("MTRK", "=====    layoutChildren");
 		super.layoutChildren();
 		
 		forceRelayoutIfNeeded();
@@ -90,7 +89,7 @@ protected void layoutChildren() {
 
 	private void forceRelayoutIfNeeded() {
 		if (assumedMeasurements) {
-			Log.d("MTRK", "Forcing relayout");
+//			Log.d("MTRK", "Forcing relayout");
 			requestLayout();
 		}
 	}
diff --git a/MeditationTracker/src/com/meditationtracker/sync/backup/AllFilesBackupHelper.java b/MeditationTracker/src/com/meditationtracker/sync/backup/AllFilesBackupHelper.java
new file mode 100755
index 0000000..6f27631
--- /dev/null
+++ b/MeditationTracker/src/com/meditationtracker/sync/backup/AllFilesBackupHelper.java
@@ -0,0 +1,59 @@
+package com.meditationtracker.sync.backup;
+
+import java.io.File;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.meditationtracker.PracticeDatabase;
+
+import android.app.backup.BackupDataInputStream;
+import android.app.backup.FileBackupHelper;
+import android.content.Context;
+import android.util.Log;
+
+
+public class AllFilesBackupHelper extends FileBackupHelper {
+
+	private static File mFilesDir;
+
+	public AllFilesBackupHelper(Context context) {
+		super(context, getFiles(context));
+		// TODO Auto-generated constructor stub
+	}
+
+	private static String[] getFiles(Context context) {
+		List<String> files = new ArrayList<String>();
+		files.add("../databases/" + PracticeDatabase.DBNAME);
+
+		Log.d("MTRK", "File backup");
+		mFilesDir = context.getFilesDir();
+		for (File f : mFilesDir.listFiles()) {
+			String fname = f.getName();
+			files.add(fname);
+			Log.d("MTRK", "Adding " + fname + " to backup");
+		}
+
+		return files.toArray(new String[0]);
+	}
+
+	//XXX: WTF: Actually overloading the isKeyInList should've been enough if it wasn't package-private
+	@Override
+	public void restoreEntity(BackupDataInputStream data) {
+       	Log.d("MTRK", "got entity '" + data.getKey() + "' size=" + data.size());
+        String key = data.getKey();
+        File f = new File(mFilesDir, key);
+        
+//      writeFile(f, data);
+        try {
+			Method declaredMethod = FileBackupHelper.class.getSuperclass().getDeclaredMethod("writeFile", new Class[] { File.class, BackupDataInputStream.class});
+			declaredMethod.setAccessible(true);
+			declaredMethod.invoke(this, f, data);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			Log.e("MTRK", "Failed restoring file", e);
+		} 
+        
+	}
+	
+}
diff --git a/MeditationTracker/src/com/meditationtracker/sync/backup/BackupAgent.java b/MeditationTracker/src/com/meditationtracker/sync/backup/BackupAgent.java
index 2478b2c..856e657 100755
--- a/MeditationTracker/src/com/meditationtracker/sync/backup/BackupAgent.java
+++ b/MeditationTracker/src/com/meditationtracker/sync/backup/BackupAgent.java
@@ -1,42 +1,35 @@
 package com.meditationtracker.sync.backup;
 
-import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.meditationtracker.PracticeDatabase;
 
+import android.app.backup.BackupDataInput;
 import android.app.backup.BackupHelper;
-import android.app.backup.FileBackupHelper;
 import android.app.backup.SharedPreferencesBackupHelper;
+import android.os.ParcelFileDescriptor;
+
+import com.meditationtracker.PracticeDatabase;
 
 public class BackupAgent extends android.app.backup.BackupAgentHelper {
 
 	private BackupHelper prefsHelper;
-	//private BackupHelper meditationHelper;
+	private AllFilesBackupHelper dbData;
 
 	@Override
 	public void onCreate() {
 		super.onCreate();
-		
+
 		prefsHelper = new SharedPreferencesBackupHelper(this);
 		addHelper("settings", prefsHelper);
-		
-/*		meditationHelper = new MeditationBackupHelper();
-		addHelper("meditations", meditationHelper);*/
-		
-
-		List<String> files = new ArrayList<String>();
-		files.add("../databases/" + PracticeDatabase.DBNAME);
-		
-		File filesDir = getFilesDir();
-		for (File f : filesDir.listFiles()) {
-			files.add(f.getAbsolutePath());
-		}
-
-		FileBackupHelper dbData = new FileBackupHelper(this,
-			    (String[])files.toArray());
+
+		dbData = new AllFilesBackupHelper(this);
 		addHelper(PracticeDatabase.DBNAME, dbData);
 	}
+
+	@Override
+	public void onRestore(BackupDataInput data, int appVersionCode, ParcelFileDescriptor newState)
+			throws IOException {
+		super.onRestore(data, appVersionCode, newState);
+	}
+	
+	
 }
diff --git a/MeditationTracker/src/com/meditationtracker/sync/backup/BackupManagerWrapper.java b/MeditationTracker/src/com/meditationtracker/sync/backup/BackupManagerWrapper.java
index b79b546..2e211cc 100755
--- a/MeditationTracker/src/com/meditationtracker/sync/backup/BackupManagerWrapper.java
+++ b/MeditationTracker/src/com/meditationtracker/sync/backup/BackupManagerWrapper.java
@@ -10,6 +10,7 @@ public class BackupManagerWrapper {
 	public BackupManagerWrapper(Context context) {
 		try {
 			instance = new RealBackupManager(context);
+			Log.d("MTRK", "Can do backup ops");
 		}catch (VerifyError e) {
 			Log.d("MTRK", "Will skip backup ops");
 			instance = new DummyBackupManager(context);
diff --git a/MeditationTracker/src/com/meditationtracker/sync/backup/MeditationBackupHelper.java b/MeditationTracker/src/com/meditationtracker/sync/backup/MeditationBackupHelper.java
deleted file mode 100755
index e31bde7..0000000
--- a/MeditationTracker/src/com/meditationtracker/sync/backup/MeditationBackupHelper.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.meditationtracker.sync.backup;
-
-import android.app.backup.BackupAgentHelper;
-import android.app.backup.BackupDataInputStream;
-import android.app.backup.BackupDataOutput;
-import android.app.backup.BackupHelper;
-import android.os.ParcelFileDescriptor;
-
-public class MeditationBackupHelper extends BackupAgentHelper implements BackupHelper {
-
-	public MeditationBackupHelper() {
-	}
-
-	@Override
-	public void performBackup(ParcelFileDescriptor arg0, BackupDataOutput arg1, ParcelFileDescriptor arg2) {
-		// TODO Auto-generated method stub
-
-	}
-
-	@Override
-	public void restoreEntity(BackupDataInputStream arg0) {
-		// TODO Auto-generated method stub
-
-	}
-
-	@Override
-	public void writeNewStateDescription(ParcelFileDescriptor arg0) {
-		// TODO Auto-generated method stub
-
-	}
-
-}
diff --git a/MeditationTracker/src/com/meditationtracker/sync/backup/RealBackupManager.java b/MeditationTracker/src/com/meditationtracker/sync/backup/RealBackupManager.java
index c5b8325..d97eb42 100755
--- a/MeditationTracker/src/com/meditationtracker/sync/backup/RealBackupManager.java
+++ b/MeditationTracker/src/com/meditationtracker/sync/backup/RealBackupManager.java
@@ -3,6 +3,7 @@
 import android.app.backup.BackupManager;
 import android.app.backup.RestoreObserver;
 import android.content.Context;
+import android.util.Log;
 
 public class RealBackupManager implements IBackupManager {
 	private BackupManager instance;
@@ -14,6 +15,7 @@ public RealBackupManager(Context context) {
 	@Override
 	public void dataChanged() {
 		instance.dataChanged();
+		Log.d("MTRK", "Asked backup ops");
 	}
 
 	@Override
diff --git a/dootil/res/layout/main.xml b/dootil/res/layout/main.xml
deleted file mode 100644
index 3a5f117..0000000
--- a/dootil/res/layout/main.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    >
-<TextView  
-    android:layout_width="fill_parent" 
-    android:layout_height="wrap_content" 
-    android:text="@string/hello"
-    />
-</LinearLayout>