diff --git a/.gitignore b/.gitignore
index c0d48967..d0dea242 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ local.properties
 .classpath
 .project
 .settings/
+.local.properties
diff --git a/core/AndroidManifest.xml b/core/AndroidManifest.xml
index 85da4081..c624bf2f 100644
--- a/core/AndroidManifest.xml
+++ b/core/AndroidManifest.xml
@@ -17,11 +17,11 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="org.transdroid.core"
-	android:versionCode="208"
-	android:versionName="2.0.2" >
+	android:versionCode="209"
+	android:versionName="2.1.0" >
 
 	<uses-sdk
 		android:minSdkVersion="7"
-		android:targetSdkVersion="18" />
+		android:targetSdkVersion="19" />
 
 </manifest>
diff --git a/core/build.xml b/core/build.xml
index 2371fdcc..8b8ed6ac 100644
--- a/core/build.xml
+++ b/core/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="TransdroidCore" default="help">
+<project name="Transdroid Core" default="help">
 
     <!-- The local.properties file is created and updated by the 'android' tool.
          It contains the path to the SDK. It should *NOT* be checked into
diff --git a/core/local.properties b/core/local.properties
deleted file mode 100644
index 47f704fe..00000000
--- a/core/local.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must *NOT* be checked into Version Control Systems,
-# as it contains information specific to your local configuration.
-
-# location of the SDK. This is only used by Ant
-# For customization when using a Version Control System, please read the
-# header note.
-sdk.dir=/home/eric/Dev/android-sdk
diff --git a/core/res/values/changelog.xml b/core/res/values/changelog.xml
index b0a719a4..9e379036 100644
--- a/core/res/values/changelog.xml
+++ b/core/res/values/changelog.xml
@@ -17,6 +17,17 @@
 -->
 <resources>
 <string name="system_changelog">
+Transdroid 2.1.0\n
+- uTorrent and Transmission connection stability improvements\n
+- uTorrent and Deluge force data recheck\n
+- Sort by download speed\n
+- Server stats and pause/resume all actions on widget\n
+- Option to treat formant (0KB/s) torrents as inactive\n
+- Option for local port setting\n
+- Fix for Torrentflux-b4rt installs in root\n
+- Torrent and file selection improvements\n
+- Many other small bug fixes\n
+\n
 Transdroid 2.0.2\n
 - Connection improvements for Bitflu and rTorrent\n
 - Option to disable authentication\n
diff --git a/core/src/org/transdroid/core/widget/ListWidgetProvider.java b/core/src/org/transdroid/core/widget/ListWidgetProvider.java
index 68ad50bc..e3cd0242 100644
--- a/core/src/org/transdroid/core/widget/ListWidgetProvider.java
+++ b/core/src/org/transdroid/core/widget/ListWidgetProvider.java
@@ -19,10 +19,9 @@ package org.transdroid.core.widget;
 import org.androidannotations.annotations.Bean;
 import org.androidannotations.annotations.EReceiver;
 import org.transdroid.core.R;
-import org.transdroid.core.app.settings.ApplicationSettings;
-import org.transdroid.core.app.settings.ApplicationSettings_;
+import org.transdroid.core.app.settings.*;
 import org.transdroid.core.app.settings.ServerSetting;
-import org.transdroid.core.gui.TorrentsActivity_;
+import org.transdroid.core.gui.*;
 import org.transdroid.core.gui.log.Log;
 import org.transdroid.core.service.ControlService;
 
diff --git a/external/ActionBar-PullToRefresh-actionbarsherlock/project.properties b/external/ActionBar-PullToRefresh-actionbarsherlock/project.properties
index 367cb5d5..3ec13241 100644
--- a/external/ActionBar-PullToRefresh-actionbarsherlock/project.properties
+++ b/external/ActionBar-PullToRefresh-actionbarsherlock/project.properties
@@ -11,7 +11,7 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-18
+target=android-19
 android.library=true
 android.library.reference.1=../ActionBar-PullToRefresh
 android.library.reference.2=../JakeWharton-ActionBarSherlock/library
diff --git a/external/ActionBar-PullToRefresh/project.properties b/external/ActionBar-PullToRefresh/project.properties
index 1b8c5a34..91d2b024 100644
--- a/external/ActionBar-PullToRefresh/project.properties
+++ b/external/ActionBar-PullToRefresh/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-18
+target=android-19
 android.library=true
diff --git a/external/ColorPickerPreference/build.xml b/external/ColorPickerPreference/build.xml
index 1b4d11f9..c575c550 100644
--- a/external/ColorPickerPreference/build.xml
+++ b/external/ColorPickerPreference/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="ActionBar-PullToRefresh" default="help">
+<project name="ColorPickerPreference" default="help">
 
     <!-- The local.properties file is created and updated by the 'android' tool.
          It contains the path to the SDK. It should *NOT* be checked into
diff --git a/external/ColorPickerPreference/local.properties b/external/ColorPickerPreference/local.properties
deleted file mode 100644
index 47f704fe..00000000
--- a/external/ColorPickerPreference/local.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must *NOT* be checked into Version Control Systems,
-# as it contains information specific to your local configuration.
-
-# location of the SDK. This is only used by Ant
-# For customization when using a Version Control System, please read the
-# header note.
-sdk.dir=/home/eric/Dev/android-sdk
diff --git a/external/Crouton/library/local.properties b/external/Crouton/library/local.properties
deleted file mode 100644
index 47f704fe..00000000
--- a/external/Crouton/library/local.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must *NOT* be checked into Version Control Systems,
-# as it contains information specific to your local configuration.
-
-# location of the SDK. This is only used by Ant
-# For customization when using a Version Control System, please read the
-# header note.
-sdk.dir=/home/eric/Dev/android-sdk
diff --git a/external/JakeWharton-ActionBarSherlock/library/local.properties b/external/JakeWharton-ActionBarSherlock/library/local.properties
deleted file mode 100644
index 47f704fe..00000000
--- a/external/JakeWharton-ActionBarSherlock/library/local.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must *NOT* be checked into Version Control Systems,
-# as it contains information specific to your local configuration.
-
-# location of the SDK. This is only used by Ant
-# For customization when using a Version Control System, please read the
-# header note.
-sdk.dir=/home/eric/Dev/android-sdk
diff --git a/full/AndroidManifest.xml b/full/AndroidManifest.xml
index da9ffc01..26b62da5 100644
--- a/full/AndroidManifest.xml
+++ b/full/AndroidManifest.xml
@@ -18,12 +18,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	package="org.transdroid.full"
-	android:versionCode="208"
-	android:versionName="2.0.2" >
+	android:versionCode="209"
+	android:versionName="2.1.0" >
 
 	<uses-sdk
 		android:minSdkVersion="7"
-		android:targetSdkVersion="18" />
+		android:targetSdkVersion="19" />
 
 	<supports-screens
 		android:anyDensity="true"
diff --git a/full/ant.properties b/full/ant.properties
index 73de9ff3..bc0328fa 100644
--- a/full/ant.properties
+++ b/full/ant.properties
@@ -1,2 +1,2 @@
-key.store=/home/eric/Dev/erickok.keystore
+key.store=../..//erickok.keystore
 key.alias=transdroid
diff --git a/full/build.xml b/full/build.xml
index d107dd47..5fc86b9f 100644
--- a/full/build.xml
+++ b/full/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="TransdroidFull" default="help">
+<project name="Transdroid Full" default="help">
 
     <!-- The local.properties file is created and updated by the 'android' tool.
          It contains the path to the SDK. It should *NOT* be checked into
diff --git a/full/local.properties b/full/local.properties
deleted file mode 100644
index 47f704fe..00000000
--- a/full/local.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must *NOT* be checked into Version Control Systems,
-# as it contains information specific to your local configuration.
-
-# location of the SDK. This is only used by Ant
-# For customization when using a Version Control System, please read the
-# header note.
-sdk.dir=/home/eric/Dev/android-sdk
diff --git a/lite/AndroidManifest.xml b/lite/AndroidManifest.xml
index f9c940f1..a64f4e43 100644
--- a/lite/AndroidManifest.xml
+++ b/lite/AndroidManifest.xml
@@ -18,12 +18,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	package="org.transdroid.lite"
-	android:versionCode="208"
-	android:versionName="2.0.2" >
+	android:versionCode="209"
+	android:versionName="2.1.0" >
 
 	<uses-sdk
 		android:minSdkVersion="7"
-		android:targetSdkVersion="18" />
+		android:targetSdkVersion="19" />
 
 	<supports-screens
 		android:anyDensity="true"
diff --git a/lite/ant.properties b/lite/ant.properties
index 73de9ff3..5931745c 100644
--- a/lite/ant.properties
+++ b/lite/ant.properties
@@ -1,2 +1,2 @@
-key.store=/home/eric/Dev/erickok.keystore
+key.store=../../erickok.keystore
 key.alias=transdroid
diff --git a/lite/build.xml b/lite/build.xml
index 4c6bb744..d3518816 100644
--- a/lite/build.xml
+++ b/lite/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="Transdrone" default="help">
+<project name="Transdroid Lite" default="help">
 
     <!-- The local.properties file is created and updated by the 'android' tool.
          It contains the path to the SDK. It should *NOT* be checked into