diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1694e2e2..bb1cfa0f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="info.xuluan.podcastj"  android:versionName="1.1.0"
-	android:versionCode="101">
+    	package="info.xuluan.podcastj"
+    	android:versionName="1.1.0.101"
+		android:versionCode="101">
       
 	<uses-sdk android:minSdkVersion="3" android:targetSdkVersion="4" />
       
-
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -18,7 +18,8 @@
 		android:normalScreens="true" android:smallScreens="true"
 		android:anyDensity="true" />
 	
-    <application android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="false">
+    <application android:icon="@drawable/icon"
+        	android:label="@string/app_name">
         <uses-library android:name="android.test.runner" />
 	
         <activity android:name="info.xuluan.podcast.StartupActivity" android:label="@string/app_name">
@@ -43,13 +44,13 @@
                 <data android:mimeType="vnd.android.cursor.item/vnd.xuluan.podcast.item" />
 
                 <category android:name="android.intent.category.DEFAULT" />
-           </intent-filter>        
-        
+           </intent-filter>               
         </activity>
         <activity android:name="info.xuluan.podcast.PlayerActivity" android:label="@string/app_name">
         </activity>
         
-        <activity android:name="info.xuluan.podcast.SearchActivity" android:label="@string/app_name"></activity>
+        <activity android:name="info.xuluan.podcast.SearchActivity" android:label="@string/app_name">
+        </activity>
         
         <activity android:name="info.xuluan.podcast.ChannelActivity" android:label="@string/app_name">
             <intent-filter>
diff --git a/COPYRIGHT b/COPYRIGHT
index 56a893b2..505cbc4f 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
-April 21, 2012
+September 4, 2012
 
 The following copyright notice applies to all files in this distribution
-except as noted in individual files.
+except as noted below or in individual files.
 
   Copyright (c) 2012 Xuluan
 
@@ -20,3 +20,7 @@ except as noted in individual files.
 
 See the file LICENSE for the GNU GPL, version 2.
 
+----------
+
+The small icons in the misc/icons folder were created by me, Jim McBeath,
+and are hereby placed into the public domain.
diff --git a/res/layout/add_a_channel.xml b/res/layout/add_a_channel.xml
index f6e21cee..44ab69c5 100644
--- a/res/layout/add_a_channel.xml
+++ b/res/layout/add_a_channel.xml
@@ -60,7 +60,7 @@
     </EditText>
 
     <LinearLayout
-        android:id="@+id/linearLayout1"
+        android:id="@+id/linearLayout2"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" >
 
diff --git a/res/layout/channel_details.xml b/res/layout/channel_details.xml
index 20b391a8..3b134ee8 100644
--- a/res/layout/channel_details.xml
+++ b/res/layout/channel_details.xml
@@ -5,15 +5,15 @@
     android:layout_height="fill_parent"
 
 >
-
+<!--
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:paddingBottom="5px"
-        android:paddingTop="5px" >
+        android:paddingBottom="5dp"
+        android:paddingTop="5pdp" >
     </LinearLayout>
-
+-->
 	<ScrollView 
 		android:id="@+id/readscrollview" 
 		android:orientation="vertical" 
@@ -58,11 +58,11 @@
 		            android:id="@+id/last_updated_view"
 		            android:layout_width="match_parent"
 		            android:layout_height="wrap_content"
-		            android:layout_marginBottom="5px"
+		            android:layout_marginBottom="5dp"
 		            android:layout_weight="1"
 		            android:background="@drawable/lighter_gray"
 		            android:gravity="left"
-		            android:paddingRight="10px"
+		            android:paddingRight="10dp"
 		            android:textColor="@drawable/black"
 		            android:textSize="12sp" />
 
@@ -70,11 +70,11 @@
 		            android:id="@+id/last_item_updated_view"
 		            android:layout_width="match_parent"
 		            android:layout_height="wrap_content"
-		            android:layout_marginBottom="5px"
+		            android:layout_marginBottom="5dp"
 		            android:layout_weight="1"
 		            android:background="@drawable/lighter_gray"
 		            android:gravity="right"
-		            android:paddingRight="10px"
+		            android:paddingRight="10dp"
 		            android:textColor="@drawable/black"
 		            android:textSize="12sp"/>
 
@@ -90,19 +90,26 @@
 		            android:layout_width="match_parent"
 		            android:layout_height="wrap_content"
 		            android:layout_weight="1"
-		            android:background="@drawable/lighter_gray" android:gravity="left" android:textColor="@drawable/black" android:textSize="12sp" android:layout_marginBottom="5px" android:paddingRight="10px" android:text="fail count"/>
+		            android:background="@drawable/lighter_gray"
+		            android:gravity="left"
+		            android:textColor="@drawable/black"
+		            android:textSize="12sp"
+		            android:layout_marginBottom="5dp"
+		            android:paddingRight="10dp"
+		            android:text="fail count"/>
 		
 		        <TextView
 		            android:id="@+id/auto_download_view"
 		            android:layout_width="match_parent"
 		            android:layout_height="wrap_content"
-		            android:layout_marginBottom="5px"
+		            android:layout_marginBottom="5dp"
 		            android:layout_weight="1"
 		            android:background="@drawable/lighter_gray"
 		            android:gravity="right"
-		            android:paddingRight="10px"
+		            android:paddingRight="10dp"
 		            android:textColor="@drawable/black"
-		            android:textSize="12sp" android:text="auto download"/>
+		            android:textSize="12sp"
+		            android:text="auto download"/>
 		    </LinearLayout>
 
 		    <TextView
diff --git a/res/layout/channel_list_item.xml b/res/layout/channel_list_item.xml
index 2a6b7b30..f896c119 100644
--- a/res/layout/channel_list_item.xml
+++ b/res/layout/channel_list_item.xml
@@ -4,8 +4,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:orientation="horizontal" 
 	android:layout_width="fill_parent"
-	android:paddingTop="10px"
-	android:paddingBottom="10px"
+	android:paddingTop="10dp"
+	android:paddingBottom="10dp"
 	android:layout_height="wrap_content">
 
 	
@@ -14,10 +14,10 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
         android:layout_alignParentBottom="true"	
- 		android:layout_marginRight="5px"   
- 		android:layout_marginLeft="5px"        	
+ 		android:layout_marginRight="5dp"   
+ 		android:layout_marginLeft="0dp"        	
         android:layout_gravity="center_vertical"
-        android:layout_width="24px"
+        android:layout_width="24dp"
         android:layout_height="fill_parent"/>	
 			
     <ImageView android:id="@+id/keep_icon" 
@@ -25,16 +25,16 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
         android:layout_alignParentBottom="true"	
- 		android:layout_marginRight="5px"   
- 		android:layout_marginLeft="5px"        	
+ 		android:layout_marginRight="5dp"   
+ 		android:layout_marginLeft="0dp"        	
         android:layout_gravity="center_vertical"
-        android:layout_width="24px"
+        android:layout_width="24dp"
         android:layout_height="fill_parent"/>	
 			
 	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
-	 		android:layout_marginRight="20px"					
+	 		android:layout_marginRight="20dp"					
 		android:orientation="vertical">
 	
 			
diff --git a/res/layout/download.xml b/res/layout/download.xml
index a788614d..1002becc 100644
--- a/res/layout/download.xml
+++ b/res/layout/download.xml
@@ -49,7 +49,7 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
 		android:background="@drawable/darker_gray"
-		android:layout_marginBottom="2px">
+		android:layout_marginBottom="2dp">
 
 			
 			<TextView  android:id="@+id/title"
@@ -76,13 +76,13 @@
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
 			android:max="100"
- 		android:layout_marginRight="20px"   
- 		android:layout_marginLeft="20px"  
-		android:layout_marginBottom="10px"		
+ 		android:layout_marginRight="20dp"   
+ 		android:layout_marginLeft="20dp"  
+		android:layout_marginBottom="10dp"		
 		/>
 		<TextView  android:id="@+id/dtexta"
 		android:layout_width="fill_parent"
-		android:layout_height="1px"
+		android:layout_height="1dp"
 		android:background="@drawable/white" />		
    	</LinearLayout>
     
diff --git a/res/layout/download_item.xml b/res/layout/download_item.xml
index 6a6e979c..009af947 100644
--- a/res/layout/download_item.xml
+++ b/res/layout/download_item.xml
@@ -6,44 +6,44 @@
 	android:layout_width="fill_parent"
 	
 		android:layout_height="wrap_content">
-
-	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-		android:layout_width="24px"
-		android:layout_height="48px"
-	 	android:layout_marginRight="5px"					
+

+	<LinearLayout
+	    xmlns:android="http://schemas.android.com/apk/res/android"
+	    android:layout_width="wrap_content"
+	    android:layout_height="48dp"
 	    android:layout_gravity="center_vertical"
-		android:orientation="vertical">	
+	    android:layout_marginRight="5dp"
+	    android:orientation="vertical" >
 	
 	    <ImageView android:id="@+id/icon" 
 	        android:src="@drawable/waiting"
 	        android:layout_alignParentLeft="true"
 	        android:layout_alignParentTop="true"
 	        android:layout_alignParentBottom="true"	
-	 		android:layout_marginRight="5px"   
-	 		android:layout_marginLeft="5px"        	
+	 		android:layout_marginRight="5dp"   
+	 		android:layout_marginLeft="0dp"        	
 	        android:layout_gravity="center_vertical"
-	        android:layout_width="24px"
-	        android:layout_height="24px"/>	
+	        android:layout_width="24dp"
+	        android:layout_height="24dp"/>	
 
 	    <ImageView android:id="@+id/keep_icon" 
 	        android:src="@drawable/blank"
 	        android:layout_alignParentLeft="true"
 	        android:layout_alignParentTop="true"
 	        android:layout_alignParentBottom="true"	
-	 		android:layout_marginRight="5px"   
-	 		android:layout_marginLeft="5px"        	
+	 		android:layout_marginRight="5dp"   
+	 		android:layout_marginLeft="0dp"        	
 	        android:layout_gravity="center_vertical"
-	        android:layout_width="24px"
-	        android:layout_height="24px"/>	
+	        android:layout_width="24dp"
+	        android:layout_height="24dp"/>	
 
 	</LinearLayout>
 				
 	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
-	 		android:layout_marginRight="20px"					
-		android:orientation="vertical">
-	
+	 	android:layout_marginRight="20dp"					
+		android:orientation="vertical">	
 			
 		<TextView android:id="@+id/dtext1"
             android:ellipsize="end"
@@ -52,30 +52,23 @@
             android:layout_gravity="center_vertical"
 			android:textSize="16sp"
 			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"/>
-
-
-
-			
+			android:layout_height="wrap_content"/>			
 			
-			<TextView  android:id="@+id/dtext2"
+		<TextView  android:id="@+id/dtext2"
 			android:textSize="14sp"
 			android:layout_width="fill_parent"
-			android:layout_height="1px"
+			android:layout_height="1dp"
 			android:gravity="left"
             android:singleLine="true"            			
 			android:layout_weight="1"/>
 
-			<TextView  android:id="@+id/dtext3"
+		<TextView  android:id="@+id/dtext3"
 			android:textSize="14sp"
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
 			android:gravity="right"
             android:singleLine="true"            			
-			android:layout_weight="2"/>
-			
-
-			
+			android:layout_weight="2"/>			
 
 	</LinearLayout>
 
diff --git a/res/layout/list_item.xml b/res/layout/list_item.xml
index 5c152c65..31cdb925 100644
--- a/res/layout/list_item.xml
+++ b/res/layout/list_item.xml
@@ -8,9 +8,9 @@
 		android:layout_height="wrap_content">
 
 	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-		android:layout_width="24px"
-		android:layout_height="48px"
-	 	android:layout_marginRight="5px"					
+		android:layout_width="24dp"
+		android:layout_height="48dp"
+	 	android:layout_marginRight="5dp"					
 	    android:layout_gravity="center_vertical"
 		android:orientation="vertical">
 	
@@ -19,33 +19,33 @@
 	        android:layout_alignParentLeft="true"
 	        android:layout_alignParentTop="true"
 	        android:layout_alignParentBottom="true"	
-	 		android:layout_marginRight="5px"   
-	 		android:layout_marginLeft="0px"        	
-	 		android:layout_marginTop="0px"        	
-	 		android:layout_marginBottom="0px"        	
+	 		android:layout_marginRight="5dp"   
+	 		android:layout_marginLeft="0dp"        	
+	 		android:layout_marginTop="0dp"        	
+	 		android:layout_marginBottom="0dp"        	
 	        android:layout_gravity="center_vertical"
-	        android:layout_width="24px"
-	        android:layout_height="24px"/>	
+	        android:layout_width="24dp"
+	        android:layout_height="24dp"/>	
 	 
 	    <ImageView android:id="@+id/keep_icon" 
 	        android:src="@drawable/blank"
 	        android:layout_alignParentLeft="true"
 	        android:layout_alignParentTop="true"
 	        android:layout_alignParentBottom="true"	
-	 		android:layout_marginRight="0px"   
-	 		android:layout_marginLeft="0px"        	
-	 		android:layout_marginTop="2px"        	
-	 		android:layout_marginBottom="0px"        	
+	 		android:layout_marginRight="0dp"   
+	 		android:layout_marginLeft="0dp"        	
+	 		android:layout_marginTop="2dp"        	
+	 		android:layout_marginBottom="0dp"        	
 	        android:layout_gravity="center_vertical"
-	        android:layout_width="24px"
-	        android:layout_height="24px"/>	
+	        android:layout_width="24dp"
+	        android:layout_height="24dp"/>	
 
 	</LinearLayout>	
 		
 	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
-	 		android:layout_marginRight="20px"					
+	 		android:layout_marginRight="20dp"					
 		android:orientation="vertical">
 	
 			
diff --git a/res/layout/read.xml b/res/layout/read.xml
index b38048ff..42d99e3d 100644
--- a/res/layout/read.xml
+++ b/res/layout/read.xml
@@ -9,8 +9,8 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:paddingBottom="5px"
-        android:paddingTop="15px" >
+        android:paddingBottom="5dp"
+        android:paddingTop="15dp" >
 
         <Button
             android:id="@+id/ButtonPlay"
@@ -62,15 +62,25 @@
 
 		            <ImageView
 		                android:id="@+id/status_icon"
-		                android:layout_width="24px"
-		                android:layout_height="24px"
-		                android:src="@drawable/status_unknown" android:layout_marginBottom="0px" android:layout_marginTop="8px" android:layout_marginLeft="0px" android:layout_marginRight="5px" android:layout_gravity="center_vertical"/>
+		                android:layout_width="24dp"
+		                android:layout_height="24dp"
+		                android:src="@drawable/status_unknown"
+		                android:layout_marginBottom="0dp"
+		                android:layout_marginTop="8dp"
+		                android:layout_marginLeft="0dp"
+		                android:layout_marginRight="5dp"
+		                android:layout_gravity="center_vertical"/>
 
 		            <ImageView
 		                android:id="@+id/keep_icon"
-		                android:layout_width="24px"
-		                android:layout_height="24px"
-		                android:src="@drawable/blank" android:layout_gravity="center_vertical" android:layout_marginBottom="5px" android:layout_marginLeft="0px" android:layout_marginRight="5px" android:layout_marginTop="6px"/>
+		                android:layout_width="24dp"
+		                android:layout_height="24dp"
+		                android:src="@drawable/blank"
+		                android:layout_gravity="center_vertical"
+		                android:layout_marginBottom="5dp"
+		                android:layout_marginLeft="0dp"
+		                android:layout_marginRight="5dp"
+		                android:layout_marginTop="6dp"/>
 
 		        </LinearLayout>
 
@@ -91,11 +101,11 @@
 		            android:id="@+id/time_view"
 		            android:layout_width="match_parent"
 		            android:layout_height="wrap_content"
-		            android:layout_marginBottom="5px"
+		            android:layout_marginBottom="5dp"
 		            android:layout_weight="0.8"
 		            android:background="@drawable/lighter_gray"
 		            android:gravity="left"
-		            android:paddingRight="10px"
+		            android:paddingRight="10dp"
 		            android:textColor="@drawable/black"
 		            android:textSize="12sp" />
 
@@ -104,17 +114,22 @@
 		            android:layout_width="match_parent"
 		            android:layout_height="wrap_content"
 		            android:layout_weight="1"
-		            android:background="@drawable/lighter_gray" android:gravity="left" android:textColor="@drawable/black" android:textSize="12sp" android:layout_marginBottom="5px" android:paddingRight="10px"/>
+		            android:background="@drawable/lighter_gray"
+		            android:gravity="left"
+		            android:textColor="@drawable/black"
+		            android:textSize="12sp"
+		            android:layout_marginBottom="5dp"
+		            android:paddingRight="10dp"/>
 		
 		        <TextView
 		            android:id="@+id/duration_view"
 		            android:layout_width="match_parent"
 		            android:layout_height="wrap_content"
-		            android:layout_marginBottom="5px"
+		            android:layout_marginBottom="5dp"
 		            android:layout_weight="1"
 		            android:background="@drawable/lighter_gray"
 		            android:gravity="right"
-		            android:paddingRight="10px"
+		            android:paddingRight="10dp"
 		            android:textColor="@drawable/black"
 		            android:textSize="12sp" />
 		    </LinearLayout>
diff --git a/res/layout/select_item.xml b/res/layout/select_item.xml
index 764005bd..9c45438a 100644
--- a/res/layout/select_item.xml
+++ b/res/layout/select_item.xml
@@ -13,8 +13,8 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
         android:layout_alignParentBottom="true"	
- 		android:layout_marginRight="20px"   
- 		android:layout_marginLeft="30px"        	
+ 		android:layout_marginRight="20dp"   
+ 		android:layout_marginLeft="30dp"        	
         android:layout_gravity="center_vertical"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>	
diff --git a/res/layout/startup.xml b/res/layout/startup.xml
index 051ecefb..a818ce95 100644
--- a/res/layout/startup.xml
+++ b/res/layout/startup.xml
@@ -8,13 +8,18 @@
         android:id="@+id/iconButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:drawableTop="@drawable/icon" android:background="@drawable/blank" android:layout_gravity="center_horizontal" android:layout_marginTop="150px"/>
+        android:drawableTop="@drawable/icon"
+        android:background="@drawable/blank"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="150dp"/>
 
     <TextView
         android:id="@+id/textView1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Hapi Podcast J"
-        android:textAppearance="?android:attr/textAppearanceLarge" android:layout_gravity="center_horizontal" android:layout_marginTop="100px"/>
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="100dp"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/subs.xml b/res/layout/subs.xml
index ce88dbff..15707278 100644
--- a/res/layout/subs.xml
+++ b/res/layout/subs.xml
@@ -9,31 +9,54 @@
     <LinearLayout
         android:id="@+id/linearLayout1"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" android:paddingBottom="0dip" android:paddingTop="3dip" android:layout_marginBottom="0dip" android:layout_weight="0">
+        android:layout_height="wrap_content"
+        android:paddingBottom="0dip"
+        android:paddingTop="3dip"
+        android:layout_marginBottom="0dip"
+        android:layout_weight="0">
 
         <Button
             android:id="@+id/channel_bar_search_button"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="@string/channel_bar_button_search" android:background="#FFC0C0C0" android:layout_gravity="bottom" android:height="30dip" android:layout_width="fill_parent"/>
+            android:text="@string/channel_bar_button_search"
+            android:background="#FFC0C0C0"
+            android:layout_gravity="bottom"
+            android:height="30dip"
+            android:layout_width="fill_parent"/>
 
         <Button
             android:id="@+id/channel_bar_add_button"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="@string/channel_bar_button_add" android:layout_gravity="bottom" android:background="#FFC0C0C0" android:height="30dip" android:layout_marginLeft="2dip" android:layout_width="fill_parent"/>
+            android:text="@string/channel_bar_button_add"
+            android:layout_gravity="bottom"
+            android:background="#FFC0C0C0"
+            android:height="30dip"
+            android:layout_marginLeft="2dip"
+            android:layout_width="fill_parent"/>
 
         <Button
             android:id="@+id/channel_bar_manage_button"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="@string/channel_bar_button_manage" android:layout_gravity="bottom" android:background="#FFFFFFFF" android:height="30dip" android:layout_marginLeft="2dip" android:layout_width="fill_parent"/>
+            android:text="@string/channel_bar_button_manage"
+            android:layout_gravity="bottom"
+            android:background="#FFFFFFFF"
+            android:height="30dip"
+            android:layout_marginLeft="2dip"
+            android:layout_width="fill_parent"/>
 
         <Button
             android:id="@+id/channel_bar_backup_button"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="@string/channel_bar_button_backup" android:layout_gravity="bottom" android:background="#FFC0C0C0" android:height="30dip" android:layout_marginLeft="2dip" android:layout_width="fill_parent"/>
+            android:text="@string/channel_bar_button_backup"
+            android:layout_gravity="bottom"
+            android:background="#FFC0C0C0"
+            android:height="30dip"
+            android:layout_marginLeft="2dip"
+            android:layout_width="fill_parent"/>
 
     </LinearLayout>
 
@@ -42,7 +65,8 @@
         android:layout_width="match_parent"
         android:layout_height="5dip"
         android:layout_weight="0"
-        android:background="#FFFFFFFF" android:layout_marginBottom="3dip">
+        android:background="#FFFFFFFF"
+        android:layout_marginBottom="3dip">
 
     </FrameLayout>