diff --git a/packages/webamp/skins/base-2.91.wsz b/packages/webamp/assets/skins/base-2.91.wsz
similarity index 94%
rename from packages/webamp/skins/base-2.91.wsz
rename to packages/webamp/assets/skins/base-2.91.wsz
index 285675be..e950c4a9 100644
Binary files a/packages/webamp/skins/base-2.91.wsz and b/packages/webamp/assets/skins/base-2.91.wsz differ
diff --git a/packages/webamp/skins/base-2.91/BALANCE.BMP b/packages/webamp/assets/skins/base-2.91/BALANCE.BMP
similarity index 100%
rename from packages/webamp/skins/base-2.91/BALANCE.BMP
rename to packages/webamp/assets/skins/base-2.91/BALANCE.BMP
diff --git a/packages/webamp/skins/base-2.91/CBUTTONS.BMP b/packages/webamp/assets/skins/base-2.91/CBUTTONS.BMP
similarity index 100%
rename from packages/webamp/skins/base-2.91/CBUTTONS.BMP
rename to packages/webamp/assets/skins/base-2.91/CBUTTONS.BMP
diff --git a/packages/webamp/skins/base-2.91-png/CLOSE.CUR b/packages/webamp/assets/skins/base-2.91/CLOSE.CUR
similarity index 100%
rename from packages/webamp/skins/base-2.91-png/CLOSE.CUR
rename to packages/webamp/assets/skins/base-2.91/CLOSE.CUR
diff --git a/packages/webamp/skins/base-2.91/EQMAIN.BMP b/packages/webamp/assets/skins/base-2.91/EQMAIN.BMP
similarity index 100%
rename from packages/webamp/skins/base-2.91/EQMAIN.BMP
rename to packages/webamp/assets/skins/base-2.91/EQMAIN.BMP
diff --git a/packages/webamp/skins/base-2.91-png/EQSLID.CUR b/packages/webamp/assets/skins/base-2.91/EQSLID.CUR
similarity index 100%
rename from packages/webamp/skins/base-2.91-png/EQSLID.CUR
rename to packages/webamp/assets/skins/base-2.91/EQSLID.CUR
diff --git a/packages/webamp/skins/base-2.91-png/EQTITLE.CUR b/packages/webamp/assets/skins/base-2.91/EQTITLE.CUR
similarity index 100%
rename from packages/webamp/skins/base-2.91-png/EQTITLE.CUR
rename to packages/webamp/assets/skins/base-2.91/EQTITLE.CUR
diff --git a/packages/webamp/skins/base-2.91/EQ_EX.BMP b/packages/webamp/assets/skins/base-2.91/EQ_EX.BMP
similarity index 100%
rename from packages/webamp/skins/base-2.91/EQ_EX.BMP
rename to packages/webamp/assets/skins/base-2.91/EQ_EX.BMP
diff --git a/packages/webamp/skins/base-2.91/GEN.BMP b/packages/webamp/assets/skins/base-2.91/GEN.BMP
similarity index 100%
rename from packages/webamp/skins/base-2.91/GEN.BMP
rename to packages/webamp/assets/skins/base-2.91/GEN.BMP
diff --git a/packages/webamp/skins/base-2.91/GENEX.BMP b/packages/webamp/assets/skins/base-2.91/GENEX.BMP
similarity index 100%
rename from packages/webamp/skins/base-2.91/GENEX.BMP
rename to packages/webamp/assets/skins/base-2.91/GENEX.BMP
diff --git a/packages/webamp/skins/base-2.91/MAIN.BMP b/packages/webamp/assets/skins/base-2.91/MAIN.BMP
similarity index 100%
rename from packages/webamp/skins/base-2.91/MAIN.BMP
rename to packages/webamp/assets/skins/base-2.91/MAIN.BMP
diff --git a/packages/webamp/skins/base-2.91/MB.BMP b/packages/webamp/assets/skins/base-2.91/MB.BMP
similarity index 100%
rename from packages/webamp/skins/base-2.91/MB.BMP
rename to packages/webamp/assets/skins/base-2.91/MB.BMP
diff --git a/packages/webamp/skins/base-2.91/MONOSTER.BMP b/packages/webamp/assets/skins/base-2.91/MONOSTER.BMP
similarity index 100%
rename from packages/webamp/skins/base-2.91/MONOSTER.BMP
rename to packages/webamp/assets/skins/base-2.91/MONOSTER.BMP
diff --git a/packages/webamp/skins/base-2.91-png/NORMAL.CUR b/packages/webamp/assets/skins/base-2.91/NORMAL.CUR
similarity index 100%
rename from packages/webamp/skins/base-2.91-png/NORMAL.CUR
rename to packages/webamp/assets/skins/base-2.91/NORMAL.CUR
diff --git a/packages/webamp/skins/base-2.91/NUMBERS.BMP b/packages/webamp/assets/skins/base-2.91/NUMBERS.BMP
similarity index 100%
rename from packages/webamp/skins/base-2.91/NUMBERS.BMP
rename to packages/webamp/assets/skins/base-2.91/NUMBERS.BMP
diff --git a/packages/webamp/skins/base-2.91/PLAYPAUS.BMP b/packages/webamp/assets/skins/base-2.91/PLAYPAUS.BMP
similarity index 100%
rename from packages/webamp/skins/base-2.91/PLAYPAUS.BMP
rename to packages/webamp/assets/skins/base-2.91/PLAYPAUS.BMP
diff --git a/packages/webamp/skins/base-2.91/PLEDIT.BMP b/packages/webamp/assets/skins/base-2.91/PLEDIT.BMP
similarity index 100%
rename from packages/webamp/skins/base-2.91/PLEDIT.BMP
rename to packages/webamp/assets/skins/base-2.91/PLEDIT.BMP
diff --git a/packages/webamp/skins/base-2.91-png/PLEDIT.TXT b/packages/webamp/assets/skins/base-2.91/PLEDIT.TXT
similarity index 100%
rename from packages/webamp/skins/base-2.91-png/PLEDIT.TXT
rename to packages/webamp/assets/skins/base-2.91/PLEDIT.TXT
diff --git a/packages/webamp/skins/base-2.91-png/PNORMAL.CUR b/packages/webamp/assets/skins/base-2.91/PNORMAL.CUR
similarity index 100%
rename from packages/webamp/skins/base-2.91-png/PNORMAL.CUR
rename to packages/webamp/assets/skins/base-2.91/PNORMAL.CUR
diff --git a/packages/webamp/skins/base-2.91/POSBAR.BMP b/packages/webamp/assets/skins/base-2.91/POSBAR.BMP
similarity index 100%
rename from packages/webamp/skins/base-2.91/POSBAR.BMP
rename to packages/webamp/assets/skins/base-2.91/POSBAR.BMP
diff --git a/packages/webamp/skins/base-2.91-png/POSBAR.CUR b/packages/webamp/assets/skins/base-2.91/POSBAR.CUR
similarity index 100%
rename from packages/webamp/skins/base-2.91-png/POSBAR.CUR
rename to packages/webamp/assets/skins/base-2.91/POSBAR.CUR
diff --git a/packages/webamp/skins/base-2.91-png/PSIZE.CUR b/packages/webamp/assets/skins/base-2.91/PSIZE.CUR
similarity index 100%
rename from packages/webamp/skins/base-2.91-png/PSIZE.CUR
rename to packages/webamp/assets/skins/base-2.91/PSIZE.CUR
diff --git a/packages/webamp/skins/base-2.91-png/PTBAR.CUR b/packages/webamp/assets/skins/base-2.91/PTBAR.CUR
similarity index 100%
rename from packages/webamp/skins/base-2.91-png/PTBAR.CUR
rename to packages/webamp/assets/skins/base-2.91/PTBAR.CUR
diff --git a/packages/webamp/skins/base-2.91-png/PVSCROLL.CUR b/packages/webamp/assets/skins/base-2.91/PVSCROLL.CUR
similarity index 100%
rename from packages/webamp/skins/base-2.91-png/PVSCROLL.CUR
rename to packages/webamp/assets/skins/base-2.91/PVSCROLL.CUR
diff --git a/packages/webamp/skins/base-2.91-png/REGION.TXT b/packages/webamp/assets/skins/base-2.91/REGION.TXT
similarity index 100%
rename from packages/webamp/skins/base-2.91-png/REGION.TXT
rename to packages/webamp/assets/skins/base-2.91/REGION.TXT
diff --git a/packages/webamp/skins/base-2.91/SHUFREP.BMP b/packages/webamp/assets/skins/base-2.91/SHUFREP.BMP
similarity index 100%
rename from packages/webamp/skins/base-2.91/SHUFREP.BMP
rename to packages/webamp/assets/skins/base-2.91/SHUFREP.BMP
diff --git a/packages/webamp/skins/base-2.91-png/Skining Updates.txt b/packages/webamp/assets/skins/base-2.91/Skining Updates.txt
similarity index 100%
rename from packages/webamp/skins/base-2.91-png/Skining Updates.txt
rename to packages/webamp/assets/skins/base-2.91/Skining Updates.txt
diff --git a/packages/webamp/skins/base-2.91/TEXT.BMP b/packages/webamp/assets/skins/base-2.91/TEXT.BMP
similarity index 100%
rename from packages/webamp/skins/base-2.91/TEXT.BMP
rename to packages/webamp/assets/skins/base-2.91/TEXT.BMP
diff --git a/packages/webamp/skins/base-2.91/TITLEBAR.BMP b/packages/webamp/assets/skins/base-2.91/TITLEBAR.BMP
similarity index 100%
rename from packages/webamp/skins/base-2.91/TITLEBAR.BMP
rename to packages/webamp/assets/skins/base-2.91/TITLEBAR.BMP
diff --git a/packages/webamp/skins/base-2.91-png/TITLEBAR.CUR b/packages/webamp/assets/skins/base-2.91/TITLEBAR.CUR
similarity index 100%
rename from packages/webamp/skins/base-2.91-png/TITLEBAR.CUR
rename to packages/webamp/assets/skins/base-2.91/TITLEBAR.CUR
diff --git a/packages/webamp/skins/base-2.91/VIDEO.BMP b/packages/webamp/assets/skins/base-2.91/VIDEO.BMP
similarity index 100%
rename from packages/webamp/skins/base-2.91/VIDEO.BMP
rename to packages/webamp/assets/skins/base-2.91/VIDEO.BMP
diff --git a/packages/webamp/skins/base-2.91-png/VISCOLOR.TXT b/packages/webamp/assets/skins/base-2.91/VISCOLOR.TXT
similarity index 100%
rename from packages/webamp/skins/base-2.91-png/VISCOLOR.TXT
rename to packages/webamp/assets/skins/base-2.91/VISCOLOR.TXT
diff --git a/packages/webamp/skins/base-2.91-png/VOLBAL.CUR b/packages/webamp/assets/skins/base-2.91/VOLBAL.CUR
similarity index 100%
rename from packages/webamp/skins/base-2.91-png/VOLBAL.CUR
rename to packages/webamp/assets/skins/base-2.91/VOLBAL.CUR
diff --git a/packages/webamp/skins/base-2.91/VOLUME.BMP b/packages/webamp/assets/skins/base-2.91/VOLUME.BMP
similarity index 100%
rename from packages/webamp/skins/base-2.91/VOLUME.BMP
rename to packages/webamp/assets/skins/base-2.91/VOLUME.BMP
diff --git a/packages/webamp/demo/config/webpack.common.js b/packages/webamp/demo/config/webpack.common.js
index d13493d0..039dcd0f 100644
--- a/packages/webamp/demo/config/webpack.common.js
+++ b/packages/webamp/demo/config/webpack.common.js
@@ -63,6 +63,10 @@ module.exports = {
         to: "service-worker.js",
         force: true,
       },
+      {
+        from: "../assets",
+        to: "assets",
+      },
     ]),
   ],
 
diff --git a/packages/webamp/demo/js/avaliableSkins.ts b/packages/webamp/demo/js/avaliableSkins.ts
index 3b2bbeca..3f7557a6 100644
--- a/packages/webamp/demo/js/avaliableSkins.ts
+++ b/packages/webamp/demo/js/avaliableSkins.ts
@@ -1,17 +1,17 @@
 // @ts-ignore
-import osx from "../../skins/MacOSXAqua1-5.wsz";
+import osx from "../skins/MacOSXAqua1-5.wsz";
 // @ts-ignore
-import topaz from "../../skins/TopazAmp1-2.wsz";
+import topaz from "../skins/TopazAmp1-2.wsz";
 // @ts-ignore
-import visor from "../../skins/Vizor1-01.wsz";
+import visor from "../skins/Vizor1-01.wsz";
 // @ts-ignore
-import xmms from "../../skins/XMMS-Turquoise.wsz";
+import xmms from "../skins/XMMS-Turquoise.wsz";
 // @ts-ignore
-import zaxon from "../../skins/ZaxonRemake1-0.wsz";
+import zaxon from "../skins/ZaxonRemake1-0.wsz";
 // @ts-ignore
-import green from "../../skins/Green-Dimension-V2.wsz";
+import green from "../skins/Green-Dimension-V2.wsz";
 // @ts-ignore
-import internetArchive from "../../skins/Internet-Archive.wsz";
+import internetArchive from "../skins/Internet-Archive.wsz";
 
 export default [
   { url: green, name: "Green Dimension V2" },
diff --git a/packages/webamp/skins/.gitignore b/packages/webamp/demo/skins/.gitignore
similarity index 51%
rename from packages/webamp/skins/.gitignore
rename to packages/webamp/demo/skins/.gitignore
index 3f7d43d9..5cc88f73 100644
--- a/packages/webamp/skins/.gitignore
+++ b/packages/webamp/demo/skins/.gitignore
@@ -1,2 +1 @@
-base-2.91.zip
 Skinner_Atlas/
diff --git a/packages/webamp/skins/AmigaPPC-dark.wsz b/packages/webamp/demo/skins/AmigaPPC-dark.wsz
similarity index 100%
rename from packages/webamp/skins/AmigaPPC-dark.wsz
rename to packages/webamp/demo/skins/AmigaPPC-dark.wsz
diff --git a/packages/webamp/skins/Green-Dimension-V2.wsz b/packages/webamp/demo/skins/Green-Dimension-V2.wsz
similarity index 100%
rename from packages/webamp/skins/Green-Dimension-V2.wsz
rename to packages/webamp/demo/skins/Green-Dimension-V2.wsz
diff --git a/packages/webamp/skins/Internet-Archive.wsz b/packages/webamp/demo/skins/Internet-Archive.wsz
similarity index 100%
rename from packages/webamp/skins/Internet-Archive.wsz
rename to packages/webamp/demo/skins/Internet-Archive.wsz
diff --git a/packages/webamp/skins/MacOSXAqua1-5.wsz b/packages/webamp/demo/skins/MacOSXAqua1-5.wsz
similarity index 100%
rename from packages/webamp/skins/MacOSXAqua1-5.wsz
rename to packages/webamp/demo/skins/MacOSXAqua1-5.wsz
diff --git a/packages/webamp/skins/Skinner_Atlas.wsz b/packages/webamp/demo/skins/Skinner_Atlas.wsz
similarity index 100%
rename from packages/webamp/skins/Skinner_Atlas.wsz
rename to packages/webamp/demo/skins/Skinner_Atlas.wsz
diff --git a/packages/webamp/skins/Sonic_Attitude.wsz b/packages/webamp/demo/skins/Sonic_Attitude.wsz
similarity index 100%
rename from packages/webamp/skins/Sonic_Attitude.wsz
rename to packages/webamp/demo/skins/Sonic_Attitude.wsz
diff --git a/packages/webamp/skins/TopazAmp1-2.wsz b/packages/webamp/demo/skins/TopazAmp1-2.wsz
similarity index 100%
rename from packages/webamp/skins/TopazAmp1-2.wsz
rename to packages/webamp/demo/skins/TopazAmp1-2.wsz
diff --git a/packages/webamp/skins/Vizor1-01.wsz b/packages/webamp/demo/skins/Vizor1-01.wsz
similarity index 100%
rename from packages/webamp/skins/Vizor1-01.wsz
rename to packages/webamp/demo/skins/Vizor1-01.wsz
diff --git a/packages/webamp/skins/XMMS-Turquoise.wsz b/packages/webamp/demo/skins/XMMS-Turquoise.wsz
similarity index 100%
rename from packages/webamp/skins/XMMS-Turquoise.wsz
rename to packages/webamp/demo/skins/XMMS-Turquoise.wsz
diff --git a/packages/webamp/skins/ZaxonRemake1-0.wsz b/packages/webamp/demo/skins/ZaxonRemake1-0.wsz
similarity index 100%
rename from packages/webamp/skins/ZaxonRemake1-0.wsz
rename to packages/webamp/demo/skins/ZaxonRemake1-0.wsz
diff --git a/packages/webamp/package.json b/packages/webamp/package.json
index e517982a..32e5631a 100644
--- a/packages/webamp/package.json
+++ b/packages/webamp/package.json
@@ -27,10 +27,9 @@
     "tdd": "jest --config=config/jest.unit.js --watch",
     "format": "prettier --write \"**/*.{js,ts,tsx,d.ts,css}\"",
     "integration-tests": "jest --config=config/jest.integration.js --runInBand",
-    "build-skin": "rm skins/base-2.91.wsz && cd skins/base-2.91 && zip -x .* -x 'Skining Updates.txt' -r ../base-2.91.wsz .",
-    "build-skin-png": "rm skins/base-2.91-png.wsz && cd skins/base-2.91-png && zip -x .* -x 'Skining Updates.txt' -r ../base-2.91-png.wsz .",
+    "build-skin": "rm assets/skins/base-2.91.wsz && cd assets/skins/base-2.91 && zip -x .* -x 'Skining Updates.txt' -r ../base-2.91.wsz .",
     "compile-skin": "node scripts/compileSkin.js > css/base-skin.css",
-    "skin-info": "unzip -vl skins/base-2.91.wsz",
+    "skin-info": "unzip -vl assets/skins/base-2.91.wsz",
     "build-presets": "node scripts/parsePresetFiles.js > presets/builtin.json"
   },
   "repository": {
diff --git a/packages/webamp/scripts/compileSkin.js b/packages/webamp/scripts/compileSkin.js
index 9f214c8e..c74c3d09 100644
--- a/packages/webamp/scripts/compileSkin.js
+++ b/packages/webamp/scripts/compileSkin.js
@@ -8,7 +8,7 @@ const puppeteer = require("puppeteer");
   // TODO: allow the skin to be passed in via the CLI.
   try {
     await page.goto(
-      'http://localhost:8080/#{"skinUrl":"/skins/base-2.91.wsz"}'
+      'http://localhost:8080/#{"skinUrl":"/assets/skins/base-2.91.wsz"}'
     );
   } catch (e) {
     console.error(
diff --git a/packages/webamp/skins/base-2.91-png.wsz b/packages/webamp/skins/base-2.91-png.wsz
deleted file mode 100644
index 5e2230e4..00000000
Binary files a/packages/webamp/skins/base-2.91-png.wsz and /dev/null differ
diff --git a/packages/webamp/skins/base-2.91-png/BALANCE.png b/packages/webamp/skins/base-2.91-png/BALANCE.png
deleted file mode 100644
index da95e21f..00000000
Binary files a/packages/webamp/skins/base-2.91-png/BALANCE.png and /dev/null differ
diff --git a/packages/webamp/skins/base-2.91-png/CBUTTONS.png b/packages/webamp/skins/base-2.91-png/CBUTTONS.png
deleted file mode 100644
index 67b658f9..00000000
Binary files a/packages/webamp/skins/base-2.91-png/CBUTTONS.png and /dev/null differ
diff --git a/packages/webamp/skins/base-2.91-png/EQMAIN.png b/packages/webamp/skins/base-2.91-png/EQMAIN.png
deleted file mode 100644
index 1376a8af..00000000
Binary files a/packages/webamp/skins/base-2.91-png/EQMAIN.png and /dev/null differ
diff --git a/packages/webamp/skins/base-2.91-png/EQ_EX.png b/packages/webamp/skins/base-2.91-png/EQ_EX.png
deleted file mode 100644
index 2f87fb37..00000000
Binary files a/packages/webamp/skins/base-2.91-png/EQ_EX.png and /dev/null differ
diff --git a/packages/webamp/skins/base-2.91-png/GEN.png b/packages/webamp/skins/base-2.91-png/GEN.png
deleted file mode 100644
index 76d994d0..00000000
Binary files a/packages/webamp/skins/base-2.91-png/GEN.png and /dev/null differ
diff --git a/packages/webamp/skins/base-2.91-png/GENEX.png b/packages/webamp/skins/base-2.91-png/GENEX.png
deleted file mode 100644
index 9c1f8984..00000000
Binary files a/packages/webamp/skins/base-2.91-png/GENEX.png and /dev/null differ
diff --git a/packages/webamp/skins/base-2.91-png/MAIN.png b/packages/webamp/skins/base-2.91-png/MAIN.png
deleted file mode 100644
index a285e6c2..00000000
Binary files a/packages/webamp/skins/base-2.91-png/MAIN.png and /dev/null differ
diff --git a/packages/webamp/skins/base-2.91-png/MB.png b/packages/webamp/skins/base-2.91-png/MB.png
deleted file mode 100644
index b017af32..00000000
Binary files a/packages/webamp/skins/base-2.91-png/MB.png and /dev/null differ
diff --git a/packages/webamp/skins/base-2.91-png/MONOSTER.png b/packages/webamp/skins/base-2.91-png/MONOSTER.png
deleted file mode 100644
index 65738e77..00000000
Binary files a/packages/webamp/skins/base-2.91-png/MONOSTER.png and /dev/null differ
diff --git a/packages/webamp/skins/base-2.91-png/NUMBERS.png b/packages/webamp/skins/base-2.91-png/NUMBERS.png
deleted file mode 100644
index e5416a40..00000000
Binary files a/packages/webamp/skins/base-2.91-png/NUMBERS.png and /dev/null differ
diff --git a/packages/webamp/skins/base-2.91-png/PLAYPAUS.png b/packages/webamp/skins/base-2.91-png/PLAYPAUS.png
deleted file mode 100644
index f37df622..00000000
Binary files a/packages/webamp/skins/base-2.91-png/PLAYPAUS.png and /dev/null differ
diff --git a/packages/webamp/skins/base-2.91-png/PLEDIT.png b/packages/webamp/skins/base-2.91-png/PLEDIT.png
deleted file mode 100644
index 3cf6ee79..00000000
Binary files a/packages/webamp/skins/base-2.91-png/PLEDIT.png and /dev/null differ
diff --git a/packages/webamp/skins/base-2.91-png/POSBAR.png b/packages/webamp/skins/base-2.91-png/POSBAR.png
deleted file mode 100644
index 8ce36cf2..00000000
Binary files a/packages/webamp/skins/base-2.91-png/POSBAR.png and /dev/null differ
diff --git a/packages/webamp/skins/base-2.91-png/SHUFREP.png b/packages/webamp/skins/base-2.91-png/SHUFREP.png
deleted file mode 100644
index 34b95d22..00000000
Binary files a/packages/webamp/skins/base-2.91-png/SHUFREP.png and /dev/null differ
diff --git a/packages/webamp/skins/base-2.91-png/TEXT.png b/packages/webamp/skins/base-2.91-png/TEXT.png
deleted file mode 100644
index 2e036a8b..00000000
Binary files a/packages/webamp/skins/base-2.91-png/TEXT.png and /dev/null differ
diff --git a/packages/webamp/skins/base-2.91-png/TITLEBAR.png b/packages/webamp/skins/base-2.91-png/TITLEBAR.png
deleted file mode 100644
index d31e90e8..00000000
Binary files a/packages/webamp/skins/base-2.91-png/TITLEBAR.png and /dev/null differ
diff --git a/packages/webamp/skins/base-2.91-png/VIDEO.png b/packages/webamp/skins/base-2.91-png/VIDEO.png
deleted file mode 100644
index 7d9367d4..00000000
Binary files a/packages/webamp/skins/base-2.91-png/VIDEO.png and /dev/null differ
diff --git a/packages/webamp/skins/base-2.91-png/VOLUME.png b/packages/webamp/skins/base-2.91-png/VOLUME.png
deleted file mode 100644
index 50cc6eb8..00000000
Binary files a/packages/webamp/skins/base-2.91-png/VOLUME.png and /dev/null differ
diff --git a/packages/webamp/skins/base-2.91/CLOSE.CUR b/packages/webamp/skins/base-2.91/CLOSE.CUR
deleted file mode 100644
index 5405ec01..00000000
Binary files a/packages/webamp/skins/base-2.91/CLOSE.CUR and /dev/null differ
diff --git a/packages/webamp/skins/base-2.91/EQSLID.CUR b/packages/webamp/skins/base-2.91/EQSLID.CUR
deleted file mode 100644
index e1c64ef9..00000000
Binary files a/packages/webamp/skins/base-2.91/EQSLID.CUR and /dev/null differ
diff --git a/packages/webamp/skins/base-2.91/EQTITLE.CUR b/packages/webamp/skins/base-2.91/EQTITLE.CUR
deleted file mode 100644
index 8b73d0ed..00000000
Binary files a/packages/webamp/skins/base-2.91/EQTITLE.CUR and /dev/null differ
diff --git a/packages/webamp/skins/base-2.91/NORMAL.CUR b/packages/webamp/skins/base-2.91/NORMAL.CUR
deleted file mode 100644
index 926f057d..00000000
Binary files a/packages/webamp/skins/base-2.91/NORMAL.CUR and /dev/null differ
diff --git a/packages/webamp/skins/base-2.91/PLEDIT.TXT b/packages/webamp/skins/base-2.91/PLEDIT.TXT
deleted file mode 100644
index b91ccbd9..00000000
--- a/packages/webamp/skins/base-2.91/PLEDIT.TXT
+++ /dev/null
@@ -1,6 +0,0 @@
-[Text]
-Normal=#00FF00
-Current=#FFFFFF
-NormalBG=#000000
-SelectedBG=#0000C6
-Font=Arial
diff --git a/packages/webamp/skins/base-2.91/PNORMAL.CUR b/packages/webamp/skins/base-2.91/PNORMAL.CUR
deleted file mode 100644
index 926f057d..00000000
Binary files a/packages/webamp/skins/base-2.91/PNORMAL.CUR and /dev/null differ
diff --git a/packages/webamp/skins/base-2.91/POSBAR.CUR b/packages/webamp/skins/base-2.91/POSBAR.CUR
deleted file mode 100644
index 07a7161f..00000000
Binary files a/packages/webamp/skins/base-2.91/POSBAR.CUR and /dev/null differ
diff --git a/packages/webamp/skins/base-2.91/PSIZE.CUR b/packages/webamp/skins/base-2.91/PSIZE.CUR
deleted file mode 100644
index 107a4636..00000000
Binary files a/packages/webamp/skins/base-2.91/PSIZE.CUR and /dev/null differ
diff --git a/packages/webamp/skins/base-2.91/PTBAR.CUR b/packages/webamp/skins/base-2.91/PTBAR.CUR
deleted file mode 100644
index 8b73d0ed..00000000
Binary files a/packages/webamp/skins/base-2.91/PTBAR.CUR and /dev/null differ
diff --git a/packages/webamp/skins/base-2.91/PVSCROLL.CUR b/packages/webamp/skins/base-2.91/PVSCROLL.CUR
deleted file mode 100644
index e1c64ef9..00000000
Binary files a/packages/webamp/skins/base-2.91/PVSCROLL.CUR and /dev/null differ
diff --git a/packages/webamp/skins/base-2.91/REGION.TXT b/packages/webamp/skins/base-2.91/REGION.TXT
deleted file mode 100644
index b08c2299..00000000
--- a/packages/webamp/skins/base-2.91/REGION.TXT
+++ /dev/null
@@ -1,105 +0,0 @@
-; I stole this from the Complex skin, cause hey I thought it was cool :)
-; (and cause I'm too lazy to document it myself. :)
-; The original author is Adam Kennedy <adamk@iname.com>
-;
-; Hope you don't mind Adam :)
-;
-;
-; -Justin
-;
-;
-; P.S. you can use the section names [WindowShade] and [Equalizer]
-; for obvious purposes =)
-;
-;
-;                    REGION.TXT STRUCTURE FOR DEFINING SKIN MASKS
-;
-;The region information comes without any supporting documentation
-;so I thought I might as well make some.
-;
-;The region.txt in WinAmp 1.92 allows us to some interesting things with transparencies
-;But how does it work?
-;
-;Well, basically, it lets you define a set of polygons. Anything inside a polygon is drawn. Anything not in a polygon is not drawn. Simple heh?
-;For how to define it have a look below at the first block. Un-comment it now. Don't worry about commenting the actual one lower down, if WinAmp finds multiple definitions, it only does the first and ignores the rest
-;
-;How to make a mask
-;1. Type [Normal]. Real simple that one. (My guess is it is just for forward compatibility)
-;2. Just type the NumPoints= and leave the number blank, we'll fill it in later
-;3. OK, now for the fun part.
-;   The co-ordinates you should type in are the OUTSIDE pixel co-ordinates in x,y format.
-;   Start at the top lefthand corner and work your way CLOCKWISE around you polygon.
-;   Now WinAmp ONLY accepts the PointList as one line of comma seperated variables.
-;   You can use spaces, but DONT GO ONTO A NEW LINE. Clear? Good. :)
-;   One last thing, don't type the first position again at the end, WinAmp joins them.
-;   Putting a space between each pair is simply common sense, right?
-;4. Once your done, count the number of co-ords, and fill in that number for NumPoints.
-;
-;Oh, as a side note, the x variables go from 0 to 275, and the y from 0 to 116.
-;So if you look at the first example you can see I've gone across the second top line, gone down a bit, ducked in one pixel, gone down to the bottom, and across and back up the other side, putting another ledge on the other side.
-
-;This does the outside border, and chops some bits out on the top and edges
-;[Normal]
-;NumPoints=8    ;Do this LAST!
-;PointList=0,1,  275,1,  275,14,  274,14,  274,115,  1,115,  1,14,  0,14  
-
-;Cool heh? Very subtle effect. Now lets try a more complex one, with multiple polygons
-;For your first hard(ish) mask, I suggest defining each element as a seperate mask.
-;It makes them a bit easier to think about.
-
-;First, lets define an area that JUST does the titlebar.
-;[Normal]
-;NumPoints=4
-;PointList=0,1,  275,1,  275,14,  0,14
-
-;Simple as can be :)
-;Go ahead, uncomment it and have a look. Just remember to recomment everything above it
-;Doing your areas one at a time does speed the process up a bit
-
-;Now lets define JUST the area sort of inside the outer ring
-;[Normal]
-;NumPoints = 4
-;PointList = 3,15,  272,15,  272,113,  3,113
-
-;Right, so say we want a mask that has, the titlebar AND the main area.
-;We just add them together
-; [Normal] 
-; NumPoints = 4, 4  ;Make sure to get the order right(although it doesnt matter here =P )
-; PointList = 0,1, 275,1, 275,14, 0,14,     3,15, 272,15, 272,113, 3,113
-
-;Dont forget to add that extra comma after the first set.
-; Having that bigger gap that lets you "keep it in your head" easier, it's a good idea
-
-;OK, now lets try something tricky. We are going to make a mask for just one green line around the outside of the skin
-;This introduces the other "big thing" with masks. Have a look at the first three co-ordinates below. You can see the first two moves we make are to go one to the side and then go down to the bottom. Looking at the last co-ordinate you can see we will come back up at the end, making a line two wide, right? 
-;WRONG!! Here comes the big important phrase.
-;IF YOU ARNT FOLLOWING THE OUTSIDE EDGE, YOUR CO-ORDINATES MARK TRANSPARENT SPACE LIMITS
-;That's right. Because I don't make a square, because I have to turn "inside" the box, I am only marking space, and what I end up with is a mask with one green line.
-;WARNING: Leave your skins dialog open when you do this one. :)
-;[Normal]
-;NumPoints = 8
-;PointList = 1,14,  2,14,  2,114,  273,114,  273,14,  274,14,  274,115,  1,115
-
-;OK, as the final touch lets add lets the border we just made to the other two.
-;You should be able to work this out on your own
-;[Normal]
-;NumPoints = 4, 4, 8
-;PointList = 0,1, 275,1, 275,14, 0,14,     3,15, 272,15, 272,113, 3,113,     1,14, 2,14, 2,114, 273,114, 273,14, 274,14, 274,115, 1,115
-
-;hmm... that still looks a bit tacky down the bottom right
-;So I'm going to modify it a bit
-;See if you can work out what I've had to alter just by looking at the display of it
-;[Normal]
-;NumPoints = 4, 4, 8
-;PointList = 0,1, 275,1, 275,14, 0,14,     3,15, 272,15, 272,80, 3,80,     1,14, 2,14, 2,81, 273,81, 273,14, 274,14, 274,115, 1,115
-
-
-; Justin's whacked trans skin :) in one, big lame messy line
-; [Normal]
-; NumPoints=20,4,4,4,8,4,4,6,6,4,4,4,4
-; PointList=0,0,19,0,19,11,114,11,114,0,156,0,156,11,243,11,243,0,275,0,275,13,266,13,266,22,264,22,264,13,111,13,111,22,109,22,109,13,0,13,     109,22,266,22,266,36,109,36, 16,88,130,88,130,105,16,105,    136,89,157,89,157,104,136,104,    22,13,22,62,102,62,102,13,100,13,100,24,24,24,24,13,    0,0,275,0,275,3,0,3,   16,72,264,72,264,81,16,81,  0,13,0,78,16,78,16,75,4,75,4,13,   275,13,275,78,264,78,264,75,272,75,272,13,     14,78,16,78,16,105,14,105,     130,81,132,81,132,105,130,105,     146,81,146,89,148,89,148,81,     130,96,136,96,136,98,130,98
-
-;THE END
-;
-;Post-Script
-;The other good thing about doing your mask in bits and pieces like this is that can make multiple versions so you can change as your whims change
diff --git a/packages/webamp/skins/base-2.91/Skining Updates.txt b/packages/webamp/skins/base-2.91/Skining Updates.txt
deleted file mode 100644
index c1e2299d..00000000
--- a/packages/webamp/skins/base-2.91/Skining Updates.txt	
+++ /dev/null
@@ -1,34 +0,0 @@
-Coppied from winamp/wa_dlg.h from the Winamp 2.9 ML SDK.
-
-       1) gen.bmp has a generic window frame for plugins to use.
-          its format is similar to the minibrowser's.
-          In addition gen.bmp includes a font for the titlebar, in both
-          highlight and no-highlight modes. The font is variable width,
-          and it uses the first color before the letter A as the delimiter.
-          The no-highlight form of letter must be the same width as the
-          highlight form.
-       2) genex.bmp has button and scrollbar images, as well as some individual
-          pixels that describe the colors for the dialog. The button and
-          scrollbar images should be self explanatory (note that the buttons
-          have 4 pixel sized edges that are not stretched, and the center is
-          stretched), and the scrollbars do something similar.
-          The colors start at (48,0) and run every other pixel. The meaning
-          of each pixel is:
-            x=48: item background (background to edits, listviews etc)
-            x=50: item foreground (text color of edit/listview, etc)
-            x=52: window background (used to set the bg color for the dialog)
-            x=54: button text color
-            x=56: window text color
-            x=58: color of dividers and sunken borders
-            x=60: selection color for listviews/playlists/etc
-            x=62: listview header background color
-            x=64: listview header text color
-            x=66: listview header frame top color
-            x=68: listview header frame middle color
-            x=70: listview header frame bottom color
-            x=72: listview header empty color
-            x=74: scrollbar foreground color
-            x=76: scrollbar background color
-            x=78: inverse scrollbar foreground color
-            x=80: inverse scrollbar background color
-            x=82: scrollbar dead area color
\ No newline at end of file
diff --git a/packages/webamp/skins/base-2.91/TITLEBAR.CUR b/packages/webamp/skins/base-2.91/TITLEBAR.CUR
deleted file mode 100644
index 8b73d0ed..00000000
Binary files a/packages/webamp/skins/base-2.91/TITLEBAR.CUR and /dev/null differ
diff --git a/packages/webamp/skins/base-2.91/VISCOLOR.TXT b/packages/webamp/skins/base-2.91/VISCOLOR.TXT
deleted file mode 100644
index 5871ad89..00000000
--- a/packages/webamp/skins/base-2.91/VISCOLOR.TXT
+++ /dev/null
@@ -1,24 +0,0 @@
-0,0,0, // color 0 = black
-24,33,41, // color 1 = grey for dots
-239,49,16, // color 2 = top of spec
-206,41,16, // 3
-214,90,0, // 4
-214,102,0, // 5
-214,115,0, // 6
-198,123,8, // 7
-222,165,24, // 8
-214,181,33, // 9
-189,222,41, // 10
-148,222,33, // 11
-41,206,16, // 12
-50,190,16, // 13
-57,181,16, // 14
-49,156,8,  // 15
-41,148,0,  // 16
-24,132,8,   // 17 = bottom of spec
-255,255,255, // 18 = osc 1
-214,214,222, // 19 = osc 2 (slightly dimmer)
-181,189,189, // 20 = osc 3
-160,170,175,  // 21 = osc 4
-148,156,165,  // 22 = osc 4
-150, 150, 150, // 23 = analyzer peak dots
diff --git a/packages/webamp/skins/base-2.91/VOLBAL.CUR b/packages/webamp/skins/base-2.91/VOLBAL.CUR
deleted file mode 100644
index 07a7161f..00000000
Binary files a/packages/webamp/skins/base-2.91/VOLBAL.CUR and /dev/null differ