diff --git a/js/config.js b/js/config.js
index aee45905..a15bfc81 100644
--- a/js/config.js
+++ b/js/config.js
@@ -1,4 +1,4 @@
-import skin from "../skins/base-2.91.wsz";
+import skin from "../skins/base-2.91-png.wsz";
 import llamaAudio from "../mp3/llama-2.91.mp3";
 
 /* global SENTRY_DSN */
diff --git a/js/index.js b/js/index.js
index c994ad22..be9c94a2 100644
--- a/js/index.js
+++ b/js/index.js
@@ -1,6 +1,6 @@
 import "babel-polyfill";
 import Raven from "raven-js";
-import base from "../skins/base-2.91.wsz";
+import base from "../skins/base-2.91-png.wsz";
 import osx from "../skins/MacOSXAqua1-5.wsz";
 import topaz from "../skins/TopazAmp1-2.wsz";
 import visor from "../skins/Vizor1-01.wsz";
diff --git a/js/skinParser.js b/js/skinParser.js
index 8e84b5d2..aab50eef 100644
--- a/js/skinParser.js
+++ b/js/skinParser.js
@@ -104,14 +104,17 @@ function getSpriteUrisFromImg(img, sprites) {
 }
 
 async function genImgFromFilename(zip, fileName) {
-  const blob = await genFileFromZip(zip, fileName, "bmp", "blob");
+  // Winamp only supports .bmp images, but WACUP set a precidence of supporting
+  // .png as well to reduce size. Since we care about size as well, we follow
+  // suit. Our default skin uses .png to save 14kb.
+  const blob = await genFileFromZip(zip, fileName, "(png|bmp)", "blob");
   if (!blob) {
     return null;
   }
   // The spec for createImageBitmap() says the browser should try to sniff the
   // mime type, but it looks like Firefox does not. So we specify it here
   // explicitly.
-  const typedBlob = new Blob([blob], { type: "image/bmp" });
+  const typedBlob = new Blob([blob], { type: "image/*" });
   return genImgFromBlob(typedBlob);
 }
 
diff --git a/package.json b/package.json
index 5f8bbc00..c7a3712c 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
     "tdd": "jest --watch",
     "format": "prettier --write experiments/**/*.js js/**/*.js css/**/*.css",
     "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 .",
     "skin-info": "unzip -vl skins/base-2.91.wsz"
   },
   "repository": {
diff --git a/skins/base-2.91-png.wsz b/skins/base-2.91-png.wsz
new file mode 100644
index 00000000..b982a9e0
Binary files /dev/null and b/skins/base-2.91-png.wsz differ
diff --git a/skins/base-2.91-png/BALANCE.png b/skins/base-2.91-png/BALANCE.png
new file mode 100644
index 00000000..da95e21f
Binary files /dev/null and b/skins/base-2.91-png/BALANCE.png differ
diff --git a/skins/base-2.91-png/CBUTTONS.png b/skins/base-2.91-png/CBUTTONS.png
new file mode 100644
index 00000000..67b658f9
Binary files /dev/null and b/skins/base-2.91-png/CBUTTONS.png differ
diff --git a/skins/base-2.91-png/CLOSE.CUR b/skins/base-2.91-png/CLOSE.CUR
new file mode 100644
index 00000000..5405ec01
Binary files /dev/null and b/skins/base-2.91-png/CLOSE.CUR differ
diff --git a/skins/base-2.91-png/EQMAIN.png b/skins/base-2.91-png/EQMAIN.png
new file mode 100644
index 00000000..1376a8af
Binary files /dev/null and b/skins/base-2.91-png/EQMAIN.png differ
diff --git a/skins/base-2.91-png/EQSLID.CUR b/skins/base-2.91-png/EQSLID.CUR
new file mode 100644
index 00000000..e1c64ef9
Binary files /dev/null and b/skins/base-2.91-png/EQSLID.CUR differ
diff --git a/skins/base-2.91-png/EQTITLE.CUR b/skins/base-2.91-png/EQTITLE.CUR
new file mode 100644
index 00000000..8b73d0ed
Binary files /dev/null and b/skins/base-2.91-png/EQTITLE.CUR differ
diff --git a/skins/base-2.91-png/EQ_EX.png b/skins/base-2.91-png/EQ_EX.png
new file mode 100644
index 00000000..2f87fb37
Binary files /dev/null and b/skins/base-2.91-png/EQ_EX.png differ
diff --git a/skins/base-2.91-png/GEN.png b/skins/base-2.91-png/GEN.png
new file mode 100644
index 00000000..76d994d0
Binary files /dev/null and b/skins/base-2.91-png/GEN.png differ
diff --git a/skins/base-2.91-png/GENEX.png b/skins/base-2.91-png/GENEX.png
new file mode 100644
index 00000000..9c1f8984
Binary files /dev/null and b/skins/base-2.91-png/GENEX.png differ
diff --git a/skins/base-2.91-png/MAIN.png b/skins/base-2.91-png/MAIN.png
new file mode 100644
index 00000000..a285e6c2
Binary files /dev/null and b/skins/base-2.91-png/MAIN.png differ
diff --git a/skins/base-2.91-png/MB.png b/skins/base-2.91-png/MB.png
new file mode 100644
index 00000000..b017af32
Binary files /dev/null and b/skins/base-2.91-png/MB.png differ
diff --git a/skins/base-2.91-png/MONOSTER.png b/skins/base-2.91-png/MONOSTER.png
new file mode 100644
index 00000000..65738e77
Binary files /dev/null and b/skins/base-2.91-png/MONOSTER.png differ
diff --git a/skins/base-2.91-png/NORMAL.CUR b/skins/base-2.91-png/NORMAL.CUR
new file mode 100644
index 00000000..926f057d
Binary files /dev/null and b/skins/base-2.91-png/NORMAL.CUR differ
diff --git a/skins/base-2.91-png/NUMBERS.png b/skins/base-2.91-png/NUMBERS.png
new file mode 100644
index 00000000..e5416a40
Binary files /dev/null and b/skins/base-2.91-png/NUMBERS.png differ
diff --git a/skins/base-2.91-png/PLAYPAUS.png b/skins/base-2.91-png/PLAYPAUS.png
new file mode 100644
index 00000000..f37df622
Binary files /dev/null and b/skins/base-2.91-png/PLAYPAUS.png differ
diff --git a/skins/base-2.91-png/PLEDIT.TXT b/skins/base-2.91-png/PLEDIT.TXT
new file mode 100644
index 00000000..b91ccbd9
--- /dev/null
+++ b/skins/base-2.91-png/PLEDIT.TXT
@@ -0,0 +1,6 @@
+[Text]
+Normal=#00FF00
+Current=#FFFFFF
+NormalBG=#000000
+SelectedBG=#0000C6
+Font=Arial
diff --git a/skins/base-2.91-png/PLEDIT.png b/skins/base-2.91-png/PLEDIT.png
new file mode 100644
index 00000000..3cf6ee79
Binary files /dev/null and b/skins/base-2.91-png/PLEDIT.png differ
diff --git a/skins/base-2.91-png/PNORMAL.CUR b/skins/base-2.91-png/PNORMAL.CUR
new file mode 100644
index 00000000..926f057d
Binary files /dev/null and b/skins/base-2.91-png/PNORMAL.CUR differ
diff --git a/skins/base-2.91-png/POSBAR.CUR b/skins/base-2.91-png/POSBAR.CUR
new file mode 100644
index 00000000..07a7161f
Binary files /dev/null and b/skins/base-2.91-png/POSBAR.CUR differ
diff --git a/skins/base-2.91-png/POSBAR.png b/skins/base-2.91-png/POSBAR.png
new file mode 100644
index 00000000..8ce36cf2
Binary files /dev/null and b/skins/base-2.91-png/POSBAR.png differ
diff --git a/skins/base-2.91-png/PSIZE.CUR b/skins/base-2.91-png/PSIZE.CUR
new file mode 100644
index 00000000..107a4636
Binary files /dev/null and b/skins/base-2.91-png/PSIZE.CUR differ
diff --git a/skins/base-2.91-png/PVSCROLL.CUR b/skins/base-2.91-png/PVSCROLL.CUR
new file mode 100644
index 00000000..e1c64ef9
Binary files /dev/null and b/skins/base-2.91-png/PVSCROLL.CUR differ
diff --git a/skins/base-2.91-png/REGION.TXT b/skins/base-2.91-png/REGION.TXT
new file mode 100644
index 00000000..b08c2299
--- /dev/null
+++ b/skins/base-2.91-png/REGION.TXT
@@ -0,0 +1,105 @@
+; 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/skins/base-2.91-png/SHUFREP.png b/skins/base-2.91-png/SHUFREP.png
new file mode 100644
index 00000000..34b95d22
Binary files /dev/null and b/skins/base-2.91-png/SHUFREP.png differ
diff --git a/skins/base-2.91-png/Skining Updates.txt b/skins/base-2.91-png/Skining Updates.txt
new file mode 100644
index 00000000..c1e2299d
--- /dev/null
+++ b/skins/base-2.91-png/Skining Updates.txt	
@@ -0,0 +1,34 @@
+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/skins/base-2.91-png/TEXT.png b/skins/base-2.91-png/TEXT.png
new file mode 100644
index 00000000..2e036a8b
Binary files /dev/null and b/skins/base-2.91-png/TEXT.png differ
diff --git a/skins/base-2.91-png/TITLEBAR.CUR b/skins/base-2.91-png/TITLEBAR.CUR
new file mode 100644
index 00000000..8b73d0ed
Binary files /dev/null and b/skins/base-2.91-png/TITLEBAR.CUR differ
diff --git a/skins/base-2.91-png/TITLEBAR.png b/skins/base-2.91-png/TITLEBAR.png
new file mode 100644
index 00000000..d31e90e8
Binary files /dev/null and b/skins/base-2.91-png/TITLEBAR.png differ
diff --git a/skins/base-2.91-png/VIDEO.png b/skins/base-2.91-png/VIDEO.png
new file mode 100644
index 00000000..7d9367d4
Binary files /dev/null and b/skins/base-2.91-png/VIDEO.png differ
diff --git a/skins/base-2.91-png/VISCOLOR.TXT b/skins/base-2.91-png/VISCOLOR.TXT
new file mode 100644
index 00000000..5871ad89
--- /dev/null
+++ b/skins/base-2.91-png/VISCOLOR.TXT
@@ -0,0 +1,24 @@
+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/skins/base-2.91-png/VOLBAL.CUR b/skins/base-2.91-png/VOLBAL.CUR
new file mode 100644
index 00000000..07a7161f
Binary files /dev/null and b/skins/base-2.91-png/VOLBAL.CUR differ
diff --git a/skins/base-2.91-png/VOLUME.png b/skins/base-2.91-png/VOLUME.png
new file mode 100644
index 00000000..50cc6eb8
Binary files /dev/null and b/skins/base-2.91-png/VOLUME.png differ