diff --git a/metadata/com.android.launcher3.txt b/metadata/com.android.launcher3.txt
index c3ff41e4c5..d4839dc6cd 100644
--- a/metadata/com.android.launcher3.txt
+++ b/metadata/com.android.launcher3.txt
@@ -17,7 +17,7 @@ Build:1.0,1
     commit=android-4.4_r1.2
     init=sed -i '/LauncherBackup/d' src/com/android/launcher3/LauncherProvider.java && \
         rm src/com/android/launcher3/LauncherBackup* && \
-        echo -e 'target=android-19\nproguard.config=$$SDK$$/tools/proguard/proguard-android.txt:proguard.flags' >  project.properties
+        echo -e 'target=android-19\nproguard.config=$$SDK$$/tools/proguard/proguard-android.txt:proguard.flags' > project.properties
     extlibs=android/android-support-v4.jar
     patch=manifest-minsdk_1.patch
 
diff --git a/metadata/com.androsz.electricsleepbeta.txt b/metadata/com.androsz.electricsleepbeta.txt
index 013b4aac04..5fc109e7c2 100644
--- a/metadata/com.androsz.electricsleepbeta.txt
+++ b/metadata/com.androsz.electricsleepbeta.txt
@@ -30,7 +30,7 @@ Build:1.1.1,50
         sed -i '116s/android/android.apps/g;244s/true/false/g' pom.xml && \
         cd $$NoAnalytics$$ && \
         zip -r NoAnalytics.apklib *
-    build=$$MVN3$$ install:install-file    -Dfile=$$NoAnalytics$$/NoAnalytics.apklib    -DgroupId=com.google.android.apps    -DartifactId=analytics    -Dversion=0.0.1    -Dpackaging=apklib
+    build=$$MVN3$$ install:install-file -Dfile=$$NoAnalytics$$/NoAnalytics.apklib -DgroupId=com.google.android.apps -DartifactId=analytics -Dversion=0.0.1 -Dpackaging=apklib
 
 Auto Update Mode:None
 #Tags are for development
diff --git a/metadata/com.dougkeen.bart.txt b/metadata/com.dougkeen.bart.txt
index 9737e522c0..2167df24d3 100644
--- a/metadata/com.dougkeen.bart.txt
+++ b/metadata/com.dougkeen.bart.txt
@@ -34,8 +34,8 @@ Build:2.2,26
         sed -i 's@\(.2=\).*@\1$$HoloEverywhere-DougKeen$$@' project.properties && \
         sed -i 's@\(.3=\).*@\1$$NineOldAndroids$$@' project.properties && \
         sed -i 's@\(.4=\).*@\1$$NumberPicker-DougKeen$$@' project.properties && \
-        sed -i 's@\(.1=\).*@\1../../$$ActionBarSherlock$$@'          $$HoloEverywhere-DougKeen$$/project.properties && \
-        echo "android.library.reference.1=../../$$HoloEverywhere-DougKeen$$" >>          $$NumberPicker-DougKeen$$/project.properties
+        sed -i 's@\(.1=\).*@\1../../$$ActionBarSherlock$$@' $$HoloEverywhere-DougKeen$$/project.properties && \
+        echo "android.library.reference.1=../../$$HoloEverywhere-DougKeen$$" >> $$NumberPicker-DougKeen$$/project.properties
 
 Auto Update Mode:None
 Update Check Mode:Tags
diff --git a/metadata/com.example.android.maxpapers.txt b/metadata/com.example.android.maxpapers.txt
index ae81a460f4..eae57050c3 100644
--- a/metadata/com.example.android.maxpapers.txt
+++ b/metadata/com.example.android.maxpapers.txt
@@ -17,11 +17,11 @@ Repo:https://lcarswallpaper.googlecode.com/svn/trunk/lcarswallpaper
 # The manifest has no version code, so let's use the SVN revision number.
 Build:1.0.2,35
     commit=35
-    prebuild=sed -i -r 's/(android:versionName)/android:versionCode="35" \1/'  AndroidManifest.xml
+    prebuild=sed -i -r 's/(android:versionName)/android:versionCode="35" \1/' AndroidManifest.xml
 
 Build:1.1.1,46
     commit=46
-    prebuild=sed -i -r 's/(android:versionName)/android:versionCode="46" \1/'  AndroidManifest.xml
+    prebuild=sed -i -r 's/(android:versionName)/android:versionCode="46" \1/' AndroidManifest.xml
 
 Auto Update Mode:None
 Update Check Mode:None
diff --git a/metadata/com.gulshansingh.hackerlivewallpaper.txt b/metadata/com.gulshansingh.hackerlivewallpaper.txt
index 4e122f8746..2d2f1b76bc 100644
--- a/metadata/com.gulshansingh.hackerlivewallpaper.txt
+++ b/metadata/com.gulshansingh.hackerlivewallpaper.txt
@@ -23,9 +23,9 @@ Build:1.6.1,8
     prebuild=sed -i 's@\(.1=\).*@\1$$HoloEverywhere$$@' project.properties && \
         sed -i 's@\(.2=\).*@\1$$ColorPicker-GSingh$$@' project.properties && \
         sed -i 's@\(.1=\).*@\1../HoloEverywhere/library@' $$ColorPicker-GSingh$$/project.properties && \
-        sed -i 's@\(.2=\).*@\1../HoloEverywhere/addons/preferences@'            $$ColorPicker-GSingh$$/project.properties && \
+        sed -i 's@\(.2=\).*@\1../HoloEverywhere/addons/preferences@' $$ColorPicker-GSingh$$/project.properties && \
         $$SDK$$/tools/android update project -p ../srclib/HoloEverywhere/addons/preferences && \
-        sed -i 's@\(.1=\).*@\1../../ABS-Prototik/actionbarsherlock@'            $$HoloEverywhere$$/project.properties && \
+        sed -i 's@\(.1=\).*@\1../../ABS-Prototik/actionbarsherlock@' $$HoloEverywhere$$/project.properties && \
         mv libs/android-support-v4.jar $$ABS-Prototik$$/libs/support-v4-18.0.1.jar
 
 Auto Update Mode:None
diff --git a/metadata/com.mareksebera.simpledilbert.txt b/metadata/com.mareksebera.simpledilbert.txt
index 7c11824650..63cf8d7d53 100644
--- a/metadata/com.mareksebera.simpledilbert.txt
+++ b/metadata/com.mareksebera.simpledilbert.txt
@@ -39,7 +39,7 @@ Build:3.6,29
         sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
         sed -i 's@\(reference.2=\).*@\1$$ImageLoader$$@' project.properties && \
         sed -i 's@\(reference.3=\).*@\1$$PhotoView$$@' project.properties && \
-        sed -i 's@\(reference.1=\).*@\1../../../srclib/ActionBarSherlock/actionbarsherlock@'             libraries/FileExplorer/project.properties
+        sed -i 's@\(reference.1=\).*@\1../../../srclib/ActionBarSherlock/actionbarsherlock@' libraries/FileExplorer/project.properties
 
 Build:3.7,30
     commit=v3.7
@@ -50,7 +50,7 @@ Build:3.7,30
         sed -i 's@\(reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && \
         sed -i 's@\(reference.2=\).*@\1$$ImageLoader$$@' project.properties && \
         sed -i 's@\(reference.3=\).*@\1$$PhotoView$$@' project.properties && \
-        sed -i 's@\(reference.1=\).*@\1../../../srclib/ActionBarSherlock/actionbarsherlock@'             libraries/FileExplorer/project.properties
+        sed -i 's@\(reference.1=\).*@\1../../../srclib/ActionBarSherlock/actionbarsherlock@' libraries/FileExplorer/project.properties
 
 Build:3.8,31
     commit=v3.8
diff --git a/metadata/com.nooskewl.bobby.txt b/metadata/com.nooskewl.bobby.txt
index f9b288be9a..eecda18c7e 100644
--- a/metadata/com.nooskewl.bobby.txt
+++ b/metadata/com.nooskewl.bobby.txt
@@ -36,7 +36,7 @@ Build:1.4.1,2
         cd ../allegro/ && \
         git checkout 5.1 && \
         cd build/ && \
-        cmake .. -DANDROID_NDK_TOOLCHAIN_ROOT=../../toolchain -DWANT_ANDROID=on -DWANT_EXAMPLES=OFF -DWANT_DEMO=OFF -DCMAKE_BUILD_TYPE=Debug -DFREETYPE_LIBRARY=../../freetype-2.4.10/builds/libfreetype.a -DFREETYPE_INCLUDE_DIR_freetype=../../freetype-2.4.10/include/freetype  -DFREETYPE_INCLUDE_DIR_ft2build=../../freetype-2.4.10/include && \
+        cmake .. -DANDROID_NDK_TOOLCHAIN_ROOT=../../toolchain -DWANT_ANDROID=on -DWANT_EXAMPLES=OFF -DWANT_DEMO=OFF -DCMAKE_BUILD_TYPE=Debug -DFREETYPE_LIBRARY=../../freetype-2.4.10/builds/libfreetype.a -DFREETYPE_INCLUDE_DIR_freetype=../../freetype-2.4.10/include/freetype -DFREETYPE_INCLUDE_DIR_ft2build=../../freetype-2.4.10/include && \
         make && \
         make install && \
         cd ../../ && \
diff --git a/metadata/de.jdsoft.law.txt b/metadata/de.jdsoft.law.txt
index 1012188f55..e1c014f6ac 100644
--- a/metadata/de.jdsoft.law.txt
+++ b/metadata/de.jdsoft.law.txt
@@ -16,16 +16,16 @@ Repo:https://github.com/jfreax/OpenLaw.git
 
 Build:0.5.1,8
     commit=0b9080bd4492
-    init=echo -e 'android.library=true\ntarget=android-16' >        extern/viewPageIndicator/project.properties && \
+    init=echo -e 'android.library=true\ntarget=android-16' > extern/viewPageIndicator/project.properties && \
         sed -i 's/Google Inc.:Google APIs:17/android-17/g'        extern/actionbarsherlock/project.properties && \
         rm -f extern/android-async-http/build.xml && \
         rm libs/support-v4-r7.jar
     target=android-18
-    prebuild=count=1;          for dir in extern/*/; do            echo "android.library.reference.$count=$dir" >> project.properties;            count=$(($count+1));            $$SDK$$/tools/android update project -p $dir;          done
+    prebuild=count=1; for dir in extern/*/; do echo "android.library.reference.$count=$dir" >> project.properties; count=$(($count+1)); $$SDK$$/tools/android update project -p $dir; done
 
 Build:0.6,9
     commit=adf99e8408b62a2c17a
-    init=echo -e 'android.library=true\ntarget=android-16' >        extern/viewPageIndicator/project.properties && \
+    init=echo -e 'android.library=true\ntarget=android-16' > extern/viewPageIndicator/project.properties && \
         sed -i 's/Google Inc.:Google APIs:17/android-17/g'        extern/actionbarsherlock/project.properties && \
         rm -f extern/android-async-http/build.xml && \
         cp libs/android-support-v4.jar extern/actionbarsherlock/libs/android-support-v4.jar && \
diff --git a/metadata/jp.co.omronsoft.openwnn.txt b/metadata/jp.co.omronsoft.openwnn.txt
index 7ad0815c40..4185785763 100644
--- a/metadata/jp.co.omronsoft.openwnn.txt
+++ b/metadata/jp.co.omronsoft.openwnn.txt
@@ -21,8 +21,8 @@ Build:1.3.5,1
     disable=buggy at android-4.0.4_r2.1
     commit=android-4.0.4_r2.1
     target=android-14
-    prebuild=sed -i -e '18 s/>//g' -e '19 a android:versionCode="1"\nandroid:versionName="1.3.5">'            AndroidManifest.xml && \
-        sed -i '23 i <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="14"/>'            AndroidManifest.xml
+    prebuild=sed -i -e '18 s/>//g' -e '19 a android:versionCode="1"\nandroid:versionName="1.3.5">' AndroidManifest.xml && \
+        sed -i '23 i <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="14"/>' AndroidManifest.xml
     build=$$NDK$$/ndk-build APP_BUILD_SCRIPT=Android.mk
 
 Build:1.3.5.1,2
@@ -42,8 +42,8 @@ Build:1.3.6,136
     disable=https://f-droid.org/forums/topic/opewnn-ics at android-4.1.2_r2
     commit=android-4.1.2_r2
     target=android-15
-    prebuild=sed -i ' 18 i android:versionCode="136"\nandroid:versionName="1.3.6"'            AndroidManifest.xml && \
-        sed -i '22 i <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="15" />'            AndroidManifest.xml
+    prebuild=sed -i ' 18 i android:versionCode="136"\nandroid:versionName="1.3.6"' AndroidManifest.xml && \
+        sed -i '22 i <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="15" />' AndroidManifest.xml
     buildjni=libs
 
 Auto Update Mode:None
diff --git a/metadata/net.logomancy.dashquotes.civ5.txt b/metadata/net.logomancy.dashquotes.civ5.txt
index d9b8446488..f5d20e8f6f 100644
--- a/metadata/net.logomancy.dashquotes.civ5.txt
+++ b/metadata/net.logomancy.dashquotes.civ5.txt
@@ -17,7 +17,7 @@ Build:1.0,1
     commit=d700ca6a87
     rm=libs/dashclock-api-r2.0.jar
     srclibs=DashClock@ecb5a191880
-    prebuild=echo 'source.dir=src;$$DashClock$$/api/src/main/java;    $$DashClock$$/api/src/main/aidl' >> project.properties
+    prebuild=echo 'source.dir=src;$$DashClock$$/api/src/main/java; $$DashClock$$/api/src/main/aidl' >> project.properties
 
 Auto Update Mode:None
 Update Check Mode:None
diff --git a/metadata/org.dolphinemu.dolphinemu.txt b/metadata/org.dolphinemu.dolphinemu.txt
index a657934a2f..5224374929 100644
--- a/metadata/org.dolphinemu.dolphinemu.txt
+++ b/metadata/org.dolphinemu.dolphinemu.txt
@@ -32,7 +32,7 @@ Build:0.11,11
         find -L ../../Externals/ -regex ".+\.\(a\|dll\|so\|exe\|lib\)" -type f -delete
     extlibs=android/android-support-v13.jar
     build=cd .. && \
-        cmake -DANDROID=True -DANDROID_NATIVE_API_LEVEL=android-14  -DCMAKE_TOOLCHAIN_FILE=../Source/Android/android.toolchain.cmake  -DANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-clang3.1 -DUSE_GLES3=True .. && \
+        cmake -DANDROID=True -DANDROID_NATIVE_API_LEVEL=android-14 -DCMAKE_TOOLCHAIN_FILE=../Source/Android/android.toolchain.cmake -DANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-clang3.1 -DUSE_GLES3=True .. && \
         make
     buildjni=no
 
diff --git a/metadata/org.fox.ttrss.txt b/metadata/org.fox.ttrss.txt
index 9ca6a99a1c..a74562dde8 100644
--- a/metadata/org.fox.ttrss.txt
+++ b/metadata/org.fox.ttrss.txt
@@ -167,7 +167,7 @@ Build:1.8.13,194
     rm=libs/dashclock-api-r1.1.jar
     srclibs=ActionBarSherlock@4.3.1,ViewPagerIndicator@2.4.1,SlidingMenu@8fcae2cce29e,DashClock@v1.2
     patch=notrial_new.patch
-    prebuild=sed -i -e 's@1=.*@1=$$ViewPagerIndicator$$@' -e 's@2=.*@2=$$ActionBarSherlock$$@'            -e 's@3=.*@3=$$SlidingMenu$$@' project.properties && \
+    prebuild=sed -i -e 's@1=.*@1=$$ViewPagerIndicator$$@' -e 's@2=.*@2=$$ActionBarSherlock$$@' -e 's@3=.*@3=$$SlidingMenu$$@' project.properties && \
         echo 'source.dir=src;$$DashClock$$/api/src' > ant.properties && \
         cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs && \
         cp libs/android-support-v4.jar $$ViewPagerIndicator$$/libs && \
diff --git a/metadata/org.yabause.android.txt b/metadata/org.yabause.android.txt
index 2429dfd534..54ff135dd5 100644
--- a/metadata/org.yabause.android.txt
+++ b/metadata/org.yabause.android.txt
@@ -27,7 +27,7 @@ Build:0.9.11,1
         export ANDROID_NDK="$$NDK$$" && \
         cd ../.. && \
         export PATH="$PATH:$$NDK$$/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86/bin" && \
-        cmake -DCMAKE_TOOLCHAIN_FILE=src/android/android.cmake  -DNDK_BUILD=$$NDK$$/ndk-build -DSDK_ANDROID=$$SDK$$/tools/android  -DYAB_PORTS=android . && \
+        cmake -DCMAKE_TOOLCHAIN_FILE=src/android/android.cmake -DNDK_BUILD=$$NDK$$/ndk-build -DSDK_ANDROID=$$SDK$$/tools/android -DYAB_PORTS=android . && \
         make
     buildjni=no