diff --git a/plugin.xml b/plugin.xml
index 8c713b6..d3b5ebb 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -45,79 +45,118 @@
         -->
 		
         <config-file target="res/xml/plugins.xml" parent="/plugins">
-            <plugin name="BarcodeScanner"
-                value="com.phonegap.plugins.barcodescanner.BarcodeScanner"/>
+            <plugin name="BarcodeScanner" value="com.phonegap.plugins.barcodescanner.BarcodeScanner"/>
         </config-file>
 
         <config-file target="res/xml/config.xml" parent="plugins">
-            <plugin name="BarcodeScanner"
-                value="com.phonegap.plugins.barcodescanner.BarcodeScanner"/>
+            <plugin name="BarcodeScanner" value="com.phonegap.plugins.barcodescanner.BarcodeScanner"/>
         </config-file>
 
         <config-file target="AndroidManifest.xml" parent="/manifest/application">
-            <activity 
-                android:name="com.google.zxing.client.android.CaptureActivity" 
-                android:screenOrientation="landscape" 
-                android:configChanges="orientation|keyboardHidden" 
-                android:theme="@android:style/Theme.NoTitleBar.Fullscreen" 
-                android:windowSoftInputMode="stateAlwaysHidden" 
-                android:exported="false">
-                <intent-filter> 
-                    <action android:name="com.phonegap.plugins.barcodescanner.SCAN"/> 
-                    <category android:name="android.intent.category.DEFAULT"/> 
-                </intent-filter> 
-            </activity> 
-            <activity 
-                android:name="com.google.zxing.client.android.encode.EncodeActivity" 
-                android:label="@string/share_name"> 
-                <intent-filter> 
-                    <action android:name="com.phonegap.plugins.barcodescanner.ENCODE"/> 
-                    <category android:name="android.intent.category.DEFAULT"/> 
-                </intent-filter> 
-            </activity>
+			<activity
+				android:name="com.google.zxing.client.android.CaptureActivity"
+				android:screenOrientation="landscape"
+				android:clearTaskOnLaunch="true"
+				android:configChanges="orientation|keyboardHidden"
+				android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+				android:windowSoftInputMode="stateAlwaysHidden"
+				android:exported="false">
+				<intent-filter>
+					<action android:name="com.phonegap.plugins.barcodescanner.SCAN"/>
+					<category android:name="android.intent.category.DEFAULT"/>
+				</intent-filter>
+			</activity>
+			<activity android:name="com.google.zxing.client.android.encode.EncodeActivity" android:label="@string/share_name">
+				<intent-filter>
+					<action android:name="com.phonegap.plugins.barcodescanner.ENCODE"/>
+					<category android:name="android.intent.category.DEFAULT"/>
+				</intent-filter>
+			</activity>
+			<activity android:name="com.google.zxing.client.android.HelpActivity" android:label="@string/share_name">
+				<intent-filter>
+					<action android:name="android.intent.action.VIEW"/>
+					<category android:name="android.intent.category.DEFAULT"/>
+				</intent-filter>
+			</activity>
         </config-file>
 
         <config-file target="AndroidManifest.xml" parent="/manifest">
-            <uses-permission android:name="android.permission.CAMERA" />
-            <uses-feature android:name="android.hardware.camera" />
+			<uses-permission android:name="android.permission.CAMERA" />
+			<uses-permission android:name="android.permission.FLASHLIGHT" />
+			<!-- Not required to allow users to work around this -->
+            <uses-feature android:name="android.hardware.camera" android:required="false" />
         </config-file>
 
         <source-file src="src/android/com.google.zxing.client.android.captureactivity.jar" target-dir="libs"/>
 
-        
-        <source-file src="src/android/LibraryProject/res/drawable/launcher_icon.png" target-dir="res/drawable"/>
-        <source-file src="src/android/LibraryProject/res/drawable/share_via_barcode.png" target-dir="res/drawable"/>
-        <source-file src="src/android/LibraryProject/res/drawable/shopper_icon.png" target-dir="res/drawable"/>
-        
-
-        <source-file src="src/android/LibraryProject/res/drawable-hdpi/launcher_icon.png" target-dir="res/drawable-hdpi"/>
-        <source-file src="src/android/LibraryProject/res/drawable-hdpi/shopper_icon.png" target-dir="res/drawable-hdpi"/>
-
-        <source-file src="src/android/LibraryProject/res/raw/beep.ogg" target-dir="res/raw"/>
-
-        <source-file src="src/android/LibraryProject/res/layout/bookmark_picker_list_item.xml" target-dir="res/layout"/>
-        <source-file src="src/android/LibraryProject/res/layout/capture.xml" target-dir="res/layout"/>
-        <source-file src="src/android/LibraryProject/res/layout/encode.xml" target-dir="res/layout"/>
-        <source-file src="src/android/LibraryProject/res/layout/help.xml" target-dir="res/layout"/>
-        <source-file src="src/android/LibraryProject/res/layout/network.xml" target-dir="res/layout"/>
-        <source-file src="src/android/LibraryProject/res/layout/search_book_contents.xml" target-dir="res/layout"/>
-        <source-file src="src/android/LibraryProject/res/layout/search_book_contents_header.xml" target-dir="res/layout"/>
-        <source-file src="src/android/LibraryProject/res/layout/search_book_contents_list_item.xml" target-dir="res/layout"/>
-        <source-file src="src/android/LibraryProject/res/layout/share.xml" target-dir="res/layout"/>
-
-        <source-file src="src/android/LibraryProject/res/layout-land/encode.xml" target-dir="res/layout-land"/>
-        <source-file src="src/android/LibraryProject/res/layout-land/share.xml" target-dir="res/layout-land"/>
-
-        <source-file src="src/android/LibraryProject/res/layout-ldpi/capture.xml" target-dir="res/layout-ldpi"/>
-
-        <source-file src="src/android/LibraryProject/res/xml/preferences.xml" target-dir="res/xml"/>
-
-        <source-file src="src/android/LibraryProject/res/values/attrs.xml" target-dir="res/values"/>
-        <source-file src="src/android/LibraryProject/res/values/colors.xml" target-dir="res/values"/>
-        <source-file src="src/android/LibraryProject/res/values/ids.xml" target-dir="res/values"/>
+		<!--
+			LibraryProject/res/*.*
+			search: (src/android/LibraryProject/(.+?)/[^/]+)$
+			replace: <source-file src="$1" target-dir="$2"/>
+		-->
+		<source-file src="src/android/LibraryProject/res/values/arrays.xml" target-dir="res/values"/>
+		<source-file src="src/android/LibraryProject/res/raw/beep.ogg" target-dir="res/raw"/>
+		<source-file src="src/android/LibraryProject/res/layout/bookmark_picker_list_item.xml" target-dir="res/layout"/>
+		<source-file src="src/android/LibraryProject/res/layout/capture.xml" target-dir="res/layout"/>
+		<source-file src="src/android/LibraryProject/res/layout-ldpi/capture.xml" target-dir="res/layout-ldpi"/>
+		<source-file src="src/android/LibraryProject/res/menu/capture.xml" target-dir="res/menu"/>
+		<source-file src="src/android/LibraryProject/res/values/colors.xml" target-dir="res/values"/>
+		<source-file src="src/android/LibraryProject/res/values/dimens.xml" target-dir="res/values"/>
+		<source-file src="src/android/LibraryProject/res/layout/encode.xml" target-dir="res/layout"/>
+		<source-file src="src/android/LibraryProject/res/layout-land/encode.xml" target-dir="res/layout-land"/>
+		<source-file src="src/android/LibraryProject/res/menu/encode.xml" target-dir="res/menu"/>
+		<source-file src="src/android/LibraryProject/res/layout/help.xml" target-dir="res/layout"/>
+		<source-file src="src/android/LibraryProject/res/menu/history.xml" target-dir="res/menu"/>
+		<source-file src="src/android/LibraryProject/res/layout/history_list_item.xml" target-dir="res/layout"/>
+		<source-file src="src/android/LibraryProject/res/values/ids.xml" target-dir="res/values"/>
+		<source-file src="src/android/LibraryProject/res/drawable/launcher_icon.png" target-dir="res/drawable"/>
+		<source-file src="src/android/LibraryProject/res/drawable-hdpi/launcher_icon.png" target-dir="res/drawable-hdpi"/>
+		<source-file src="src/android/LibraryProject/res/drawable-xhdpi/launcher_icon.png" target-dir="res/drawable-xhdpi"/>
+		<source-file src="src/android/LibraryProject/res/drawable-xxhdpi/launcher_icon.png" target-dir="res/drawable-xxhdpi"/>
+		<source-file src="src/android/LibraryProject/res/xml/preferences.xml" target-dir="res/xml"/>
+		<source-file src="src/android/LibraryProject/res/layout/search_book_contents.xml" target-dir="res/layout"/>
+		<source-file src="src/android/LibraryProject/res/layout/search_book_contents_header.xml" target-dir="res/layout"/>
+		<source-file src="src/android/LibraryProject/res/layout/search_book_contents_list_item.xml" target-dir="res/layout"/>
+		<source-file src="src/android/LibraryProject/res/layout/share.xml" target-dir="res/layout"/>
+		<source-file src="src/android/LibraryProject/res/layout-land/share.xml" target-dir="res/layout-land"/>
+		<source-file src="src/android/LibraryProject/res/drawable/share_via_barcode.png" target-dir="res/drawable"/>
+		<source-file src="src/android/LibraryProject/res/drawable/shopper_icon.png" target-dir="res/drawable"/>
+		<source-file src="src/android/LibraryProject/res/drawable-hdpi/shopper_icon.png" target-dir="res/drawable-hdpi"/>
+		<source-file src="src/android/LibraryProject/res/values/strings.xml" target-dir="res/values"/>
+		<source-file src="src/android/LibraryProject/res/values-ar/strings.xml" target-dir="res/values-ar"/>
+		<source-file src="src/android/LibraryProject/res/values-bg/strings.xml" target-dir="res/values-bg"/>
+		<source-file src="src/android/LibraryProject/res/values-ca/strings.xml" target-dir="res/values-ca"/>
+		<source-file src="src/android/LibraryProject/res/values-cs/strings.xml" target-dir="res/values-cs"/>
+		<source-file src="src/android/LibraryProject/res/values-da/strings.xml" target-dir="res/values-da"/>
+		<source-file src="src/android/LibraryProject/res/values-de/strings.xml" target-dir="res/values-de"/>
+		<source-file src="src/android/LibraryProject/res/values-el/strings.xml" target-dir="res/values-el"/>
+		<source-file src="src/android/LibraryProject/res/values-es/strings.xml" target-dir="res/values-es"/>
+		<source-file src="src/android/LibraryProject/res/values-eu/strings.xml" target-dir="res/values-eu"/>
+		<source-file src="src/android/LibraryProject/res/values-fi/strings.xml" target-dir="res/values-fi"/>
+		<source-file src="src/android/LibraryProject/res/values-fr/strings.xml" target-dir="res/values-fr"/>
+		<source-file src="src/android/LibraryProject/res/values-he/strings.xml" target-dir="res/values-he"/>
+		<source-file src="src/android/LibraryProject/res/values-hi/strings.xml" target-dir="res/values-hi"/>
+		<source-file src="src/android/LibraryProject/res/values-hu/strings.xml" target-dir="res/values-hu"/>
+		<source-file src="src/android/LibraryProject/res/values-id/strings.xml" target-dir="res/values-id"/>
+		<source-file src="src/android/LibraryProject/res/values-it/strings.xml" target-dir="res/values-it"/>
+		<source-file src="src/android/LibraryProject/res/values-iw/strings.xml" target-dir="res/values-iw"/>
+		<source-file src="src/android/LibraryProject/res/values-ja/strings.xml" target-dir="res/values-ja"/>
+		<source-file src="src/android/LibraryProject/res/values-ko/strings.xml" target-dir="res/values-ko"/>
+		<source-file src="src/android/LibraryProject/res/values-nl/strings.xml" target-dir="res/values-nl"/>
+		<source-file src="src/android/LibraryProject/res/values-pl/strings.xml" target-dir="res/values-pl"/>
+		<source-file src="src/android/LibraryProject/res/values-pt/strings.xml" target-dir="res/values-pt"/>
+		<source-file src="src/android/LibraryProject/res/values-ru/strings.xml" target-dir="res/values-ru"/>
+		<source-file src="src/android/LibraryProject/res/values-sk/strings.xml" target-dir="res/values-sk"/>
+		<source-file src="src/android/LibraryProject/res/values-sl/strings.xml" target-dir="res/values-sl"/>
+		<source-file src="src/android/LibraryProject/res/values-sv/strings.xml" target-dir="res/values-sv"/>
+		<source-file src="src/android/LibraryProject/res/values-tr/strings.xml" target-dir="res/values-tr"/>
+		<source-file src="src/android/LibraryProject/res/values-zh-rCN/strings.xml" target-dir="res/values-zh-rCN"/>
+		<source-file src="src/android/LibraryProject/res/values-zh-rTW/strings.xml" target-dir="res/values-zh-rTW"/>
 
+		<!-- What was this for? Wouldn't above merge files anyway? -->
+		<!--
         <config-file target="res/values/strings.xml" parent="/resources">
-            <!-- string name="app_name">Barcode Scanner</string -->
+            <!- - string name="app_name">Barcode Scanner</string - ->
             <string name="app_picker_name">Applications</string>
             <string name="bookmark_picker_name">Bookmarks</string>
             <string name="button_add_calendar">Add to calendar</string>
@@ -161,7 +200,7 @@
             <string name="menu_about">About</string>
             <string name="menu_help">Help</string>
             <string name="menu_history">History</string>
-            <!-- string name="menu_settings">Settings</string -->
+            <!- - string name="menu_settings">Settings</string - ->
             <string name="menu_share">Share</string>
             <string name="msg_about">The official Android app of the open source ZXing barcode project.</string>
             <string name="msg_buggy">This device has known bugs that cause barcode scanning problems. For more information, visit http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions</string>
@@ -242,30 +281,6 @@
             <string name="wifi_type_label">Type</string>
             <string name="zxing_url">http://code.google.com/p/zxing</string>
         </config-file>
-
-
-        <source-file src="src/android/LibraryProject/res/values-ar/strings.xml" target-dir="res/values-ar"/>
-        <source-file src="src/android/LibraryProject/res/values-bg/strings.xml" target-dir="res/values-bg"/>
-        <source-file src="src/android/LibraryProject/res/values-cs/strings.xml" target-dir="res/values-cs"/>
-        <source-file src="src/android/LibraryProject/res/values-da/strings.xml" target-dir="res/values-da"/>
-        <source-file src="src/android/LibraryProject/res/values-de/strings.xml" target-dir="res/values-de"/>
-        <source-file src="src/android/LibraryProject/res/values-es/strings.xml" target-dir="res/values-es"/>
-        <source-file src="src/android/LibraryProject/res/values-fi/strings.xml" target-dir="res/values-fi"/>
-        <source-file src="src/android/LibraryProject/res/values-fr/strings.xml" target-dir="res/values-fr"/>
-        <source-file src="src/android/LibraryProject/res/values-he/strings.xml" target-dir="res/values-he"/>
-        <source-file src="src/android/LibraryProject/res/values-hu/strings.xml" target-dir="res/values-hu"/>
-        <source-file src="src/android/LibraryProject/res/values-it/strings.xml" target-dir="res/values-it"/>
-        <source-file src="src/android/LibraryProject/res/values-ja-rJP/strings.xml" target-dir="res/values-ja-rJP"/>
-        <source-file src="src/android/LibraryProject/res/values-nl/strings.xml" target-dir="res/values-nl"/>
-        <source-file src="src/android/LibraryProject/res/values-pl/strings.xml" target-dir="res/values-pl"/>
-        <source-file src="src/android/LibraryProject/res/values-pt/strings.xml" target-dir="res/values-pt"/>
-        <source-file src="src/android/LibraryProject/res/values-ru/strings.xml" target-dir="res/values-ru"/>
-        <source-file src="src/android/LibraryProject/res/values-sk/strings.xml" target-dir="res/values-sk"/>
-        <source-file src="src/android/LibraryProject/res/values-sl/strings.xml" target-dir="res/values-sl"/>
-        <source-file src="src/android/LibraryProject/res/values-sv/strings.xml" target-dir="res/values-sv"/>
-        <source-file src="src/android/LibraryProject/res/values-tr/strings.xml" target-dir="res/values-tr"/>
-        <source-file src="src/android/LibraryProject/res/values-zh-rCN/strings.xml" target-dir="res/values-zh-rCN"/>
-        <source-file src="src/android/LibraryProject/res/values-zh-rTW/strings.xml" target-dir="res/values-zh-rTW"/>
-
+		-->
     </platform>
 </plugin>