diff --git a/README.md b/README.md
index 5273a95..eab0dbf 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
 # iOS-OTA-Downgrader
 
 - **Downgrade/restore and jailbreak supported iOS devices to signed OTA firmwares**
-- **iPhone4Down: Downgrade your iPhone 4 on Linux (using ch3rryflower)**
+- **iPhone4Down: Downgrade your iPhone 4 on Linux (using powdersn0w)**
 - **Linux and macOS** are supported
     - **Partial support for Windows** - usage is not recommended
-    - iPhone4Down is focused on Linux only - macOS and Windows are unsupported
+    - iPhone4Down is focused on Linux only - macOS and Windows are untested
 - **Read the ["How to Use" wiki page](https://github.com/LukeZGD/iOS-OTA-Downgrader/wiki/How-to-Use) for a step-by-step tutorial**
 - **Read the ["Troubleshooting" wiki page](https://github.com/LukeZGD/iOS-OTA-Downgrader/wiki/Troubleshooting) for tips, frequent questions, and troubleshooting**
 
@@ -22,7 +22,6 @@
     - iPhone 5C can still be restored to versions that you have SHSH blobs for
     - iPhone 4 devices also support restoring with SHSH blobs
 - **iPhone4Down supports the iPhone 4 GSM (iPhone3,1) only**
-    - You are on your own if you attempt to restore to versions not within the supported range (except for iOS 7.1.2)
 
 <table>
     <thead>
@@ -79,7 +78,8 @@
 - cURL
 - bspatch
 - python2 (ipwndfu, rmsigchks, SimpleHTTPServer), python3 (http.server)
-- [ch3rryflower](https://web.archive.org/web/20200708040313/https://github.com/dora2-iOS/ch3rryflower) - dora2ios
+- [powdersn0w](https://github.com/dora2-iOS/powdersn0w_pub) - dora2ios ([LukeZGD fork](https://github.com/LukeZGD/powdersn0w_pub))
+- [ch3rryflower](https://web.archive.org/web/20200708040313/https://github.com/dora2-iOS/ch3rryflower) - dora2ios (used for iOS 4.3.x only)
 - [ipwndfu](https://github.com/LukeZGD/ipwndfu) - LukeZGD fork
 - [iPwnder32](https://github.com/dora2-iOS/iPwnder32) - dora2ios
 - [ipwnder_lite](https://github.com/dora2-iOS/ipwnder_lite) - dora2ios
@@ -96,7 +96,6 @@
 - 32-bit bundles from [OdysseusOTA](https://www.youtube.com/watch?v=Wo7mGdMcjxw), [OdysseusOTA2](https://www.youtube.com/watch?v=fh0tB6fp0Sc), [alitek12](https://www.mediafire.com/folder/b1z64roy512wd/FirmwareBundles), [gjest](https://www.reddit.com/r/jailbreak/comments/6yrzzj/release_firmware_bundles_for_ios_841_ipad21234567/) (modified bundles for daibutsuCFW)
 - A7 patches from [MatthewPierson](https://github.com/MatthewPierson/iPhone-5s-OTA-Downgrade-Patches)
 - [EtasonJB](https://www.theiphonewiki.com/wiki/EtasonJB)
-- [evasi0n](https://www.theiphonewiki.com/wiki/Evasi0n)
 - [Pangu](https://www.theiphonewiki.com/wiki/Pangu)
 - [p0sixspwn](https://www.theiphonewiki.com/wiki/p0sixspwn)
 - [unthredeh4il](https://www.theiphonewiki.com/wiki/Unthredera1n#unthredeh4il)
diff --git a/resources/depends.sh b/resources/depends.sh
index 070b6e9..32ed829 100755
--- a/resources/depends.sh
+++ b/resources/depends.sh
@@ -68,7 +68,8 @@ SetToolPaths() {
     irecovery2="../tools/irecovery_$platform"
     partialzip="./resources/tools/partialzip_$platform"
     ping="ping -c1"
-    pwnedDFU="$cherry/pwnedDFU"
+    powdersn0w="../resources/tools/powdersn0w_$platform"
+    pwnedDFU="./resources/tools/pwnedDFU_$platform"
     rmsigchks="$python rmsigchks.py"
     SimpleHTTPServer="$python -m SimpleHTTPServer 8888"
     SSH="-F ./resources/ssh_config"
@@ -191,7 +192,7 @@ InstallDepends() {
         pacman -Sy --noconfirm --needed ca-certificates curl openssh unzip zip
         libimobiledevice=("https://github.com/LukeZGD/iOS-OTA-Downgrader-Keys/releases/download/tools/libimobiledevice_win.zip" "75ae3af3347b89107f0f6b7e41fde42e6ccdd404")
         if [[ ! $(ls ../resources/tools/*win*) ]]; then
-            SaveFile https://github.com/LukeZGD/iOS-OTA-Downgrader-Keys/releases/download/tools/tools_win.zip tools_win.zip 4433ad5d6661cb5a374edccf771d4f2b761e7e46
+            SaveFile https://github.com/LukeZGD/iOS-OTA-Downgrader-Keys/releases/download/tools/tools_win.zip tools_win.zip d6fed106f38f8e60dfaf67cfbcb06898fb9a1b2e
             Log "Extracting Windows tools..."
             unzip -oq tools_win.zip -d ../resources
         fi
diff --git a/resources/device.sh b/resources/device.sh
index 06f9683..8f8fbd6 100755
--- a/resources/device.sh
+++ b/resources/device.sh
@@ -149,9 +149,9 @@ GetDeviceValues() {
         DeviceProc=4
         if [[ $ProductType == "iPhone3,1" ]]; then
             Log "iPhone 4 GSM detected. iPhone4Down functions enabled."
-            Echo "* This script uses ch3rryflower by dora2iOS"
+            Echo "* This script uses powdersn0w by dora2ios"
         else
-            Log "$ProductType detected. Your device is not supported by ch3rryflower."
+            Log "$ProductType detected. Your device is not supported by powdersn0w (yet)"
             Echo "* Functions will be limited to entering kDFU and restoring with blobs."
         fi
     elif [[ $ProductType == "iPad2"* || $ProductType == "iPad3,1" || $ProductType == "iPad3,2" ||
@@ -204,6 +204,14 @@ EnterPwnDFU() {
     
     if [[ $ProductType == "iPhone3,1" ]]; then
         pwnDFUTool="$pwnedDFU"
+        if [[ $platform == "win" ]]; then
+            Log "iPhone 4 device detected in DFU mode."
+            Echo "* Make sure that your device is already in pwnDFU mode."
+            Echo "* If your device is not in pwnDFU mode, the restore will not proceed!"
+            Input "Press Enter/Return to continue (or press Ctrl+C to cancel)"
+            read -s
+            return
+        fi
     elif [[ $platform == "macos" ]]; then
         Selection=("ipwnder_lite" "iPwnder32")
         Input "PwnDFU Tool Option"
diff --git a/resources/downgrade.sh b/resources/downgrade.sh
index fc89ca2..f46e625 100755
--- a/resources/downgrade.sh
+++ b/resources/downgrade.sh
@@ -69,15 +69,12 @@ FutureRestore() {
 
     Log "Running futurerestore with command: $futurerestore -t \"$SHSH\" ${ExtraArgs[*]} \"$IPSWRestore.ipsw\""
     $futurerestore -t "$SHSH" "${ExtraArgs[@]}" "$IPSWRestore.ipsw"
-    if [[ $? != 0 ]]; then
-        Log "An error seems to have occurred in futurerestore."
-        Echo "* Please read the \"Troubleshooting\" wiki page in GitHub before opening any issue!"
-        Echo "* Your problem may have already been addressed within the wiki page."
-        Echo "* If opening an issue in GitHub, please provide a FULL log. Otherwise, your issue may be dismissed."
-    else
-        echo
-        Log "Restoring done!"
-    fi
+    echo
+    Log "Restoring done! Read the message below if any error has occurred:"
+    Echo "* Please read the \"Troubleshooting\" wiki page in GitHub before opening any issue!"
+    Echo "* Your problem may have already been addressed within the wiki page."
+    Echo "* If opening an issue in GitHub, please provide a FULL log. Otherwise, your issue may be dismissed."
+    echo
     Log "Downgrade script done!"
 }
 
@@ -144,19 +141,16 @@ iDeviceRestore() {
     [[ $1 == "latest" ]] && ExtraArgs="-e" || ExtraArgs="-e -w"
     [[ $platform == "win" ]] && ExtraArgs="-ewy"
     $idevicerestore $ExtraArgs "$IPSWRestore.ipsw"
-    if [[ $platform == "win" && $? != 0 ]]; then
-        Log "Restoring done! Read the message below if any error has occurred:"
+    echo
+    Log "Restoring done! Read the message below if any error has occurred:"
+    if [[ $platform == "win" ]]; then
         Echo "* Windows users may encounter errors like \"Unable to send APTicket\" or \"Unable to send iBEC\" in the restore process."
         Echo "* To fix this, follow troubleshooting steps from here: https://github.com/LukeZGD/iOS-OTA-Downgrader/wiki/Troubleshooting#windows"
-    elif [[ $? != 0 ]]; then
-        Log "An error seems to have occurred in idevicerestore."
-        Echo "* Please read the \"Troubleshooting\" wiki page in GitHub before opening any issue!"
-        Echo "* Your problem may have already been addressed within the wiki page."
-        Echo "* If opening an issue in GitHub, please provide a FULL log. Otherwise, your issue may be dismissed."
-    else
-        echo
-        Log "Restoring done!"
     fi
+    Echo "* Please read the \"Troubleshooting\" wiki page in GitHub before opening any issue!"
+    Echo "* Your problem may have already been addressed within the wiki page."
+    Echo "* If opening an issue in GitHub, please provide a FULL log. Otherwise, your issue may be dismissed."
+    echo
     Log "Downgrade script done!"
 }
 
diff --git a/resources/firmware/powdersn0wBundles/BASE_iPhone3,1_7.1.2_11D257.bundle/Info.plist b/resources/firmware/powdersn0wBundles/BASE_iPhone3,1_7.1.2_11D257.bundle/Info.plist
new file mode 100644
index 0000000..30dae69
--- /dev/null
+++ b/resources/firmware/powdersn0wBundles/BASE_iPhone3,1_7.1.2_11D257.bundle/Info.plist
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>Filename</key>
+	<string>iPhone3,1_7.1.2_11D257_Restore.ipsw</string>
+	<key>RootFilesystem</key>
+	<string>058-4520-010.dmg</string>
+	<key>RootFilesystemKey</key>
+	<string>38d0320d099b9dd34ffb3308c53d397f14955b347d6a433fe173acc2ced1ae78756b3684</string>
+	<key>RootFilesystemSize</key>
+	<integer>1660</integer>
+	<key>RamdiskOptionsPath</key>
+	<string>/usr/local/share/restore/options.n90.plist</string>
+	<key>SHA256</key>
+	<string>8df4acce2cc2989ad159f980dd65a4bdc8c9eab4000e35169baa70ceb8749b2d</string>
+	<key>RamdiskExploit</key>
+	<dict>
+		<key>exploit</key>
+		<string>src/target/n90/11D257/exploit</string>
+		<key>inject</key>
+		<string>src/target/n90/11D257/partition</string>
+	</dict>
+	<key>Firmware</key>
+	<dict/>
+	<key>FirmwarePath</key>
+	<dict>
+		<key>AppleLogo</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/applelogo@2x~iphone.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryCharging0</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batterycharging0@2x~iphone.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryCharging1</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batterycharging1@2x~iphone.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryFull</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batteryfull@2x~iphone.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryLow0</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batterylow0@2x~iphone.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryLow1</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batterylow1@2x~iphone.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryPlugin</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/glyphplugin@2x~iphone-30pin.s5l8930x.img3</string>
+		</dict>
+		<key>RecoveryMode</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/recoverymode@2x~iphone-30pin.s5l8930x.img3</string>
+		</dict>
+		<key>LLB</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/LLB.n90ap.RELEASE.img3</string>
+		</dict>
+		<key>iBoot</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/iBoot.n90ap.RELEASE.img3</string>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/resources/firmware/powdersn0wBundles/config.plist b/resources/firmware/powdersn0wBundles/config.plist
new file mode 100644
index 0000000..7e698db
--- /dev/null
+++ b/resources/firmware/powdersn0wBundles/config.plist
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>FilesystemJailbreak</key>
+	<false/>
+	<key>needPref</key>
+	<true/>
+	<key>iBootPatches</key>
+	<dict>
+		<key>debugEnabled</key>
+		<false/>
+		<key>bootArgsInjection</key>
+		<false/>
+		<key>bootArgsString</key>
+		<string>-v</string>
+	</dict>
+</dict>
+</plist>
diff --git a/resources/firmware/powdersn0wBundles/configJB.plist b/resources/firmware/powdersn0wBundles/configJB.plist
new file mode 100644
index 0000000..9308ea8
--- /dev/null
+++ b/resources/firmware/powdersn0wBundles/configJB.plist
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>FilesystemJailbreak</key>
+	<true/>
+	<key>needPref</key>
+	<true/>
+	<key>iBootPatches</key>
+	<dict>
+		<key>debugEnabled</key>
+		<false/>
+		<key>bootArgsInjection</key>
+		<false/>
+		<key>bootArgsString</key>
+		<string>-v</string>
+	</dict>
+</dict>
+</plist>
diff --git a/resources/firmware/powdersn0wBundles/configv.plist b/resources/firmware/powdersn0wBundles/configv.plist
new file mode 100644
index 0000000..c9bd019
--- /dev/null
+++ b/resources/firmware/powdersn0wBundles/configv.plist
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>FilesystemJailbreak</key>
+	<false/>
+	<key>needPref</key>
+	<true/>
+	<key>iBootPatches</key>
+	<dict>
+		<key>debugEnabled</key>
+		<false/>
+		<key>bootArgsInjection</key>
+		<true/>
+		<key>bootArgsString</key>
+		<string>-v</string>
+	</dict>
+</dict>
+</plist>
diff --git a/resources/firmware/powdersn0wBundles/configvJB.plist b/resources/firmware/powdersn0wBundles/configvJB.plist
new file mode 100644
index 0000000..eff144b
--- /dev/null
+++ b/resources/firmware/powdersn0wBundles/configvJB.plist
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>FilesystemJailbreak</key>
+	<true/>
+	<key>needPref</key>
+	<true/>
+	<key>iBootPatches</key>
+	<dict>
+		<key>debugEnabled</key>
+		<false/>
+		<key>bootArgsInjection</key>
+		<true/>
+		<key>bootArgsString</key>
+		<string>-v</string>
+	</dict>
+</dict>
+</plist>
diff --git a/resources/firmware/powdersn0wBundles/iPhone3,1_5.0.1_9A405.bundle/Info.plist b/resources/firmware/powdersn0wBundles/iPhone3,1_5.0.1_9A405.bundle/Info.plist
new file mode 100644
index 0000000..37e2775
--- /dev/null
+++ b/resources/firmware/powdersn0wBundles/iPhone3,1_5.0.1_9A405.bundle/Info.plist
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>Filename</key>
+	<string>iPhone3,1_5.0.1_9A405_Restore.ipsw</string>
+	<key>RootFilesystem</key>
+	<string>038-3700-001.dmg</string>
+	<key>RootFilesystemKey</key>
+	<string>a8c7fe8c4698684db2b315cdf9b0c569e6769ed721b83799bad4dadfaf6186c6fd6e0fb1</string>
+	<key>RootFilesystemSize</key>
+	<integer>1050</integer>
+	<key>RamdiskOptionsPath</key>
+	<string>/usr/local/share/restore/options.n90.plist</string>
+	<key>SHA256</key>
+	<string>ebf4137bd1d967735aaa30ad35b49f03bcb504494100f4c34c1c91aa3297c92a</string>
+	<key>FilesystemPackage</key>
+	<dict/>
+	<key>RamdiskPackage</key>
+	<dict>
+		<key>package</key>
+		<string>src/bin.tar</string>
+		<key>ios</key>
+		<string>ios5</string>
+	</dict>
+	<key>Firmware</key>
+	<dict>
+		<key>iBSS</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/dfu/iBSS.n90ap.RELEASE.dfu</string>
+			<key>IV</key>
+			<string>05b6de2e7dc95144021a83202f61ab62</string>
+			<key>Key</key>
+			<string>f21078779f95dd9aa1b2d96d21ac34fc385657aa6cde77c44db051012dbaad2d</string>
+			<key>Decrypt</key>
+			<true/>
+			<key>Patch</key>
+			<true/>
+		</dict>
+		<key>iBEC</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/dfu/iBEC.n90ap.RELEASE.dfu</string>
+			<key>IV</key>
+			<string>1d30d95c43807e465d63840e36d68df0</string>
+			<key>Key</key>
+			<string>9d35cc090e305faf449b8428fe4b0fb9d3b79fbd42da59746bec393b13582f8f</string>
+			<key>Decrypt</key>
+			<true/>
+			<key>Patch</key>
+			<true/>
+		</dict>
+		<key>Restore Ramdisk</key>
+		<dict>
+			<key>File</key>
+			<string>038-3715-001.dmg</string>
+			<key>IV</key>
+			<string>861ef22a2220f5791180191dedf28453</string>
+			<key>Key</key>
+			<string>73c382680d3d724e5851554d1ca3ce4287e958f33021a5f084920030b6faf2af</string>
+			<key>Decrypt</key>
+			<true/>
+		</dict>
+		<key>RestoreDeviceTree</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/DeviceTree.n90ap.img3</string>
+			<key>IV</key>
+			<string>607c62d22e7ad478f217f1d172be09ba</string>
+			<key>Key</key>
+			<string>0336861196a3f1af378a2a06318ca83ca05948279b77bbcf49bd43dafaa05e48</string>
+			<key>DecryptPath</key>
+			<string>Downgrade/DeviceTree.n90ap.img3</string>
+		</dict>
+		<key>RestoreLogo</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/applelogo-640x960.s5l8930x.img3</string>
+			<key>IV</key>
+			<string>b7f04a12abd4d85251879d93fe522471</string>
+			<key>Key</key>
+			<string>171bec0c8d4f8398ba1c1e791b2b49cdeb9cf5f344c9a80a29ed649ab2582ef8</string>
+			<key>DecryptPath</key>
+			<string>Downgrade/applelogo-640x960.s5l8930x.img3</string>
+		</dict>
+	</dict>
+	<key>FirmwareReplace</key>
+	<dict>
+		<key>AppleLogo</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/applelogo7-640x960.s5l8930x.img3</string>
+		</dict>
+		<key>NewAppleLogo</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/applelogo-640x960.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryCharging0</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batterycharging0-640x960.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryCharging1</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batterycharging1-640x960.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryFull</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batteryfull-640x960.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryLow0</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batterylow0-640x960.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryLow1</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batterylow1-640x960.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryPlugin</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/glyphplugin-640x960.s5l8930x.img3</string>
+		</dict>
+		<key>RecoveryMode</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/recoverymode7-640x960.s5l8930x.img3</string>
+		</dict>
+		<key>NewRecoveryMode</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/recoverymode-640x960.s5l8930x.img3</string>
+		</dict>
+		<key>LLB</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/LLB.n90ap.RELEASE.img3</string>
+		</dict>
+		<key>iBoot</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/iBoot.n90ap.RELEASE.img3</string>
+		</dict>
+		<key>NewiBoot</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/iBoot5.n90ap.RELEASE.img3</string>
+			<key>IV</key>
+			<string>49eb54980a0024f91b079faf0ee87f67</string>
+			<key>Key</key>
+			<string>c3a49f0059075e1453dacec4c3e4d89bd7a433ee19c8d48e4695d89b4c84a373</string>
+		</dict>
+		<key>manifest</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/manifest</string>
+			<key>manifest</key>
+			<string>manifest</string>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/resources/firmware/powdersn0wBundles/iPhone3,1_5.0.1_9A405.bundle/manifest b/resources/firmware/powdersn0wBundles/iPhone3,1_5.0.1_9A405.bundle/manifest
new file mode 100644
index 0000000..51311e6
--- /dev/null
+++ b/resources/firmware/powdersn0wBundles/iPhone3,1_5.0.1_9A405.bundle/manifest
@@ -0,0 +1,15 @@
+LLB.n90ap.RELEASE.img3
+iBoot.n90ap.RELEASE.img3
+DeviceTree.n90ap.img3
+applelogo7-640x960.s5l8930x.img3
+batterylow0-640x960.s5l8930x.img3
+batterylow1-640x960.s5l8930x.img3
+glyphcharging-640x960.s5l8930x.img3
+batterycharging0-640x960.s5l8930x.img3
+batterycharging1-640x960.s5l8930x.img3
+glyphplugin-640x960.s5l8930x.img3
+batteryfull-640x960.s5l8930x.img3
+recoverymode7-640x960.s5l8930x.img3
+iBoot5.n90ap.RELEASE.img3
+applelogo-640x960.s5l8930x.img3
+recoverymode-640x960.s5l8930x.img3
diff --git a/resources/firmware/powdersn0wBundles/iPhone3,1_5.0_9A334.bundle/Info.plist b/resources/firmware/powdersn0wBundles/iPhone3,1_5.0_9A334.bundle/Info.plist
new file mode 100644
index 0000000..ff08b4b
--- /dev/null
+++ b/resources/firmware/powdersn0wBundles/iPhone3,1_5.0_9A334.bundle/Info.plist
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>Filename</key>
+	<string>iPhone3,1_5.0_9A334_Restore.ipsw</string>
+	<key>RootFilesystem</key>
+	<string>018-7879-364.dmg</string>
+	<key>RootFilesystemKey</key>
+	<string>5e5c52fd7e439936d89659b5aa4f79206cd64f09c9961e9d4712a0131075966e2271b354</string>
+	<key>RootFilesystemSize</key>
+	<integer>1050</integer>
+	<key>RamdiskOptionsPath</key>
+	<string>/usr/local/share/restore/options.n90.plist</string>
+	<key>SHA256</key>
+	<string>fce4fa81e1fe34c0f6af301168a18f89e1922fa9055fb5a4b190075e51a36c8e</string>
+	<key>FilesystemPackage</key>
+	<dict/>
+	<key>RamdiskPackage</key>
+	<dict>
+		<key>package</key>
+		<string>src/bin.tar</string>
+		<key>ios</key>
+		<string>ios5</string>
+	</dict>
+	<key>Firmware</key>
+	<dict>
+		<key>iBSS</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/dfu/iBSS.n90ap.RELEASE.dfu</string>
+			<key>IV</key>
+			<string>afd80e647e22d22a26b6e58fb5846823</string>
+			<key>Key</key>
+			<string>dc5e8dcd58628a25865fb77c2fddb9d2a17f7c933aa27c53ce2d8c4173d6a8da</string>
+			<key>Decrypt</key>
+			<true/>
+			<key>Patch</key>
+			<true/>
+		</dict>
+		<key>iBEC</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/dfu/iBEC.n90ap.RELEASE.dfu</string>
+			<key>IV</key>
+			<string>d435f60732b322140217f21f1589b8b4</string>
+			<key>Key</key>
+			<string>240580fa75a672a810100daec3bfc0cd189270c621e575b469e02e62029de12b</string>
+			<key>Decrypt</key>
+			<true/>
+			<key>Patch</key>
+			<true/>
+		</dict>
+		<key>Restore Ramdisk</key>
+		<dict>
+			<key>File</key>
+			<string>018-7923-347.dmg</string>
+			<key>IV</key>
+			<string>370db2a05be567e5ff81363bbb69b89e</string>
+			<key>Key</key>
+			<string>774998512d4042a9da350aa07c7cd2f0e2b7c30730e88f3923e9bf029c556798</string>
+			<key>Decrypt</key>
+			<true/>
+		</dict>
+		<key>RestoreDeviceTree</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/DeviceTree.n90ap.img3</string>
+			<key>IV</key>
+			<string>405679c2f3366b32cce54faf77651611</string>
+			<key>Key</key>
+			<string>0c1e3e471b1cf6633c992f556f93257e6e2c295af77da52522c93b19a3b03f2a</string>
+			<key>DecryptPath</key>
+			<string>Downgrade/DeviceTree.n90ap.img3</string>
+		</dict>
+		<key>RestoreLogo</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/applelogo-640x960.s5l8930x.img3</string>
+			<key>IV</key>
+			<string>e65ce8671b58fc4c779e166eab10e8ff</string>
+			<key>Key</key>
+			<string>9d4f781b6384b85b8b5a6cc0b33bc584163b546fca3defff21137d7dcc50d380</string>
+			<key>DecryptPath</key>
+			<string>Downgrade/applelogo-640x960.s5l8930x.img3</string>
+		</dict>
+	</dict>
+	<key>FirmwareReplace</key>
+	<dict>
+		<key>AppleLogo</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/applelogo7-640x960.s5l8930x.img3</string>
+		</dict>
+		<key>NewAppleLogo</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/applelogo-640x960.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryCharging0</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batterycharging0-640x960.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryCharging1</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batterycharging1-640x960.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryFull</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batteryfull-640x960.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryLow0</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batterylow0-640x960.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryLow1</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batterylow1-640x960.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryPlugin</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/glyphplugin-640x960.s5l8930x.img3</string>
+		</dict>
+		<key>RecoveryMode</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/recoverymode7-640x960.s5l8930x.img3</string>
+		</dict>
+		<key>NewRecoveryMode</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/recoverymode-640x960.s5l8930x.img3</string>
+		</dict>
+		<key>LLB</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/LLB.n90ap.RELEASE.img3</string>
+		</dict>
+		<key>iBoot</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/iBoot.n90ap.RELEASE.img3</string>
+		</dict>
+		<key>NewiBoot</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/iBoot5.n90ap.RELEASE.img3</string>
+			<key>IV</key>
+			<string>15dd404efbb24a842d08dcde21e777a0</string>
+			<key>Key</key>
+			<string>71614af73814c3a8e6724d592ecfccdbace766dad5eb39b0b8313387e94d2964</string>
+		</dict>
+		<key>manifest</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/manifest</string>
+			<key>manifest</key>
+			<string>manifest</string>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/resources/firmware/powdersn0wBundles/iPhone3,1_5.0_9A334.bundle/manifest b/resources/firmware/powdersn0wBundles/iPhone3,1_5.0_9A334.bundle/manifest
new file mode 100644
index 0000000..51311e6
--- /dev/null
+++ b/resources/firmware/powdersn0wBundles/iPhone3,1_5.0_9A334.bundle/manifest
@@ -0,0 +1,15 @@
+LLB.n90ap.RELEASE.img3
+iBoot.n90ap.RELEASE.img3
+DeviceTree.n90ap.img3
+applelogo7-640x960.s5l8930x.img3
+batterylow0-640x960.s5l8930x.img3
+batterylow1-640x960.s5l8930x.img3
+glyphcharging-640x960.s5l8930x.img3
+batterycharging0-640x960.s5l8930x.img3
+batterycharging1-640x960.s5l8930x.img3
+glyphplugin-640x960.s5l8930x.img3
+batteryfull-640x960.s5l8930x.img3
+recoverymode7-640x960.s5l8930x.img3
+iBoot5.n90ap.RELEASE.img3
+applelogo-640x960.s5l8930x.img3
+recoverymode-640x960.s5l8930x.img3
diff --git a/resources/firmware/powdersn0wBundles/iPhone3,1_5.1.1_9B206.bundle/Info.plist b/resources/firmware/powdersn0wBundles/iPhone3,1_5.1.1_9B206.bundle/Info.plist
new file mode 100644
index 0000000..47b6be9
--- /dev/null
+++ b/resources/firmware/powdersn0wBundles/iPhone3,1_5.1.1_9B206.bundle/Info.plist
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>Filename</key>
+	<string>iPhone3,1_5.1.1_9B206_Restore.ipsw</string>
+	<key>RootFilesystem</key>
+	<string>038-4292-008.dmg</string>
+	<key>RootFilesystemKey</key>
+	<string>e897c2d0aaaea8f2752ff6e144c6efc3158a5dad13c6b95ebe8b99885fc6ad0f6b5448f7</string>
+	<key>RootFilesystemSize</key>
+	<integer>1050</integer>
+	<key>RamdiskOptionsPath</key>
+	<string>/usr/local/share/restore/options.n90.plist</string>
+	<key>SHA256</key>
+	<string>a3703857bc978bb94886dbe68dedd8fa447552209898d9dff6ecb19db233c195</string>
+	<key>FilesystemPackage</key>
+	<dict/>
+	<key>RamdiskPackage</key>
+	<dict>
+		<key>package</key>
+		<string>src/bin.tar</string>
+		<key>ios</key>
+		<string>ios5</string>
+	</dict>
+	<key>Firmware</key>
+	<dict>
+		<key>iBSS</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/dfu/iBSS.n90ap.RELEASE.dfu</string>
+			<key>IV</key>
+			<string>345a34eb3caf3af6a72a0a9559c2e1f9</string>
+			<key>Key</key>
+			<string>3ffb0887082322cc696a3b1dd69547880363a6f54f1a03b20132d401278f3e47</string>
+			<key>Decrypt</key>
+			<true/>
+			<key>Patch</key>
+			<true/>
+		</dict>
+		<key>iBEC</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/dfu/iBEC.n90ap.RELEASE.dfu</string>
+			<key>IV</key>
+			<string>19db86b7cfa95c222d50c9e3fe6c2681</string>
+			<key>Key</key>
+			<string>84b1dc2baa4573899128ae72cd8d2e27cd024ef563755362e6c07547463a6e6b</string>
+			<key>Decrypt</key>
+			<true/>
+			<key>Patch</key>
+			<true/>
+		</dict>
+		<key>Restore Ramdisk</key>
+		<dict>
+			<key>File</key>
+			<string>038-4361-021.dmg</string>
+			<key>IV</key>
+			<string>3474f5208fc45aae32734213171b95ee</string>
+			<key>Key</key>
+			<string>4f1419111e1c66c2e597fa79acfad75ce501d043af6eda8a980b6cd4332823ec</string>
+			<key>Decrypt</key>
+			<true/>
+		</dict>
+		<key>RestoreDeviceTree</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/DeviceTree.n90ap.img3</string>
+			<key>IV</key>
+			<string>863b51688385f28267112e02bb7cf910</string>
+			<key>Key</key>
+			<string>2f2cf5c8ee5515b0889d0f1c9a071e353c210f616db22a3389b4bc6c45d1ab00</string>
+			<key>DecryptPath</key>
+			<string>Downgrade/DeviceTree.n90ap.img3</string>
+		</dict>
+		<key>RestoreLogo</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/applelogo@2x.s5l8930x.img3</string>
+			<key>IV</key>
+			<string>9d8c3366e67a76fba95288c2da08f677</string>
+			<key>Key</key>
+			<string>b165b5f5eaa3f9c4caa1ead70db3075f80f2d9ad86be84cfa42188fac3ef3c09</string>
+			<key>DecryptPath</key>
+			<string>Downgrade/applelogo@2x.s5l8930x.img3</string>
+		</dict>
+	</dict>
+	<key>FirmwareReplace</key>
+	<dict>
+		<key>AppleLogo</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/applelogo7@2x.s5l8930x.img3</string>
+		</dict>
+		<key>NewAppleLogo</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/applelogo@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryCharging0</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batterycharging0@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryCharging1</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batterycharging1@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryFull</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batteryfull@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryLow0</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batterylow0@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryLow1</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batterylow1@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryPlugin</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/glyphplugin@2x.s5l8930x.img3</string>
+		</dict>
+		<key>RecoveryMode</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/recoverymode7@2x~iphone.s5l8930x.img3</string>
+		</dict>
+		<key>NewRecoveryMode</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/recoverymode@2x~iphone.s5l8930x.img3</string>
+		</dict>
+		<key>LLB</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/LLB.n90ap.RELEASE.img3</string>
+		</dict>
+		<key>iBoot</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/iBoot.n90ap.RELEASE.img3</string>
+		</dict>
+		<key>NewiBoot</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/iBoot5.n90ap.RELEASE.img3</string>
+			<key>IV</key>
+			<string>b1846de299191186ce3bbb22432eca12</string>
+			<key>Key</key>
+			<string>e8e26976984e83f967b16bdb3a65a3ec45003cdf2aaf8d541104c26797484138</string>
+		</dict>
+		<key>manifest</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/manifest</string>
+			<key>manifest</key>
+			<string>manifest</string>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/resources/firmware/powdersn0wBundles/iPhone3,1_5.1.1_9B206.bundle/manifest b/resources/firmware/powdersn0wBundles/iPhone3,1_5.1.1_9B206.bundle/manifest
new file mode 100644
index 0000000..ccda488
--- /dev/null
+++ b/resources/firmware/powdersn0wBundles/iPhone3,1_5.1.1_9B206.bundle/manifest
@@ -0,0 +1,15 @@
+LLB.n90ap.RELEASE.img3
+iBoot.n90ap.RELEASE.img3
+DeviceTree.n90ap.img3
+applelogo7@2x.s5l8930x.img3
+batterylow0@2x.s5l8930x.img3
+batterylow1@2x.s5l8930x.img3
+glyphcharging@2x.s5l8930x.img3
+batterycharging0@2x.s5l8930x.img3
+batterycharging1@2x.s5l8930x.img3
+glyphplugin@2x.s5l8930x.img3
+batteryfull@2x.s5l8930x.img3
+recoverymode7@2x~iphone.s5l8930x.img3
+iBoot5.n90ap.RELEASE.img3
+applelogo@2x.s5l8930x.img3
+recoverymode@2x~iphone.s5l8930x.img3
diff --git a/resources/firmware/powdersn0wBundles/iPhone3,1_5.1.1_9B208.bundle/Info.plist b/resources/firmware/powdersn0wBundles/iPhone3,1_5.1.1_9B208.bundle/Info.plist
new file mode 100644
index 0000000..7bc7e47
--- /dev/null
+++ b/resources/firmware/powdersn0wBundles/iPhone3,1_5.1.1_9B208.bundle/Info.plist
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>Filename</key>
+	<string>iPhone3,1_5.1.1_9B208_Restore.ipsw</string>
+	<key>RootFilesystem</key>
+	<string>038-5508-003.dmg</string>
+	<key>RootFilesystemKey</key>
+	<string>d5811298fa4bb88e0bb15c7d16abe69ee74666bd263db16b59eb64b98872de0f9438a56b</string>
+	<key>RootFilesystemSize</key>
+	<integer>1050</integer>
+	<key>RamdiskOptionsPath</key>
+	<string>/usr/local/share/restore/options.n90.plist</string>
+	<key>SHA256</key>
+	<string>d3368791fe396923a500d1cfc5692e8e7ba90a6362cc972726af280694aab25b</string>
+	<key>FilesystemPackage</key>
+	<dict/>
+	<key>RamdiskPackage</key>
+	<dict>
+		<key>package</key>
+		<string>src/bin.tar</string>
+		<key>ios</key>
+		<string>ios5</string>
+	</dict>
+	<key>Firmware</key>
+	<dict>
+		<key>iBSS</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/dfu/iBSS.n90ap.RELEASE.dfu</string>
+			<key>IV</key>
+			<string>cc7a22d7a097266bab807fd6dc52056d</string>
+			<key>Key</key>
+			<string>1a669876c9e6e1423fe153ca7ab817a9c210fea5e96fb5e52cb4c6e8b3ef4a1c</string>
+			<key>Decrypt</key>
+			<true/>
+			<key>Patch</key>
+			<true/>
+		</dict>
+		<key>iBEC</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/dfu/iBEC.n90ap.RELEASE.dfu</string>
+			<key>IV</key>
+			<string>d27e94c066831e6148937622ea4b41aa</string>
+			<key>Key</key>
+			<string>cce6b84ba39aaa034dfe63efd8fac8c745f7585b8dc305f2c514d5ac9d530c02</string>
+			<key>Decrypt</key>
+			<true/>
+			<key>Patch</key>
+			<true/>
+		</dict>
+		<key>Restore Ramdisk</key>
+		<dict>
+			<key>File</key>
+			<string>038-5512-003.dmg</string>
+			<key>IV</key>
+			<string>4e1f7c7bbd422056d58c71ac09fb4f1e</string>
+			<key>Key</key>
+			<string>6c8e84211adeee5f4118869d82c371237f589cf77ec12e89d58d08d7a41a8aca</string>
+			<key>Decrypt</key>
+			<true/>
+		</dict>
+		<key>RestoreDeviceTree</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/DeviceTree.n90ap.img3</string>
+			<key>IV</key>
+			<string>d7db2341b49d3af5521cc18b3218bad8</string>
+			<key>Key</key>
+			<string>e48c1e8c85c0585ac0c062d3176949c269826fddb171e97b5982c97956db2f43</string>
+			<key>DecryptPath</key>
+			<string>Downgrade/DeviceTree.n90ap.img3</string>
+		</dict>
+		<key>RestoreLogo</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/applelogo@2x.s5l8930x.img3</string>
+			<key>IV</key>
+			<string>230c11190485c39a171d80fd79a6d40a</string>
+			<key>Key</key>
+			<string>394016a4ceea8bba7dbc9b21f2141ee47e6c0a4aa300354774422f1128a2aab2</string>
+			<key>DecryptPath</key>
+			<string>Downgrade/applelogo@2x.s5l8930x.img3</string>
+		</dict>
+	</dict>
+	<key>FirmwareReplace</key>
+	<dict>
+		<key>AppleLogo</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/applelogo7@2x.s5l8930x.img3</string>
+		</dict>
+		<key>NewAppleLogo</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/applelogo@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryCharging0</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batterycharging0@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryCharging1</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batterycharging1@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryFull</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batteryfull@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryLow0</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batterylow0@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryLow1</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batterylow1@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryPlugin</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/glyphplugin@2x.s5l8930x.img3</string>
+		</dict>
+		<key>RecoveryMode</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/recoverymode7@2x~iphone.s5l8930x.img3</string>
+		</dict>
+		<key>NewRecoveryMode</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/recoverymode@2x~iphone.s5l8930x.img3</string>
+		</dict>
+		<key>LLB</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/LLB.n90ap.RELEASE.img3</string>
+		</dict>
+		<key>iBoot</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/iBoot.n90ap.RELEASE.img3</string>
+		</dict>
+		<key>NewiBoot</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/iBoot5.n90ap.RELEASE.img3</string>
+			<key>IV</key>
+			<string>71fe96da25812ff341181ba43546ea4f</string>
+			<key>Key</key>
+			<string>6377d34deddf26c9b464f927f18b222be75f1b5547e537742e7dfca305660fea</string>
+		</dict>
+		<key>manifest</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/manifest</string>
+			<key>manifest</key>
+			<string>manifest</string>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/resources/firmware/powdersn0wBundles/iPhone3,1_5.1.1_9B208.bundle/manifest b/resources/firmware/powdersn0wBundles/iPhone3,1_5.1.1_9B208.bundle/manifest
new file mode 100644
index 0000000..ccda488
--- /dev/null
+++ b/resources/firmware/powdersn0wBundles/iPhone3,1_5.1.1_9B208.bundle/manifest
@@ -0,0 +1,15 @@
+LLB.n90ap.RELEASE.img3
+iBoot.n90ap.RELEASE.img3
+DeviceTree.n90ap.img3
+applelogo7@2x.s5l8930x.img3
+batterylow0@2x.s5l8930x.img3
+batterylow1@2x.s5l8930x.img3
+glyphcharging@2x.s5l8930x.img3
+batterycharging0@2x.s5l8930x.img3
+batterycharging1@2x.s5l8930x.img3
+glyphplugin@2x.s5l8930x.img3
+batteryfull@2x.s5l8930x.img3
+recoverymode7@2x~iphone.s5l8930x.img3
+iBoot5.n90ap.RELEASE.img3
+applelogo@2x.s5l8930x.img3
+recoverymode@2x~iphone.s5l8930x.img3
diff --git a/resources/firmware/powdersn0wBundles/iPhone3,1_5.1_9B176.bundle/Info.plist b/resources/firmware/powdersn0wBundles/iPhone3,1_5.1_9B176.bundle/Info.plist
new file mode 100644
index 0000000..4e591f0
--- /dev/null
+++ b/resources/firmware/powdersn0wBundles/iPhone3,1_5.1_9B176.bundle/Info.plist
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>Filename</key>
+	<string>iPhone3,1_5.1_9B176_Restore.ipsw</string>
+	<key>RootFilesystem</key>
+	<string>038-1768-165.dmg</string>
+	<key>RootFilesystemKey</key>
+	<string>b51d75f7ba8c51397ccd5dbcf8929b14419bfc5e4b21b0370f73d2c9f9e1067b03336989</string>
+	<key>RootFilesystemSize</key>
+	<integer>1050</integer>
+	<key>RamdiskOptionsPath</key>
+	<string>/usr/local/share/restore/options.n90.plist</string>
+	<key>SHA256</key>
+	<string>7815a5a2fa0c8de063019617468fd73c740049874c21723a5ad02d0418171f0e</string>
+	<key>FilesystemPackage</key>
+	<dict/>
+	<key>RamdiskPackage</key>
+	<dict>
+		<key>package</key>
+		<string>src/bin.tar</string>
+		<key>ios</key>
+		<string>ios5</string>
+	</dict>
+	<key>Firmware</key>
+	<dict>
+		<key>iBSS</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/dfu/iBSS.n90ap.RELEASE.dfu</string>
+			<key>IV</key>
+			<string>345a34eb3caf3af6a72a0a9559c2e1f9</string>
+			<key>Key</key>
+			<string>3ffb0887082322cc696a3b1dd69547880363a6f54f1a03b20132d401278f3e47</string>
+			<key>Decrypt</key>
+			<true/>
+			<key>Patch</key>
+			<true/>
+		</dict>
+		<key>iBEC</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/dfu/iBEC.n90ap.RELEASE.dfu</string>
+			<key>IV</key>
+			<string>19db86b7cfa95c222d50c9e3fe6c2681</string>
+			<key>Key</key>
+			<string>84b1dc2baa4573899128ae72cd8d2e27cd024ef563755362e6c07547463a6e6b</string>
+			<key>Decrypt</key>
+			<true/>
+			<key>Patch</key>
+			<true/>
+		</dict>
+		<key>Restore Ramdisk</key>
+		<dict>
+			<key>File</key>
+			<string>038-1813-172.dmg</string>
+			<key>IV</key>
+			<string>452cd6f17561636ccce83d19d02cbb94</string>
+			<key>Key</key>
+			<string>33ae12d4d5e0d108067dbe78e341fe7111f496af94b08bc6eed6e79290ac8920</string>
+			<key>Decrypt</key>
+			<true/>
+		</dict>
+		<key>RestoreDeviceTree</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/DeviceTree.n90ap.img3</string>
+			<key>IV</key>
+			<string>863b51688385f28267112e02bb7cf910</string>
+			<key>Key</key>
+			<string>2f2cf5c8ee5515b0889d0f1c9a071e353c210f616db22a3389b4bc6c45d1ab00</string>
+			<key>DecryptPath</key>
+			<string>Downgrade/DeviceTree.n90ap.img3</string>
+		</dict>
+		<key>RestoreLogo</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/applelogo@2x.s5l8930x.img3</string>
+			<key>IV</key>
+			<string>9d8c3366e67a76fba95288c2da08f677</string>
+			<key>Key</key>
+			<string>b165b5f5eaa3f9c4caa1ead70db3075f80f2d9ad86be84cfa42188fac3ef3c09</string>
+			<key>DecryptPath</key>
+			<string>Downgrade/applelogo@2x.s5l8930x.img3</string>
+		</dict>
+	</dict>
+	<key>FirmwareReplace</key>
+	<dict>
+		<key>AppleLogo</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/applelogo7@2x.s5l8930x.img3</string>
+		</dict>
+		<key>NewAppleLogo</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/applelogo@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryCharging0</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batterycharging0@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryCharging1</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batterycharging1@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryFull</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batteryfull@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryLow0</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batterylow0@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryLow1</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batterylow1@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryPlugin</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/glyphplugin@2x.s5l8930x.img3</string>
+		</dict>
+		<key>RecoveryMode</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/recoverymode7@2x~iphone.s5l8930x.img3</string>
+		</dict>
+		<key>NewRecoveryMode</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/recoverymode@2x~iphone.s5l8930x.img3</string>
+		</dict>
+		<key>LLB</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/LLB.n90ap.RELEASE.img3</string>
+		</dict>
+		<key>iBoot</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/iBoot.n90ap.RELEASE.img3</string>
+		</dict>
+		<key>NewiBoot</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/iBoot5.n90ap.RELEASE.img3</string>
+			<key>IV</key>
+			<string>b1846de299191186ce3bbb22432eca12</string>
+			<key>Key</key>
+			<string>e8e26976984e83f967b16bdb3a65a3ec45003cdf2aaf8d541104c26797484138</string>
+		</dict>
+		<key>manifest</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/manifest</string>
+			<key>manifest</key>
+			<string>manifest</string>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/resources/firmware/powdersn0wBundles/iPhone3,1_5.1_9B176.bundle/manifest b/resources/firmware/powdersn0wBundles/iPhone3,1_5.1_9B176.bundle/manifest
new file mode 100644
index 0000000..ccda488
--- /dev/null
+++ b/resources/firmware/powdersn0wBundles/iPhone3,1_5.1_9B176.bundle/manifest
@@ -0,0 +1,15 @@
+LLB.n90ap.RELEASE.img3
+iBoot.n90ap.RELEASE.img3
+DeviceTree.n90ap.img3
+applelogo7@2x.s5l8930x.img3
+batterylow0@2x.s5l8930x.img3
+batterylow1@2x.s5l8930x.img3
+glyphcharging@2x.s5l8930x.img3
+batterycharging0@2x.s5l8930x.img3
+batterycharging1@2x.s5l8930x.img3
+glyphplugin@2x.s5l8930x.img3
+batteryfull@2x.s5l8930x.img3
+recoverymode7@2x~iphone.s5l8930x.img3
+iBoot5.n90ap.RELEASE.img3
+applelogo@2x.s5l8930x.img3
+recoverymode@2x~iphone.s5l8930x.img3
diff --git a/resources/firmware/powdersn0wBundles/iPhone3,1_6.0.1_10A523.bundle/Info.plist b/resources/firmware/powdersn0wBundles/iPhone3,1_6.0.1_10A523.bundle/Info.plist
new file mode 100644
index 0000000..ffe2287
--- /dev/null
+++ b/resources/firmware/powdersn0wBundles/iPhone3,1_6.0.1_10A523.bundle/Info.plist
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>Filename</key>
+	<string>iPhone3,1_6.0.1_10A523_Restore.ipsw</string>
+	<key>RootFilesystem</key>
+	<string>038-7954-010.dmg</string>
+	<key>RootFilesystemKey</key>
+	<string>43fd5c7357cfc1bfa0c16ab72343bcb9e8974922b3c00af7a27cf522d2dca3ec471a6f83</string>
+	<key>RootFilesystemSize</key>
+	<integer>1250</integer>
+	<key>RamdiskOptionsPath</key>
+	<string>/usr/local/share/restore/options.n90.plist</string>
+	<key>SHA256</key>
+	<string>f07027dcc4f2a7c9875916a9cebe8b9ce164a2437a90d567f59ae69f2a754fe2</string>
+	<key>FilesystemPackage</key>
+	<dict>
+		<key>bootstrap</key>
+		<string>src/cydia6.tar</string>
+	</dict>
+	<key>RamdiskPackage</key>
+	<dict>
+		<key>package</key>
+		<string>src/bin.tar</string>
+		<key>ios</key>
+		<string>ios6</string>
+	</dict>
+	<key>Firmware</key>
+	<dict>
+		<key>iBSS</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/dfu/iBSS.n90ap.RELEASE.dfu</string>
+			<key>IV</key>
+			<string>11fd507c05c222c9ea30634eada9d391</string>
+			<key>Key</key>
+			<string>9b9bd947f740e60ca8952f8f9a5761dc8eab731cf89e23e8691d64e16074234f</string>
+			<key>Decrypt</key>
+			<true/>
+			<key>Patch</key>
+			<true/>
+		</dict>
+		<key>iBEC</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/dfu/iBEC.n90ap.RELEASE.dfu</string>
+			<key>IV</key>
+			<string>4517bebd4d0fad488bd88f671831609d</string>
+			<key>Key</key>
+			<string>151c7f6bacb40445de2daf2c148a30e575e08d2838d748c8bdd3b5035c2c89c7</string>
+			<key>Decrypt</key>
+			<true/>
+			<key>Patch</key>
+			<true/>
+		</dict>
+		<key>Restore Ramdisk</key>
+		<dict>
+			<key>File</key>
+			<string>038-7924-011.dmg</string>
+			<key>IV</key>
+			<string>194e366b834b8f9e9198501c97bce415</string>
+			<key>Key</key>
+			<string>cae9139cc5acc140d56af65a6fb99635dd6d404ae928f359030c34dccea4b5c6</string>
+			<key>Decrypt</key>
+			<true/>
+		</dict>
+		<key>RestoreDeviceTree</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/DeviceTree.n90ap.img3</string>
+			<key>IV</key>
+			<string>37da02aa49090b789d9bb776b7510cde</string>
+			<key>Key</key>
+			<string>19729032039995f9442c181de80acf6f2cd958194391125214c313ed9f1b9f13</string>
+			<key>DecryptPath</key>
+			<string>Downgrade/DeviceTree.n90ap.img3</string>
+		</dict>
+		<key>RestoreLogo</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/applelogo@2x.s5l8930x.img3</string>
+			<key>IV</key>
+			<string>fa0abf89c62f9be2e9d724ce8ff92965</string>
+			<key>Key</key>
+			<string>eddd34308ec6138bfccd1004e9ea03e7217dc685e92515613d0d06135eeff71c</string>
+			<key>DecryptPath</key>
+			<string>Downgrade/applelogo@2x.s5l8930x.img3</string>
+		</dict>
+		<key>KernelCache</key>
+		<dict>
+			<key>File</key>
+			<string>kernelcache.release.n90</string>
+			<key>IV</key>
+			<string>abab1567820728d241ac0e25b8affa15</string>
+			<key>Key</key>
+			<string>8ba953615e9d89e0e8025e7f1d156da9f49b045a3b4fa23defacb2ee6808986e</string>
+			<key>Decrypt</key>
+			<true/>
+			<key>DecryptPath</key>
+			<string>Downgrade/kernelcache.release.n90</string>
+			<key>Patch</key>
+			<true/>
+		</dict>
+	</dict>
+	<key>FirmwareReplace</key>
+	<dict>
+		<key>AppleLogo</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/applelogo7@2x.s5l8930x.img3</string>
+		</dict>
+		<key>NewAppleLogo</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/applelogo@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryCharging0</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batterycharging0@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryCharging1</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batterycharging1@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryFull</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batteryfull@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryLow0</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batterylow0@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryLow1</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batterylow1@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryPlugin</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/glyphplugin@2x.s5l8930x.img3</string>
+		</dict>
+		<key>RecoveryMode</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/recoverymode7@2x~iphone.s5l8930x.img3</string>
+		</dict>
+		<key>NewRecoveryMode</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/recoverymode@2x~iphone.s5l8930x.img3</string>
+		</dict>
+		<key>LLB</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/LLB.n90ap.RELEASE.img3</string>
+		</dict>
+		<key>iBoot</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/iBoot.n90ap.RELEASE.img3</string>
+		</dict>
+		<key>NewiBoot</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/iBoot6.n90ap.RELEASE.img3</string>
+			<key>IV</key>
+			<string>44ffe675d6f31167369787a17725d06c</string>
+			<key>Key</key>
+			<string>8d539232c0e906a9f60caa462f189530f745c4abd81a742b4d1ec1cb8b9ca6c3</string>
+		</dict>
+		<key>manifest</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/manifest</string>
+			<key>manifest</key>
+			<string>manifest</string>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/resources/firmware/powdersn0wBundles/iPhone3,1_6.0.1_10A523.bundle/manifest b/resources/firmware/powdersn0wBundles/iPhone3,1_6.0.1_10A523.bundle/manifest
new file mode 100644
index 0000000..f000300
--- /dev/null
+++ b/resources/firmware/powdersn0wBundles/iPhone3,1_6.0.1_10A523.bundle/manifest
@@ -0,0 +1,15 @@
+LLB.n90ap.RELEASE.img3
+iBoot.n90ap.RELEASE.img3
+DeviceTree.n90ap.img3
+applelogo7@2x.s5l8930x.img3
+batterylow0@2x.s5l8930x.img3
+batterylow1@2x.s5l8930x.img3
+glyphcharging@2x.s5l8930x.img3
+batterycharging0@2x.s5l8930x.img3
+batterycharging1@2x.s5l8930x.img3
+glyphplugin@2x.s5l8930x.img3
+batteryfull@2x.s5l8930x.img3
+recoverymode7@2x~iphone.s5l8930x.img3
+iBoot6.n90ap.RELEASE.img3
+applelogo@2x.s5l8930x.img3
+recoverymode@2x~iphone.s5l8930x.img3
diff --git a/resources/firmware/powdersn0wBundles/iPhone3,1_6.0_10A403.bundle/Info.plist b/resources/firmware/powdersn0wBundles/iPhone3,1_6.0_10A403.bundle/Info.plist
new file mode 100644
index 0000000..34a6bb1
--- /dev/null
+++ b/resources/firmware/powdersn0wBundles/iPhone3,1_6.0_10A403.bundle/Info.plist
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>Filename</key>
+	<string>iPhone3,1_6.0_10A403_Restore.ipsw</string>
+	<key>RootFilesystem</key>
+	<string>038-6494-001.dmg</string>
+	<key>RootFilesystemKey</key>
+	<string>ca9ed452f256fa47ccdb387fdc0daa53d19428b2569fb089af58df576f6e54a4fb6de0ae</string>
+	<key>RootFilesystemSize</key>
+	<integer>1250</integer>
+	<key>RamdiskOptionsPath</key>
+	<string>/usr/local/share/restore/options.n90.plist</string>
+	<key>SHA256</key>
+	<string>f1c3cfc30f626a60ccbf98495f2670cc247b16095978f38d75fce09986e13cff</string>
+	<key>FilesystemPackage</key>
+	<dict>
+		<key>bootstrap</key>
+		<string>src/cydia6.tar</string>
+	</dict>
+	<key>RamdiskPackage</key>
+	<dict>
+		<key>package</key>
+		<string>src/bin.tar</string>
+		<key>ios</key>
+		<string>ios6</string>
+	</dict>
+	<key>Firmware</key>
+	<dict>
+		<key>iBSS</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/dfu/iBSS.n90ap.RELEASE.dfu</string>
+			<key>IV</key>
+			<string>b65e495bc0f82471575301f38c9216d8</string>
+			<key>Key</key>
+			<string>5986012d3cd4174b82d1ed5cdc2d0bc0a2bf1ac2f1afeab2ec7b04446be08ce6</string>
+			<key>Decrypt</key>
+			<true/>
+			<key>Patch</key>
+			<true/>
+		</dict>
+		<key>iBEC</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/dfu/iBEC.n90ap.RELEASE.dfu</string>
+			<key>IV</key>
+			<string>5d4cae31fee59b4f671ec3823dffc421</string>
+			<key>Key</key>
+			<string>5f607a42b35d8935c559ba1216cc19acd1c51dde09c994950c5976b5b4e5fbbd</string>
+			<key>Decrypt</key>
+			<true/>
+			<key>Patch</key>
+			<true/>
+		</dict>
+		<key>Restore Ramdisk</key>
+		<dict>
+			<key>File</key>
+			<string>038-6451-001.dmg</string>
+			<key>IV</key>
+			<string>6e6031e8a7757fa54aed9ac05dafde0a</string>
+			<key>Key</key>
+			<string>ed31e88ae13d996c868b86712d2831d8f8272842b3ecc7baa4bb186dd4b5b4e1</string>
+			<key>Decrypt</key>
+			<true/>
+		</dict>
+		<key>RestoreDeviceTree</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/DeviceTree.n90ap.img3</string>
+			<key>IV</key>
+			<string>d75584bbdd07b5fe5dcbc85b3a62f13d</string>
+			<key>Key</key>
+			<string>bd4b014f7663215a2d31117b9072019d9f723a2f817eebf10f2fce89d9852e0b</string>
+			<key>DecryptPath</key>
+			<string>Downgrade/DeviceTree.n90ap.img3</string>
+		</dict>
+		<key>RestoreLogo</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/applelogo@2x.s5l8930x.img3</string>
+			<key>IV</key>
+			<string>a14d007b10b063d75aae4a2b91999e6c</string>
+			<key>Key</key>
+			<string>25705802dd917d9c651c9b8c49cc4d8874c3a67f5ce1a0adfd4758a14ddff454</string>
+			<key>DecryptPath</key>
+			<string>Downgrade/applelogo@2x.s5l8930x.img3</string>
+		</dict>
+		<key>KernelCache</key>
+		<dict>
+			<key>File</key>
+			<string>kernelcache.release.n90</string>
+			<key>IV</key>
+			<string>1190191032be38e772b988e3ad92d1c2</string>
+			<key>Key</key>
+			<string>9ab5b2651cc8b63ba0d5c05f0218cdbbb1ca24af78853bed97e36412c989a770</string>
+			<key>Decrypt</key>
+			<true/>
+			<key>DecryptPath</key>
+			<string>Downgrade/kernelcache.release.n90</string>
+			<key>Patch</key>
+			<true/>
+		</dict>
+	</dict>
+	<key>FirmwareReplace</key>
+	<dict>
+		<key>AppleLogo</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/applelogo7@2x.s5l8930x.img3</string>
+		</dict>
+		<key>NewAppleLogo</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/applelogo@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryCharging0</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batterycharging0@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryCharging1</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batterycharging1@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryFull</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batteryfull@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryLow0</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batterylow0@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryLow1</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batterylow1@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryPlugin</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/glyphplugin@2x.s5l8930x.img3</string>
+		</dict>
+		<key>RecoveryMode</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/recoverymode7@2x~iphone.s5l8930x.img3</string>
+		</dict>
+		<key>NewRecoveryMode</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/recoverymode@2x~iphone.s5l8930x.img3</string>
+		</dict>
+		<key>LLB</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/LLB.n90ap.RELEASE.img3</string>
+		</dict>
+		<key>iBoot</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/iBoot.n90ap.RELEASE.img3</string>
+		</dict>
+		<key>NewiBoot</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/iBoot6.n90ap.RELEASE.img3</string>
+			<key>IV</key>
+			<string>7891928b9dd0dd919778743a2c8ec6b3</string>
+			<key>Key</key>
+			<string>838270f668a05a60ff352d8549c06d2f21c3e4f7617c72a78d82c92a3ad3a045</string>
+		</dict>
+		<key>manifest</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/manifest</string>
+			<key>manifest</key>
+			<string>manifest</string>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/resources/firmware/powdersn0wBundles/iPhone3,1_6.0_10A403.bundle/manifest b/resources/firmware/powdersn0wBundles/iPhone3,1_6.0_10A403.bundle/manifest
new file mode 100644
index 0000000..f000300
--- /dev/null
+++ b/resources/firmware/powdersn0wBundles/iPhone3,1_6.0_10A403.bundle/manifest
@@ -0,0 +1,15 @@
+LLB.n90ap.RELEASE.img3
+iBoot.n90ap.RELEASE.img3
+DeviceTree.n90ap.img3
+applelogo7@2x.s5l8930x.img3
+batterylow0@2x.s5l8930x.img3
+batterylow1@2x.s5l8930x.img3
+glyphcharging@2x.s5l8930x.img3
+batterycharging0@2x.s5l8930x.img3
+batterycharging1@2x.s5l8930x.img3
+glyphplugin@2x.s5l8930x.img3
+batteryfull@2x.s5l8930x.img3
+recoverymode7@2x~iphone.s5l8930x.img3
+iBoot6.n90ap.RELEASE.img3
+applelogo@2x.s5l8930x.img3
+recoverymode@2x~iphone.s5l8930x.img3
diff --git a/resources/firmware/powdersn0wBundles/iPhone3,1_6.1.2_10B146.bundle/Info.plist b/resources/firmware/powdersn0wBundles/iPhone3,1_6.1.2_10B146.bundle/Info.plist
new file mode 100644
index 0000000..dcceac3
--- /dev/null
+++ b/resources/firmware/powdersn0wBundles/iPhone3,1_6.1.2_10B146.bundle/Info.plist
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>Filename</key>
+	<string>iPhone3,1_6.1.2_10B146_Restore.ipsw</string>
+	<key>RootFilesystem</key>
+	<string>048-0903-002.dmg</string>
+	<key>RootFilesystemKey</key>
+	<string>01c1fb58265e6a22ebe784edf55cc549d4f7f73d5a5769eb7365d1145b3f9e0798b8851a</string>
+	<key>RootFilesystemSize</key>
+	<integer>1215</integer>
+	<key>RamdiskOptionsPath</key>
+	<string>/usr/local/share/restore/options.n90.plist</string>
+	<key>SHA256</key>
+	<string>fb327df2b74b7b8d1063de4d88dc91bbdfaa66dd8c06f01b1931903014588ffd</string>
+	<key>FilesystemPackage</key>
+	<dict>
+		<key>bootstrap</key>
+		<string>src/cydia6.tar</string>
+	</dict>
+	<key>RamdiskPackage</key>
+	<dict>
+		<key>package</key>
+		<string>src/bin.tar</string>
+		<key>ios</key>
+		<string>ios6</string>
+	</dict>
+	<key>Firmware</key>
+	<dict>
+		<key>iBSS</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/dfu/iBSS.n90ap.RELEASE.dfu</string>
+			<key>IV</key>
+			<string>f6a85b0dc5f5fdd1bf60dbebabf7cbb4</string>
+			<key>Key</key>
+			<string>96cb3c60be2dca2c80d1ea9f569da4745c87bc76e3db3e2bb5de950b2ceb4e06</string>
+			<key>Decrypt</key>
+			<true/>
+			<key>Patch</key>
+			<true/>
+		</dict>
+		<key>iBEC</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/dfu/iBEC.n90ap.RELEASE.dfu</string>
+			<key>IV</key>
+			<string>007445532f74d73324809bb89dd4e227</string>
+			<key>Key</key>
+			<string>4ba778de8d22c9aa4c82227933d87fff3dd895d4dbbab9566a76b9d58ab331fc</string>
+			<key>Decrypt</key>
+			<true/>
+			<key>Patch</key>
+			<true/>
+		</dict>
+		<key>Restore Ramdisk</key>
+		<dict>
+			<key>File</key>
+			<string>048-1037-002.dmg</string>
+			<key>IV</key>
+			<string>fab2441195cde907e72d8edc17313173</string>
+			<key>Key</key>
+			<string>2d37685fadf19212f422c37dd6beb5191098b56c9efecb0d894946c5079d33b6</string>
+			<key>Decrypt</key>
+			<true/>
+		</dict>
+		<key>RestoreDeviceTree</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/DeviceTree.n90ap.img3</string>
+			<key>IV</key>
+			<string>7bbc45072734ffc7db4d3d92bb595172</string>
+			<key>Key</key>
+			<string>6e0a408c461deb8682048405fa9fea8586a038d4415d90a023f279f5e420fd8e</string>
+			<key>DecryptPath</key>
+			<string>Downgrade/DeviceTree.n90ap.img3</string>
+		</dict>
+		<key>RestoreLogo</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/applelogo@2x.s5l8930x.img3</string>
+			<key>IV</key>
+			<string>3f8242d052747b044ce397913ed0653f</string>
+			<key>Key</key>
+			<string>8c55091ae1df185dabe7710ee987bc5a06460ca2930f4bf3ddf8b6fcd248fd67</string>
+			<key>DecryptPath</key>
+			<string>Downgrade/applelogo@2x.s5l8930x.img3</string>
+		</dict>
+		<key>KernelCache</key>
+		<dict>
+			<key>File</key>
+			<string>kernelcache.release.n90</string>
+			<key>IV</key>
+			<string>7b2070c0552d25ec7f8132a9d3dbaf21</string>
+			<key>Key</key>
+			<string>b84e3f36912de8d62155c8f7bc84263809dbe1cf40ece2771e22f260b995a3e6</string>
+			<key>Decrypt</key>
+			<true/>
+			<key>DecryptPath</key>
+			<string>Downgrade/kernelcache.release.n90</string>
+			<key>Patch</key>
+			<true/>
+		</dict>
+	</dict>
+	<key>FirmwareReplace</key>
+	<dict>
+		<key>AppleLogo</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/applelogo7@2x.s5l8930x.img3</string>
+		</dict>
+		<key>NewAppleLogo</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/applelogo@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryCharging0</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batterycharging0@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryCharging1</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batterycharging1@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryFull</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batteryfull@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryLow0</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batterylow0@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryLow1</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batterylow1@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryPlugin</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/glyphplugin@2x.s5l8930x.img3</string>
+		</dict>
+		<key>RecoveryMode</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/recoverymode7@2x~iphone.s5l8930x.img3</string>
+		</dict>
+		<key>NewRecoveryMode</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/recoverymode@2x~iphone.s5l8930x.img3</string>
+		</dict>
+		<key>LLB</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/LLB.n90ap.RELEASE.img3</string>
+		</dict>
+		<key>iBoot</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/iBoot.n90ap.RELEASE.img3</string>
+		</dict>
+		<key>NewiBoot</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/iBoot6.n90ap.RELEASE.img3</string>
+			<key>IV</key>
+			<string>c939629e3473fdb67deae0c45582506d</string>
+			<key>Key</key>
+			<string>cbcd007712618cb6ab3be147f0317e22e7cceadb344e99ea1a076ef235c2c534</string>
+		</dict>
+		<key>manifest</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/manifest</string>
+			<key>manifest</key>
+			<string>manifest</string>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/resources/firmware/powdersn0wBundles/iPhone3,1_6.1.2_10B146.bundle/manifest b/resources/firmware/powdersn0wBundles/iPhone3,1_6.1.2_10B146.bundle/manifest
new file mode 100644
index 0000000..f000300
--- /dev/null
+++ b/resources/firmware/powdersn0wBundles/iPhone3,1_6.1.2_10B146.bundle/manifest
@@ -0,0 +1,15 @@
+LLB.n90ap.RELEASE.img3
+iBoot.n90ap.RELEASE.img3
+DeviceTree.n90ap.img3
+applelogo7@2x.s5l8930x.img3
+batterylow0@2x.s5l8930x.img3
+batterylow1@2x.s5l8930x.img3
+glyphcharging@2x.s5l8930x.img3
+batterycharging0@2x.s5l8930x.img3
+batterycharging1@2x.s5l8930x.img3
+glyphplugin@2x.s5l8930x.img3
+batteryfull@2x.s5l8930x.img3
+recoverymode7@2x~iphone.s5l8930x.img3
+iBoot6.n90ap.RELEASE.img3
+applelogo@2x.s5l8930x.img3
+recoverymode@2x~iphone.s5l8930x.img3
diff --git a/resources/firmware/powdersn0wBundles/iPhone3,1_6.1.3_10B329.bundle/Info.plist b/resources/firmware/powdersn0wBundles/iPhone3,1_6.1.3_10B329.bundle/Info.plist
new file mode 100644
index 0000000..8002e05
--- /dev/null
+++ b/resources/firmware/powdersn0wBundles/iPhone3,1_6.1.3_10B329.bundle/Info.plist
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>Filename</key>
+	<string>iPhone3,1_6.1.3_10B329_Restore.ipsw</string>
+	<key>RootFilesystem</key>
+	<string>048-2748-005.dmg</string>
+	<key>RootFilesystemKey</key>
+	<string>c676166434b79cbde341e094000dfc47b3161034371b25a9054880a757d73aead553a317</string>
+	<key>RootFilesystemSize</key>
+	<integer>1300</integer>
+	<key>RamdiskOptionsPath</key>
+	<string>/usr/local/share/restore/options.n90.plist</string>
+	<key>SHA256</key>
+	<string>6bcce44ca93851cecfc87e932f6272ff84bf73b9bab0c2f0c8aeb30eedfda6fa</string>
+	<key>FilesystemPackage</key>
+	<dict>
+		<key>bootstrap</key>
+		<string>src/cydia6.tar</string>
+	</dict>
+	<key>RamdiskPackage</key>
+	<dict>
+		<key>package</key>
+		<string>src/bin.tar</string>
+		<key>ios</key>
+		<string>ios6</string>
+	</dict>
+	<key>Firmware</key>
+	<dict>
+		<key>iBSS</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/dfu/iBSS.n90ap.RELEASE.dfu</string>
+			<key>IV</key>
+			<string>19cb1b58bbf7f392a86b009219978b0a</string>
+			<key>Key</key>
+			<string>ffd8a1e3b07179a92a6ff40fa2859091c1994e56b8bdb86e99fab9191ec92e91</string>
+			<key>Decrypt</key>
+			<true/>
+			<key>Patch</key>
+			<true/>
+		</dict>
+		<key>iBEC</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/dfu/iBEC.n90ap.RELEASE.dfu</string>
+			<key>IV</key>
+			<string>de6c1e093883b4d09df38259d4a79a3f</string>
+			<key>Key</key>
+			<string>22c6cb95034618338ce479927132c5dde85f1d7e936ccefb0f1689c1dcce7724</string>
+			<key>Decrypt</key>
+			<true/>
+			<key>Patch</key>
+			<true/>
+		</dict>
+		<key>Restore Ramdisk</key>
+		<dict>
+			<key>File</key>
+			<string>048-2441-007.dmg</string>
+			<key>IV</key>
+			<string>69317c3838ea9c0bc0af5989782dedab</string>
+			<key>Key</key>
+			<string>4671e53cf6d38df7082b3171eaa60d32d7097c16574386975496b66549dd65b3</string>
+			<key>Decrypt</key>
+			<true/>
+		</dict>
+		<key>RestoreDeviceTree</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/DeviceTree.n90ap.img3</string>
+			<key>IV</key>
+			<string>4a44e07427942e3f0769cd2fb748f60e</string>
+			<key>Key</key>
+			<string>19dc906dbea48840bb32c20add34ac2ac3c2e599370b9b0964a13212dd8aa7e4</string>
+			<key>DecryptPath</key>
+			<string>Downgrade/DeviceTree.n90ap.img3</string>
+		</dict>
+		<key>RestoreLogo</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/applelogo@2x.s5l8930x.img3</string>
+			<key>IV</key>
+			<string>02c61d93a817034d49edb0ad1ef4e77e</string>
+			<key>Key</key>
+			<string>ac48545272fa0c0bd806d9e9e9f3d923e650f5d114b1f9aeef4dd2da326e680c</string>
+			<key>DecryptPath</key>
+			<string>Downgrade/applelogo@2x.s5l8930x.img3</string>
+		</dict>
+		<key>KernelCache</key>
+		<dict>
+			<key>File</key>
+			<string>kernelcache.release.n90</string>
+			<key>IV</key>
+			<string>8f0e033069987ea966ef21cbd57ab385</string>
+			<key>Key</key>
+			<string>62c4d022a02d2c000b51705796d11661610c85f0b09f98ac0322d78a12463227</string>
+			<key>Decrypt</key>
+			<true/>
+			<key>DecryptPath</key>
+			<string>Downgrade/kernelcache.release.n90</string>
+			<key>Patch</key>
+			<true/>
+		</dict>
+	</dict>
+	<key>FirmwareReplace</key>
+	<dict>
+		<key>AppleLogo</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/applelogo7@2x.s5l8930x.img3</string>
+		</dict>
+		<key>NewAppleLogo</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/applelogo@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryCharging0</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batterycharging0@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryCharging1</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batterycharging1@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryFull</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batteryfull@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryLow0</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batterylow0@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryLow1</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batterylow1@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryPlugin</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/glyphplugin@2x.s5l8930x.img3</string>
+		</dict>
+		<key>RecoveryMode</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/recoverymode7@2x~iphone.s5l8930x.img3</string>
+		</dict>
+		<key>NewRecoveryMode</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/recoverymode@2x~iphone.s5l8930x.img3</string>
+		</dict>
+		<key>LLB</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/LLB.n90ap.RELEASE.img3</string>
+		</dict>
+		<key>iBoot</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/iBoot.n90ap.RELEASE.img3</string>
+		</dict>
+		<key>NewiBoot</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/iBoot6.n90ap.RELEASE.img3</string>
+			<key>IV</key>
+			<string>b559a2c7dae9b95643c6610b4cf26dbd</string>
+			<key>Key</key>
+			<string>3dbe8be17af793b043eed7af865f0b843936659550ad692db96865c00171959f</string>
+		</dict>
+		<key>manifest</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/manifest</string>
+			<key>manifest</key>
+			<string>manifest</string>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/resources/firmware/powdersn0wBundles/iPhone3,1_6.1.3_10B329.bundle/manifest b/resources/firmware/powdersn0wBundles/iPhone3,1_6.1.3_10B329.bundle/manifest
new file mode 100644
index 0000000..f000300
--- /dev/null
+++ b/resources/firmware/powdersn0wBundles/iPhone3,1_6.1.3_10B329.bundle/manifest
@@ -0,0 +1,15 @@
+LLB.n90ap.RELEASE.img3
+iBoot.n90ap.RELEASE.img3
+DeviceTree.n90ap.img3
+applelogo7@2x.s5l8930x.img3
+batterylow0@2x.s5l8930x.img3
+batterylow1@2x.s5l8930x.img3
+glyphcharging@2x.s5l8930x.img3
+batterycharging0@2x.s5l8930x.img3
+batterycharging1@2x.s5l8930x.img3
+glyphplugin@2x.s5l8930x.img3
+batteryfull@2x.s5l8930x.img3
+recoverymode7@2x~iphone.s5l8930x.img3
+iBoot6.n90ap.RELEASE.img3
+applelogo@2x.s5l8930x.img3
+recoverymode@2x~iphone.s5l8930x.img3
diff --git a/resources/firmware/powdersn0wBundles/iPhone3,1_6.1_10B144.bundle/Info.plist b/resources/firmware/powdersn0wBundles/iPhone3,1_6.1_10B144.bundle/Info.plist
new file mode 100644
index 0000000..6cd97a1
--- /dev/null
+++ b/resources/firmware/powdersn0wBundles/iPhone3,1_6.1_10B144.bundle/Info.plist
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>Filename</key>
+	<string>iPhone3,1_6.1_10B144_Restore.ipsw</string>
+	<key>RootFilesystem</key>
+	<string>048-0820-001.dmg</string>
+	<key>RootFilesystemKey</key>
+	<string>751775f5f345c9632fcc52876c63cffffd5b05b28b402986e3e0898c2fb8c58051bfd575</string>
+	<key>RootFilesystemSize</key>
+	<integer>1250</integer>
+	<key>RamdiskOptionsPath</key>
+	<string>/usr/local/share/restore/options.n90.plist</string>
+	<key>SHA256</key>
+	<string>d83f8dac345525aaf84d6a384d1d41b0de0034fc0a4c5a8e3af6f91353c593d9</string>
+	<key>FilesystemPackage</key>
+	<dict>
+		<key>bootstrap</key>
+		<string>src/cydia6.tar</string>
+	</dict>
+	<key>RamdiskPackage</key>
+	<dict>
+		<key>package</key>
+		<string>src/bin.tar</string>
+		<key>ios</key>
+		<string>ios6</string>
+	</dict>
+	<key>Firmware</key>
+	<dict>
+		<key>iBSS</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/dfu/iBSS.n90ap.RELEASE.dfu</string>
+			<key>IV</key>
+			<string>24af28537e544ebf981ce32708a7e21f</string>
+			<key>Key</key>
+			<string>f7f5fd61ea0792f13ea84126c3afe33944ddc543b62b552e009cbffaf7e34e28</string>
+			<key>Decrypt</key>
+			<true/>
+			<key>Patch</key>
+			<true/>
+		</dict>
+		<key>iBEC</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/dfu/iBEC.n90ap.RELEASE.dfu</string>
+			<key>IV</key>
+			<string>1168b9ddb4c5df062892810fec574f55</string>
+			<key>Key</key>
+			<string>061695b0ba878657ae195416cff88287f222b50baabb9f72e0c2271db6b58db5</string>
+			<key>Decrypt</key>
+			<true/>
+			<key>Patch</key>
+			<true/>
+		</dict>
+		<key>Restore Ramdisk</key>
+		<dict>
+			<key>File</key>
+			<string>048-0804-001.dmg</string>
+			<key>IV</key>
+			<string>da6418ec5e6a7dc19ea86ee122c3f399</string>
+			<key>Key</key>
+			<string>2ae87a59e7e7915676a24b36688a550e7856304f2fba9ce9395cabf7916f2dca</string>
+			<key>Decrypt</key>
+			<true/>
+		</dict>
+		<key>RestoreDeviceTree</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/DeviceTree.n90ap.img3</string>
+			<key>IV</key>
+			<string>ac5d32440e6706453800850d133ca49c</string>
+			<key>Key</key>
+			<string>d7798b8ebb430737f435d601b48e2283e7d7e47f553f41d18effdc034b07e849</string>
+			<key>DecryptPath</key>
+			<string>Downgrade/DeviceTree.n90ap.img3</string>
+		</dict>
+		<key>RestoreLogo</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/applelogo@2x.s5l8930x.img3</string>
+			<key>IV</key>
+			<string>0f69a6197a7af2f40b025ff13baa960f</string>
+			<key>Key</key>
+			<string>0f7ff6214f7e3d5edd172d86502a18e9d51d1a596e0b28b92d541914ae039665</string>
+			<key>DecryptPath</key>
+			<string>Downgrade/applelogo@2x.s5l8930x.img3</string>
+		</dict>
+		<key>KernelCache</key>
+		<dict>
+			<key>File</key>
+			<string>kernelcache.release.n90</string>
+			<key>IV</key>
+			<string>916fa4a426eb1ddd0d61d90244e093d7</string>
+			<key>Key</key>
+			<string>fa8f887fa67031e4951f5b6dacdbe32a796a2899b1942774cf768c27d78e841a</string>
+			<key>Decrypt</key>
+			<true/>
+			<key>DecryptPath</key>
+			<string>Downgrade/kernelcache.release.n90</string>
+			<key>Patch</key>
+			<true/>
+		</dict>
+	</dict>
+	<key>FirmwareReplace</key>
+	<dict>
+		<key>AppleLogo</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/applelogo7@2x.s5l8930x.img3</string>
+		</dict>
+		<key>NewAppleLogo</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/applelogo@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryCharging0</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batterycharging0@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryCharging1</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batterycharging1@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryFull</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batteryfull@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryLow0</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batterylow0@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryLow1</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/batterylow1@2x.s5l8930x.img3</string>
+		</dict>
+		<key>BatteryPlugin</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/glyphplugin@2x.s5l8930x.img3</string>
+		</dict>
+		<key>RecoveryMode</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/recoverymode7@2x~iphone.s5l8930x.img3</string>
+		</dict>
+		<key>NewRecoveryMode</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/recoverymode@2x~iphone.s5l8930x.img3</string>
+		</dict>
+		<key>LLB</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/LLB.n90ap.RELEASE.img3</string>
+		</dict>
+		<key>iBoot</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/iBoot.n90ap.RELEASE.img3</string>
+		</dict>
+		<key>NewiBoot</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/iBoot6.n90ap.RELEASE.img3</string>
+			<key>IV</key>
+			<string>4d76b7e25893839cfca478b44ddef3dd</string>
+			<key>Key</key>
+			<string>891ed50315763dac51434daeb8543b5975a555fb8388cc578d0f421f833da04d</string>
+		</dict>
+		<key>manifest</key>
+		<dict>
+			<key>File</key>
+			<string>Firmware/all_flash/all_flash.n90ap.production/manifest</string>
+			<key>manifest</key>
+			<string>manifest</string>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/resources/firmware/powdersn0wBundles/iPhone3,1_6.1_10B144.bundle/manifest b/resources/firmware/powdersn0wBundles/iPhone3,1_6.1_10B144.bundle/manifest
new file mode 100644
index 0000000..f000300
--- /dev/null
+++ b/resources/firmware/powdersn0wBundles/iPhone3,1_6.1_10B144.bundle/manifest
@@ -0,0 +1,15 @@
+LLB.n90ap.RELEASE.img3
+iBoot.n90ap.RELEASE.img3
+DeviceTree.n90ap.img3
+applelogo7@2x.s5l8930x.img3
+batterylow0@2x.s5l8930x.img3
+batterylow1@2x.s5l8930x.img3
+glyphcharging@2x.s5l8930x.img3
+batterycharging0@2x.s5l8930x.img3
+batterycharging1@2x.s5l8930x.img3
+glyphplugin@2x.s5l8930x.img3
+batteryfull@2x.s5l8930x.img3
+recoverymode7@2x~iphone.s5l8930x.img3
+iBoot6.n90ap.RELEASE.img3
+applelogo@2x.s5l8930x.img3
+recoverymode@2x~iphone.s5l8930x.img3
diff --git a/resources/firmware/src/bin.tar b/resources/firmware/src/bin.tar
new file mode 100644
index 0000000..909876d
Binary files /dev/null and b/resources/firmware/src/bin.tar differ
diff --git a/resources/firmware/src/target/n90/11D257/exploit b/resources/firmware/src/target/n90/11D257/exploit
new file mode 100644
index 0000000..8d26921
Binary files /dev/null and b/resources/firmware/src/target/n90/11D257/exploit differ
diff --git a/resources/firmware/src/target/n90/11D257/partition b/resources/firmware/src/target/n90/11D257/partition
new file mode 100644
index 0000000..8908277
--- /dev/null
+++ b/resources/firmware/src/target/n90/11D257/partition
@@ -0,0 +1,72 @@
+#!/bin/bash
+
+isIOS5=0
+
+if [ -e "/dev/rdisk0s2" ]; then
+nvram -d boot-partition
+nvram -d boot-ramdisk
+sleep 1s
+reboot_
+fi
+
+mount_hfs /dev/disk0s1s1 /mnt1
+
+if [ ! -e "/dev/rdisk0s1s3" ]; then
+mount_hfs /dev/disk0s1s2 /mnt1/private/var
+else
+isIOS5=1
+mount_hfs /dev/disk0s1s3 /mnt1/private/var
+fi
+sleep 1s
+
+sleep 1s
+
+rm -rf /mnt1/System/Library/LaunchDaemons/com.apple.mobile.softwareupdated.plist
+rm -rf /mnt1/System/Library/LaunchDaemons/com.apple.softwareupdateservicesd.plist
+
+Data_GUID="$((echo -e "i\n2\nq") | gptfdisk /dev/rdisk0s1 2>/dev/null | sed -n -e 's/^.*Partition unique GUID: //p')"
+LogicalSector="$((echo -e "p\nq") | gptfdisk /dev/rdisk0s1 2>/dev/null | sed -n -e 's/^.*Logical sector size: //p' | sed 's/ .*//')"
+System_LastSector="$((echo -e "i\n1\nq") | gptfdisk /dev/rdisk0s1 2>/dev/null | sed -n -e 's/^.*Last sector: //p' | sed 's/ .*//')"
+Data_LastSector="$((echo -e "i\n2\nq") | gptfdisk /dev/rdisk0s1 2>/dev/null | sed -n -e 's/^.*Last sector: //p' | sed 's/ .*//')"
+Data_Attributeflags="$((echo -e "i\n2\nq") | gptfdisk /dev/rdisk0s1 2>/dev/null | sed -n -e 's/^.*flags: //p')"
+Exploit_LastSector="$((524288/$LogicalSector))"
+New_Data_LastSector="$(($Data_LastSector-$Exploit_LastSector))"
+New_Data_SectorSize="$(($New_Data_LastSector-$System_LastSector))"
+New_Data_Size="$(($New_Data_SectorSize*$LogicalSector))"
+
+hfs_resize /mnt1/private/var $New_Data_Size
+sleep 1s
+
+if [ "$Data_Attributeflags" = "0001000000000000" ]; then
+echo -e "d\n2\nn\n\n$New_Data_LastSector\n\nc\n2\nData\nx\na\n2\n48\n\nc\n2\n$Data_GUID\ns\n4\nm\nn\n3\n\n$Data_LastSector\n\nw\nY\n" | gptfdisk /dev/rdisk0s1
+else
+echo -e "d\n2\nn\n\n$New_Data_LastSector\n\nc\n2\nData\nx\na\n2\n48\n49\n\nc\n2\n$Data_GUID\ns\n4\nm\nn\n3\n\n$Data_LastSector\n\nw\nY\n" | gptfdisk /dev/rdisk0s1
+fi
+
+sleep 1s
+
+if [ $isIOS5 == 0 ]; then
+newfs_hfs -s -v exploit /dev/rdisk0s1s3
+sleep 1s
+fsck_hfs -f /dev/rdisk0s1s3
+sleep 2s
+
+dd of=/dev/rdisk0s1s3 if=/exploit bs=512k count=1
+sleep 1s
+fi
+
+if [ $isIOS5 == 1 ]; then
+newfs_hfs -s -v exploit /dev/rdisk0s1s4
+sleep 1s
+fsck_hfs -f /dev/rdisk0s1s4
+sleep 2s
+
+dd of=/dev/rdisk0s1s4 if=/exploit bs=512k count=1
+sleep 1s
+fi
+
+nvram boot-partition=2
+
+sleep 1s
+
+reboot_
diff --git a/resources/ipsw.sh b/resources/ipsw.sh
index 091ddcc..c85ae71 100755
--- a/resources/ipsw.sh
+++ b/resources/ipsw.sh
@@ -31,10 +31,10 @@ JailbreakSet() {
         IPSWCustom="${IPSWCustom}E"
     elif [[ $OSVer == "7.1.2" ]]; then
         JBName="Pangu7"
+    elif [[ $OSVer == "6"* && $ProductType == "iPhone3"* ]]; then
+        JBName="powdersn0w"
     elif [[ $OSVer == "6.1.3" ]]; then
         JBName="p0sixspwn"
-    elif [[ $OSVer == "6"* ]]; then
-        JBName="evasi0n"
     else
         JBName="unthredeh4il"
     fi
@@ -234,79 +234,36 @@ IPSW32() {
 }
 
 IPSW4() {
-    local ExtraArgs
-    local IV
-    local JBFiles
+    local config="config"
+    local JBFiles=()
+    local JBFiles2=()
     local JBSHA1
-    local Key
 
     if [[ -e $IPSWCustom.ipsw ]]; then
         Log "Found existing Custom IPSW. Skipping IPSW creation."
         return
     fi
 
-    if [[ $OSVer == 6.1.3 ]]; then
-        IV=b559a2c7dae9b95643c6610b4cf26dbd
-        Key=3dbe8be17af793b043eed7af865f0b843936659550ad692db96865c00171959f
-    elif [[ $OSVer == 6.1.2 ]]; then
-        IV=c939629e3473fdb67deae0c45582506d
-        Key=cbcd007712618cb6ab3be147f0317e22e7cceadb344e99ea1a076ef235c2c534
-    elif [[ $OSVer == 6.1 ]]; then
-        IV=4d76b7e25893839cfca478b44ddef3dd
-        Key=891ed50315763dac51434daeb8543b5975a555fb8388cc578d0f421f833da04d
-    elif [[ $OSVer == 6.0.1 ]]; then
-        IV=44ffe675d6f31167369787a17725d06c
-        Key=8d539232c0e906a9f60caa462f189530f745c4abd81a742b4d1ec1cb8b9ca6c3
-    elif [[ $OSVer == 6.0 ]]; then
-        IV=7891928b9dd0dd919778743a2c8ec6b3
-        Key=838270f668a05a60ff352d8549c06d2f21c3e4f7617c72a78d82c92a3ad3a045
-    elif [[ $BuildVer == 9B206 ]]; then
-        IV=b1846de299191186ce3bbb22432eca12
-        Key=e8e26976984e83f967b16bdb3a65a3ec45003cdf2aaf8d541104c26797484138
-    elif [[ $BuildVer == 9B208 ]]; then
-        IV=71fe96da25812ff341181ba43546ea4f
-        Key=6377d34deddf26c9b464f927f18b222be75f1b5547e537742e7dfca305660fea
-    elif [[ $OSVer == 5.1 ]]; then
-        IV=b1846de299191186ce3bbb22432eca12
-        Key=e8e26976984e83f967b16bdb3a65a3ec45003cdf2aaf8d541104c26797484138
-    elif [[ $OSVer == 5.0.1 ]]; then
-        IV=49eb54980a0024f91b079faf0ee87f67
-        Key=c3a49f0059075e1453dacec4c3e4d89bd7a433ee19c8d48e4695d89b4c84a373
-    elif [[ $OSVer == 5.0 ]]; then
-        IV=15dd404efbb24a842d08dcde21e777a0
-        Key=71614af73814c3a8e6724d592ecfccdbace766dad5eb39b0b8313387e94d2964
-    elif [[ $OSVer == 4.3.5 ]]; then
-        IV=986032eecd861c37ca2a86b6496a3c0d
-        Key=b4e300c54a9dd2e648ead50794e9bf2205a489c310a1c70a9fae687368229468
-        ExtraArgs="--logo4 "
-    elif [[ $OSVer == 4.3.3 ]]; then
-        IV=bb3fc29dd226fac56086790060d5c744
-        Key=c2ead1d3b228a05b665c91b4b1ab54b570a81dffaf06eaf1736767bcb86e50de
-        ExtraArgs="--logo4 --433 "
-    elif [[ $OSVer == 4.3 ]]; then
-        IV=9f11c07bde79bdac4abb3f9707c4b13c
-        Key=0958d70e1a292483d4e32ed1e911d2b16b6260856be67d00a33b6a1801711d32
-        ExtraArgs="--logo4 --433 "
+    if [[ $OSVer == "4.3"* ]]; then
+        IPSW4Cherry
+        return
     fi
 
     if [[ $Jailbreak == 1 ]]; then
-        if [[ $OSVer == 7.1.2 ]]; then
+        if [[ $OSVer == "7.1.2" ]]; then
             JBFiles=(Cydia7.tar panguaxe.tar fstab7.tar)
             JBSHA1=bba5022d6749097f47da48b7bdeaa3dc67cbf2c4
-        elif [[ $OSVer == 6.1.3 ]]; then
-            JBFiles=(Cydia6.tar p0sixspwn.tar)
+        elif [[ $OSVer == "6."* ]]; then
+            JBFiles=(Cydia6.tar)
             JBSHA1=1d5a351016d2546aa9558bc86ce39186054dc281
-        elif [[ $OSVer == 6.* ]]; then
-            JBFiles=(Cydia6.tar evasi0n6-untether.tar)
-            JBSHA1=1d5a351016d2546aa9558bc86ce39186054dc281
-        elif [[ $OSVer == 5.* || $OSVer == 4.3* ]]; then
-            JBFiles=(Cydia5.tar unthredeh4il.tar)
+        else
+            JBFiles=(Cydia5.tar unthredeh4il.tar fstab_rw.tar)
             JBSHA1=f5b5565640f7e31289919c303efe44741e28543a
+            JBFiles2=("${JBFiles[@]}")
         fi
-        [[ $OSVer != 7.1.2 ]] && JBFiles+=(fstab_rw.tar)
         JailbreakFiles $JBURL/${JBFiles[0]} ${JBFiles[0]} $JBSHA1
         for i in {0..2}; do
-            JBFiles[$i]=../resources/jailbreak/${JBFiles[$i]}
+            JBFiles2[$i]=../resources/jailbreak/${JBFiles2[$i]}
         done
     fi
 
@@ -322,47 +279,110 @@ IPSW4() {
         Echo "* This option is enabled by default (Y)."
         read -p "$(Input 'Enable this option? (Y/n):')" opt
         if [[ $opt != 'N' && $opt != 'n' ]]; then
-            ExtraArgs+="-b -v"
+            config="configv"
             Log "Verbose boot option enabled."
         else
             Log "Verbose boot option disabled by user."
         fi
-        Log "Preparing custom IPSW with ch3rryflower..."
-        cp -rf ../$cherrymac/FirmwareBundles ../$cherrymac/src .
-        unzip -j ../$IPSW.ipsw Firmware/all_flash/all_flash.${HWModel}ap.production/iBoot*
-        mv iBoot.${HWModel}ap.RELEASE.img3 tmp
-        $xpwntool tmp ibot.dec -iv $IV -k $Key
-        ../$cherry/bin/iBoot32Patcher ibot.dec ibot.pwned --rsa --boot-partition --boot-ramdisk $ExtraArgs
-        $xpwntool ibot.pwned iBoot -t tmp
-        echo "0000010: 6365" | xxd -r - iBoot
-        echo "0000020: 6365" | xxd -r - iBoot
-        $cherrybin ../$IPSW.ipsw ../$IPSWCustom.ipsw $JBMemory -derebusantiquis ../$IPSW7.ipsw iBoot ${JBFiles[@]}
+
+        Log "Preparing custom IPSW with powdersn0w..."
+        cp -rf ../resources/firmware/powdersn0wBundles ./FirmwareBundles
+        cp -rf ../resources/firmware/src .
+        if [[ $Jailbreak == 1 && $OSVer == "6."* ]]; then
+            JBFiles2=
+            rm FirmwareBundles/${config}.plist
+            mv FirmwareBundles/${config}JB.plist FirmwareBundles/${config}.plist
+            cp ../resources/jailbreak/Cydia6.tar src/cydia6.tar
+        fi
+        mv FirmwareBundles/${config}.plist FirmwareBundles/config.plist
+        $powdersn0w ../$IPSW.ipsw ../$IPSWCustom.ipsw $JBMemory -base ../$IPSW7.ipsw ${JBFiles2[@]}
     fi
     cd ..
 
-    if [[ $OSVer == 4.3* ]]; then
-        Log "iOS 4 Fix" # From ios4fix
-        zip -d $IPSWCustom.ipsw Firmware/all_flash/all_flash.n90ap.production/manifest
-        cd tmp/src/n90ap/Firmware/all_flash/all_flash.n90ap.production
-        unzip -j ../../../../../../$IPSW.ipsw Firmware/all_flash/all_flash*/applelogo*
-        mv -v applelogo-640x960.s5l8930x.img3 applelogo4-640x960.s5l8930x.img3
-        echo "0000010: 34" | xxd -r - applelogo4-640x960.s5l8930x.img3
-        echo "0000020: 34" | xxd -r - applelogo4-640x960.s5l8930x.img3
-        if [[ $platform == "macos" ]]; then
-            plutil -extract 'APTicket' xml1 ../../../../../../$SHSH -o 'apticket.plist'
-            cat apticket.plist | sed -ne '/<data>/,/<\/data>/p' | sed -e "s/<data>//" | sed "s/<\/data>//" | awk '{printf "%s",$0}' | base64 --decode > apticket.der
-        else
-            $xmlstarlet sel -t -m "/plist/dict/key[.='APTicket']" -v "following-sibling::data[1]" ../../../../../../$SHSH > apticket.plist
-            sed -i -e 's/[ \t]*//' apticket.plist
-            cat apticket.plist | base64 --decode > apticket.der
-        fi
-        ../../../../../$xpwntool apticket.der applelogoT-640x960.s5l8930x.img3 -t scab_template.img3
-        cd ../../..
-        zip -r0 ../../../$IPSWCustom.ipsw Firmware/all_flash/all_flash.n90ap.production/manifest
-        zip -r0 ../../../$IPSWCustom.ipsw Firmware/all_flash/all_flash.n90ap.production/applelogo4-640x960.s5l8930x.img3
-        zip -r0 ../../../$IPSWCustom.ipsw Firmware/all_flash/all_flash.n90ap.production/applelogoT-640x960.s5l8930x.img3
-        cd ../../..
+    if [[ ! -e $IPSWCustom.ipsw ]]; then
+        Error "Failed to find custom IPSW. Please run the script again" \
+        "You may try selecting N for memory option"
     fi
+}
+
+IPSW4Cherry() {
+    local ExtraArgs="--logo4 "
+    local IV
+    local JBFiles
+    local JBSHA1
+    local Key
+
+    if [[ $OSVer == "4.3.5" ]]; then
+        IV=986032eecd861c37ca2a86b6496a3c0d
+        Key=b4e300c54a9dd2e648ead50794e9bf2205a489c310a1c70a9fae687368229468
+    elif [[ $OSVer == "4.3.3" ]]; then
+        IV=bb3fc29dd226fac56086790060d5c744
+        Key=c2ead1d3b228a05b665c91b4b1ab54b570a81dffaf06eaf1736767bcb86e50de
+        ExtraArgs+="--433 "
+    elif [[ $OSVer == "4.3" ]]; then
+        IV=9f11c07bde79bdac4abb3f9707c4b13c
+        Key=0958d70e1a292483d4e32ed1e911d2b16b6260856be67d00a33b6a1801711d32
+        ExtraArgs+="--433 "
+    fi
+
+    if [[ $Jailbreak == 1 ]]; then
+        JBFiles=(Cydia5.tar unthredeh4il.tar fstab_rw.tar)
+        JBSHA1=f5b5565640f7e31289919c303efe44741e28543a
+        JailbreakFiles $JBURL/${JBFiles[0]} ${JBFiles[0]} $JBSHA1
+        for i in {0..2}; do
+            JBFiles[$i]=../resources/jailbreak/${JBFiles[$i]}
+        done
+    fi
+
+    Log "ch3rryflower will be used instead of powdersn0w for iOS 4.3.x"
+    SaveExternal ch3rryflower
+
+    echo
+    Input "Verbose Boot Option"
+    Echo "* When enabled, the device will have verbose boot on restore."
+    Echo "* This option is enabled by default (Y)."
+    read -p "$(Input 'Enable this option? (Y/n):')" opt
+    if [[ $opt != 'N' && $opt != 'n' ]]; then
+        ExtraArgs+="-b -v"
+        Log "Verbose boot option enabled."
+    else
+        Log "Verbose boot option disabled by user."
+    fi
+
+    cd tmp
+    Log "Preparing custom IPSW with ch3rryflower..."
+    cp -rf ../$cherrymac/FirmwareBundles ../$cherrymac/src .
+    unzip -j ../$IPSW.ipsw Firmware/all_flash/all_flash.${HWModel}ap.production/iBoot*
+    mv iBoot.${HWModel}ap.RELEASE.img3 tmp
+    $xpwntool tmp ibot.dec -iv $IV -k $Key
+    ../$cherry/bin/iBoot32Patcher ibot.dec ibot.pwned --rsa --boot-partition --boot-ramdisk $ExtraArgs
+    $xpwntool ibot.pwned iBoot -t tmp
+    echo "0000010: 6365" | xxd -r - iBoot
+    echo "0000020: 6365" | xxd -r - iBoot
+    $cherrybin ../$IPSW.ipsw ../$IPSWCustom.ipsw $JBMemory -derebusantiquis ../$IPSW7.ipsw iBoot ${JBFiles[@]}
+    cd ..
+
+    Log "iOS 4 Fix" # From ios4fix
+    zip -d $IPSWCustom.ipsw Firmware/all_flash/all_flash.n90ap.production/manifest
+    cd tmp/src/n90ap/Firmware/all_flash/all_flash.n90ap.production
+    unzip -j ../../../../../../$IPSW.ipsw Firmware/all_flash/all_flash*/applelogo*
+    mv -v applelogo-640x960.s5l8930x.img3 applelogo4-640x960.s5l8930x.img3
+    echo "0000010: 34" | xxd -r - applelogo4-640x960.s5l8930x.img3
+    echo "0000020: 34" | xxd -r - applelogo4-640x960.s5l8930x.img3
+    if [[ $platform == "macos" ]]; then
+        plutil -extract 'APTicket' xml1 ../../../../../../$SHSH -o 'apticket.plist'
+        cat apticket.plist | sed -ne '/<data>/,/<\/data>/p' | sed -e "s/<data>//" | sed "s/<\/data>//" | awk '{printf "%s",$0}' | base64 --decode > apticket.der
+    else
+        $xmlstarlet sel -t -m "/plist/dict/key[.='APTicket']" -v "following-sibling::data[1]" ../../../../../../$SHSH > apticket.plist
+        sed -i -e 's/[ \t]*//' apticket.plist
+        cat apticket.plist | base64 --decode > apticket.der
+    fi
+    ../../../../../$xpwntool apticket.der applelogoT-640x960.s5l8930x.img3 -t scab_template.img3
+    cd ../../..
+    zip -r0 ../../../$IPSWCustom.ipsw Firmware/all_flash/all_flash.n90ap.production/manifest
+    zip -r0 ../../../$IPSWCustom.ipsw Firmware/all_flash/all_flash.n90ap.production/applelogo4-640x960.s5l8930x.img3
+    zip -r0 ../../../$IPSWCustom.ipsw Firmware/all_flash/all_flash.n90ap.production/applelogoT-640x960.s5l8930x.img3
+    cd ../../..
 
     if [[ ! -e $IPSWCustom.ipsw ]]; then
         Error "Failed to find custom IPSW. Please run the script again" \
diff --git a/resources/jailbreak/evasi0n6-untether.tar b/resources/jailbreak/evasi0n6-untether.tar
deleted file mode 100644
index 6388da9..0000000
Binary files a/resources/jailbreak/evasi0n6-untether.tar and /dev/null differ
diff --git a/resources/tools/powdersn0w_linux b/resources/tools/powdersn0w_linux
new file mode 100755
index 0000000..e39635b
Binary files /dev/null and b/resources/tools/powdersn0w_linux differ
diff --git a/resources/tools/powdersn0w_macos b/resources/tools/powdersn0w_macos
new file mode 100755
index 0000000..c094b35
Binary files /dev/null and b/resources/tools/powdersn0w_macos differ
diff --git a/resources/tools/pwnedDFU_linux b/resources/tools/pwnedDFU_linux
new file mode 100755
index 0000000..5690680
Binary files /dev/null and b/resources/tools/pwnedDFU_linux differ
diff --git a/resources/tools/pwnedDFU_macos b/resources/tools/pwnedDFU_macos
new file mode 100755
index 0000000..c5a922c
Binary files /dev/null and b/resources/tools/pwnedDFU_macos differ
diff --git a/restore.sh b/restore.sh
index 7643f76..536aba2 100755
--- a/restore.sh
+++ b/restore.sh
@@ -110,10 +110,6 @@ Main() {
     Clean
     mkdir tmp
 
-    if [[ $ProductType == "iPhone3,1" ]]; then
-        SaveExternal ch3rryflower
-    fi
-
     if [[ -n $1 && $1 != "NoColor" && $1 != "NoDevice" && $1 != "PwnedDevice" ]]; then
         Mode="$1"
     else
@@ -188,9 +184,7 @@ Main() {
         ExitWin 0
     fi
 
-    if [[ $DeviceProc == 4 && $platform == "win" ]]; then
-        Error "Your device ($ProductType) is unsupported on Windows."
-    elif [[ $DeviceProc == 7 && $platform == "win" ]]; then
+    if [[ $DeviceProc == 7 && $platform == "win" ]]; then
         local Message="If you want to restore your A7 device on Windows, put the device in pwnDFU mode."
         if [[ $DeviceState == "Normal" ]]; then
             Error "$Message"