diff --git a/assets/tetanes_banner.bmp b/assets/tetanes_banner.bmp
new file mode 100755
index 00000000..1f34c4a9
Binary files /dev/null and b/assets/tetanes_banner.bmp differ
diff --git a/assets/tetanes_dialog.bmp b/assets/tetanes_dialog.bmp
new file mode 100755
index 00000000..f2bb7701
Binary files /dev/null and b/assets/tetanes_dialog.bmp differ
diff --git a/assets/tetanes_icon.ico b/assets/tetanes_icon.ico
new file mode 100755
index 00000000..07572a5b
Binary files /dev/null and b/assets/tetanes_icon.ico differ
diff --git a/lib/msvc/dll/32/SDL2.dll b/lib/msvc/dll/32/SDL2.dll
new file mode 100644
index 00000000..9c25aa57
Binary files /dev/null and b/lib/msvc/dll/32/SDL2.dll differ
diff --git a/lib/msvc/dll/32/SDL2_gfx.dll b/lib/msvc/dll/32/SDL2_gfx.dll
new file mode 100644
index 00000000..83b3e836
Binary files /dev/null and b/lib/msvc/dll/32/SDL2_gfx.dll differ
diff --git a/lib/msvc/dll/32/SDL2_image.dll b/lib/msvc/dll/32/SDL2_image.dll
new file mode 100644
index 00000000..ab6f38b3
Binary files /dev/null and b/lib/msvc/dll/32/SDL2_image.dll differ
diff --git a/lib/msvc/dll/32/SDL2_mixer.dll b/lib/msvc/dll/32/SDL2_mixer.dll
new file mode 100644
index 00000000..96abfa1a
Binary files /dev/null and b/lib/msvc/dll/32/SDL2_mixer.dll differ
diff --git a/lib/msvc/dll/32/SDL2_ttf.dll b/lib/msvc/dll/32/SDL2_ttf.dll
new file mode 100644
index 00000000..56afccbe
Binary files /dev/null and b/lib/msvc/dll/32/SDL2_ttf.dll differ
diff --git a/lib/msvc/dll/32/libFLAC-8.dll b/lib/msvc/dll/32/libFLAC-8.dll
new file mode 100644
index 00000000..b56ea2a8
Binary files /dev/null and b/lib/msvc/dll/32/libFLAC-8.dll differ
diff --git a/lib/msvc/dll/32/libjpeg-9.dll b/lib/msvc/dll/32/libjpeg-9.dll
new file mode 100644
index 00000000..9d8911ca
Binary files /dev/null and b/lib/msvc/dll/32/libjpeg-9.dll differ
diff --git a/lib/msvc/dll/32/libmodplug-1.dll b/lib/msvc/dll/32/libmodplug-1.dll
new file mode 100644
index 00000000..d66a317d
Binary files /dev/null and b/lib/msvc/dll/32/libmodplug-1.dll differ
diff --git a/lib/msvc/dll/32/libmpg123-0.dll b/lib/msvc/dll/32/libmpg123-0.dll
new file mode 100644
index 00000000..240298bb
Binary files /dev/null and b/lib/msvc/dll/32/libmpg123-0.dll differ
diff --git a/lib/msvc/dll/32/libogg-0.dll b/lib/msvc/dll/32/libogg-0.dll
new file mode 100644
index 00000000..233c0f42
Binary files /dev/null and b/lib/msvc/dll/32/libogg-0.dll differ
diff --git a/lib/msvc/dll/32/libopus-0.dll b/lib/msvc/dll/32/libopus-0.dll
new file mode 100644
index 00000000..94ea541d
Binary files /dev/null and b/lib/msvc/dll/32/libopus-0.dll differ
diff --git a/lib/msvc/dll/32/libopusfile-0.dll b/lib/msvc/dll/32/libopusfile-0.dll
new file mode 100644
index 00000000..260796b6
Binary files /dev/null and b/lib/msvc/dll/32/libopusfile-0.dll differ
diff --git a/lib/msvc/dll/32/libpng16-16.dll b/lib/msvc/dll/32/libpng16-16.dll
new file mode 100644
index 00000000..fd5db8d1
Binary files /dev/null and b/lib/msvc/dll/32/libpng16-16.dll differ
diff --git a/lib/msvc/dll/32/libtiff-5.dll b/lib/msvc/dll/32/libtiff-5.dll
new file mode 100644
index 00000000..af3c3e66
Binary files /dev/null and b/lib/msvc/dll/32/libtiff-5.dll differ
diff --git a/lib/msvc/dll/32/libvorbis-0.dll b/lib/msvc/dll/32/libvorbis-0.dll
new file mode 100644
index 00000000..4e4aaa54
Binary files /dev/null and b/lib/msvc/dll/32/libvorbis-0.dll differ
diff --git a/lib/msvc/dll/32/libvorbisfile-3.dll b/lib/msvc/dll/32/libvorbisfile-3.dll
new file mode 100644
index 00000000..5d90a235
Binary files /dev/null and b/lib/msvc/dll/32/libvorbisfile-3.dll differ
diff --git a/lib/msvc/dll/32/libwebp-7.dll b/lib/msvc/dll/32/libwebp-7.dll
new file mode 100644
index 00000000..c11bf138
Binary files /dev/null and b/lib/msvc/dll/32/libwebp-7.dll differ
diff --git a/lib/msvc/dll/32/zlib1.dll b/lib/msvc/dll/32/zlib1.dll
new file mode 100644
index 00000000..3a45deb5
Binary files /dev/null and b/lib/msvc/dll/32/zlib1.dll differ
diff --git a/lib/msvc/dll/64/SDL2.dll b/lib/msvc/dll/64/SDL2.dll
new file mode 100644
index 00000000..7a6c63d6
Binary files /dev/null and b/lib/msvc/dll/64/SDL2.dll differ
diff --git a/lib/msvc/dll/64/SDL2_gfx.dll b/lib/msvc/dll/64/SDL2_gfx.dll
new file mode 100644
index 00000000..b677490a
Binary files /dev/null and b/lib/msvc/dll/64/SDL2_gfx.dll differ
diff --git a/lib/msvc/dll/64/SDL2_image.dll b/lib/msvc/dll/64/SDL2_image.dll
new file mode 100644
index 00000000..d7016555
Binary files /dev/null and b/lib/msvc/dll/64/SDL2_image.dll differ
diff --git a/lib/msvc/dll/64/SDL2_mixer.dll b/lib/msvc/dll/64/SDL2_mixer.dll
new file mode 100644
index 00000000..40bb1c14
Binary files /dev/null and b/lib/msvc/dll/64/SDL2_mixer.dll differ
diff --git a/lib/msvc/dll/64/SDL2_ttf.dll b/lib/msvc/dll/64/SDL2_ttf.dll
new file mode 100644
index 00000000..2acc0e5b
Binary files /dev/null and b/lib/msvc/dll/64/SDL2_ttf.dll differ
diff --git a/lib/msvc/dll/64/libFLAC-8.dll b/lib/msvc/dll/64/libFLAC-8.dll
new file mode 100644
index 00000000..71f2e19d
Binary files /dev/null and b/lib/msvc/dll/64/libFLAC-8.dll differ
diff --git a/lib/msvc/dll/64/libjpeg-9.dll b/lib/msvc/dll/64/libjpeg-9.dll
new file mode 100644
index 00000000..9a05528e
Binary files /dev/null and b/lib/msvc/dll/64/libjpeg-9.dll differ
diff --git a/lib/msvc/dll/64/libmodplug-1.dll b/lib/msvc/dll/64/libmodplug-1.dll
new file mode 100644
index 00000000..7c051267
Binary files /dev/null and b/lib/msvc/dll/64/libmodplug-1.dll differ
diff --git a/lib/msvc/dll/64/libmpg123-0.dll b/lib/msvc/dll/64/libmpg123-0.dll
new file mode 100644
index 00000000..c7809b16
Binary files /dev/null and b/lib/msvc/dll/64/libmpg123-0.dll differ
diff --git a/lib/msvc/dll/64/libogg-0.dll b/lib/msvc/dll/64/libogg-0.dll
new file mode 100644
index 00000000..51334815
Binary files /dev/null and b/lib/msvc/dll/64/libogg-0.dll differ
diff --git a/lib/msvc/dll/64/libopus-0.dll b/lib/msvc/dll/64/libopus-0.dll
new file mode 100644
index 00000000..9ba6c386
Binary files /dev/null and b/lib/msvc/dll/64/libopus-0.dll differ
diff --git a/lib/msvc/dll/64/libopusfile-0.dll b/lib/msvc/dll/64/libopusfile-0.dll
new file mode 100644
index 00000000..97a88b61
Binary files /dev/null and b/lib/msvc/dll/64/libopusfile-0.dll differ
diff --git a/lib/msvc/dll/64/libpng16-16.dll b/lib/msvc/dll/64/libpng16-16.dll
new file mode 100644
index 00000000..709f7244
Binary files /dev/null and b/lib/msvc/dll/64/libpng16-16.dll differ
diff --git a/lib/msvc/dll/64/libtiff-5.dll b/lib/msvc/dll/64/libtiff-5.dll
new file mode 100644
index 00000000..fc8a7c0c
Binary files /dev/null and b/lib/msvc/dll/64/libtiff-5.dll differ
diff --git a/lib/msvc/dll/64/libvorbis-0.dll b/lib/msvc/dll/64/libvorbis-0.dll
new file mode 100644
index 00000000..f5ae1bf7
Binary files /dev/null and b/lib/msvc/dll/64/libvorbis-0.dll differ
diff --git a/lib/msvc/dll/64/libvorbisfile-3.dll b/lib/msvc/dll/64/libvorbisfile-3.dll
new file mode 100644
index 00000000..d0787368
Binary files /dev/null and b/lib/msvc/dll/64/libvorbisfile-3.dll differ
diff --git a/lib/msvc/dll/64/libwebp-7.dll b/lib/msvc/dll/64/libwebp-7.dll
new file mode 100644
index 00000000..fad57b22
Binary files /dev/null and b/lib/msvc/dll/64/libwebp-7.dll differ
diff --git a/lib/msvc/dll/64/zlib1.dll b/lib/msvc/dll/64/zlib1.dll
new file mode 100644
index 00000000..e7493de3
Binary files /dev/null and b/lib/msvc/dll/64/zlib1.dll differ
diff --git a/lib/msvc/lib/32/SDL2.lib b/lib/msvc/lib/32/SDL2.lib
new file mode 100644
index 00000000..724f74fe
Binary files /dev/null and b/lib/msvc/lib/32/SDL2.lib differ
diff --git a/lib/msvc/lib/32/SDL2_gfx.lib b/lib/msvc/lib/32/SDL2_gfx.lib
new file mode 100644
index 00000000..07b3e93a
Binary files /dev/null and b/lib/msvc/lib/32/SDL2_gfx.lib differ
diff --git a/lib/msvc/lib/32/SDL2_image.lib b/lib/msvc/lib/32/SDL2_image.lib
new file mode 100644
index 00000000..3fc6a5a6
Binary files /dev/null and b/lib/msvc/lib/32/SDL2_image.lib differ
diff --git a/lib/msvc/lib/32/SDL2_mixer.lib b/lib/msvc/lib/32/SDL2_mixer.lib
new file mode 100644
index 00000000..8dd5cb36
Binary files /dev/null and b/lib/msvc/lib/32/SDL2_mixer.lib differ
diff --git a/lib/msvc/lib/32/SDL2_ttf.lib b/lib/msvc/lib/32/SDL2_ttf.lib
new file mode 100644
index 00000000..a328f6ab
Binary files /dev/null and b/lib/msvc/lib/32/SDL2_ttf.lib differ
diff --git a/lib/msvc/lib/32/SDL2main.lib b/lib/msvc/lib/32/SDL2main.lib
new file mode 100644
index 00000000..c1a13009
Binary files /dev/null and b/lib/msvc/lib/32/SDL2main.lib differ
diff --git a/lib/msvc/lib/32/SDL2test.lib b/lib/msvc/lib/32/SDL2test.lib
new file mode 100644
index 00000000..d4e90483
Binary files /dev/null and b/lib/msvc/lib/32/SDL2test.lib differ
diff --git a/lib/msvc/lib/64/SDL2.lib b/lib/msvc/lib/64/SDL2.lib
new file mode 100644
index 00000000..28bd851f
Binary files /dev/null and b/lib/msvc/lib/64/SDL2.lib differ
diff --git a/lib/msvc/lib/64/SDL2_gfx.lib b/lib/msvc/lib/64/SDL2_gfx.lib
new file mode 100644
index 00000000..ec88875a
Binary files /dev/null and b/lib/msvc/lib/64/SDL2_gfx.lib differ
diff --git a/lib/msvc/lib/64/SDL2_image.lib b/lib/msvc/lib/64/SDL2_image.lib
new file mode 100644
index 00000000..6d00aed6
Binary files /dev/null and b/lib/msvc/lib/64/SDL2_image.lib differ
diff --git a/lib/msvc/lib/64/SDL2_mixer.lib b/lib/msvc/lib/64/SDL2_mixer.lib
new file mode 100644
index 00000000..3b96d7dd
Binary files /dev/null and b/lib/msvc/lib/64/SDL2_mixer.lib differ
diff --git a/lib/msvc/lib/64/SDL2_ttf.lib b/lib/msvc/lib/64/SDL2_ttf.lib
new file mode 100644
index 00000000..bd53219e
Binary files /dev/null and b/lib/msvc/lib/64/SDL2_ttf.lib differ
diff --git a/lib/msvc/lib/64/SDL2main.lib b/lib/msvc/lib/64/SDL2main.lib
new file mode 100644
index 00000000..0f8aa4a8
Binary files /dev/null and b/lib/msvc/lib/64/SDL2main.lib differ
diff --git a/lib/msvc/lib/64/SDL2test.lib b/lib/msvc/lib/64/SDL2test.lib
new file mode 100644
index 00000000..15790dd5
Binary files /dev/null and b/lib/msvc/lib/64/SDL2test.lib differ
diff --git a/wix/main.wxs b/wix/main.wxs
index 0940fdef..1ed9ebe4 100644
--- a/wix/main.wxs
+++ b/wix/main.wxs
@@ -60,7 +60,7 @@
 
     <Product
         Id='*'
-        Name='tetanes'
+        Name='TetaNES'
         UpgradeCode='DB76CEB0-15B8-4727-9C3E-55819AB5E7B9'
         Manufacturer='Luke Petherbridge'
         Language='1033'
@@ -82,151 +82,147 @@
             Schedule='afterInstallInitialize'
             DowngradeErrorMessage='A newer version of [ProductName] is already installed. Setup will now exit.'/>
 
-        <Media Id='1' Cabinet='media1.cab' EmbedCab='yes' DiskPrompt='CD-ROM #1'/>
-        <Property Id='DiskPrompt' Value='tetanes Installation'/>
+        <Media Id='1' Cabinet='tetanes.cab' EmbedCab='yes'/>
+        <Property Id='DiskPrompt' Value='TetaNES Installation'/>
 
         <Directory Id='TARGETDIR' Name='SourceDir'>
             <Directory Id='$(var.PlatformProgramFilesFolder)' Name='PFiles'>
-                <Directory Id='APPLICATIONFOLDER' Name='tetanes'>
-                    
-                    <!--
-                      Enabling the license sidecar file in the installer is a four step process:
-
-                      1. Uncomment the `Component` tag and its contents.
-                      2. Change the value for the `Source` attribute in the `File` tag to a path
-                         to the file that should be included as the license sidecar file. The path
-                         can, and probably should be, relative to this file.
-                      3. Change the value for the `Name` attribute in the `File` tag to the
-                         desired name for the file when it is installed alongside the `bin` folder
-                         in the installation directory. This can be omitted if the desired name is
-                         the same as the file name.
-                      4. Uncomment the `ComponentRef` tag with the Id attribute value of "License"
-                         further down in this file.
-                    -->
-                    <!--
-                    <Component Id='License' Guid='*'>
-                        <File Id='LicenseFile' Name='ChangeMe' DiskId='1' Source='C:\Path\To\File' KeyPath='yes'/>
+                <Directory Id='APPLICATIONFOLDER' Name='TetaNES'>
+                    <Component Id='Path' Guid='5731AE63-80DE-4CD7-ADFA-9E79BEDCE08B' KeyPath='yes'>
+                        <Environment
+                            Id='PATH'
+                            Name='PATH'
+                            Value='[Bin]'
+                            Permanent='no'
+                            Part='last'
+                            Action='set'
+                            System='yes'/>
+                    </Component>
+                    <Component Id='TetaNES.exe' Guid='70d7d0a6-3208-430d-896c-a9116cfcbeb9'>
+                        <File
+                            Id='TetaNES.exe'
+                            Name='TetaNES.exe'
+                            DiskId='1'
+                            Source='$(var.CargoTargetBinDir)\tetanes.exe'
+                            KeyPath='yes'
+                            Checksum='yes'/>
+                    </Component>
+                    <Component Id='libFLAC_8.dll' Guid='D6099F00-ED16-40C0-8455-68B54102D2DB'>
+                        <File Id='libFLAC_8.dll' Source='.\lib\msvc\dll\64\libFLAC-8.dll' KeyPath='yes'/>
+                    </Component>
+                    <Component Id='SDL2.lib' Guid='38db74ed-4c97-4026-a4a2-ed27bccef1c7'>
+                        <File Id='SDL2.lib' Source='.\lib\msvc\lib\64\SDL2.lib' KeyPath='yes'/>
+                    </Component>
+                    <Component Id='SDL2_gfx.lib' Guid='1e3671f8-5778-432e-99a9-118274d8ac45'>
+                        <File Id='SDL2_gfx.lib' Source='.\lib\msvc\lib\64\SDL2_gfx.lib' KeyPath='yes'/>
+                    </Component>
+                    <Component Id='SDL2_image.lib' Guid='d7b48cab-5525-4658-984e-fb006bc791ce'>
+                        <File Id='SDL2_image.lib' Source='.\lib\msvc\lib\64\SDL2_image.lib' KeyPath='yes'/>
+                    </Component>
+                    <Component Id='SDL2_mixer.lib' Guid='1679090d-d4a6-46f3-82ff-0668533a641d'>
+                        <File Id='SDL2_mixer.lib' Source='.\lib\msvc\lib\64\SDL2_mixer.lib' KeyPath='yes'/>
+                    </Component>
+                    <Component Id='SDL2_ttf.lib' Guid='1bf78686-e158-4e9a-a97e-6f3777f24b2d'>
+                        <File Id='SDL2_ttf.lib' Source='.\lib\msvc\lib\64\SDL2_ttf.lib' KeyPath='yes'/>
+                    </Component>
+                    <Component Id='SDL2main.lib' Guid='f18008a5-e614-4e16-abe7-7e1aa5b109c6'>
+                        <File Id='SDL2main.lib' Source='.\lib\msvc\lib\64\SDL2main.lib' KeyPath='yes'/>
+                    </Component>
+                    <Component Id='SDL2test.lib' Guid='13077e63-978c-419f-823b-bb51c8a19d89'>
+                        <File Id='SDL2test.lib' Source='.\lib\msvc\lib\64\SDL2test.lib' KeyPath='yes'/>
+                    </Component>
+                    <Component Id='libjpeg_9.dll' Guid='9ff0ea62-9db4-4948-a3f1-44f59d32b89d'>
+                        <File Id='libjpeg_9.dll' Source='.\lib\msvc\dll\64\libjpeg-9.dll' KeyPath='yes'/>
+                    </Component>
+                    <Component Id='libmodplug_1.dll' Guid='35650f65-65af-4335-abd9-dea6d9d7247a'>
+                        <File Id='libmodplug_1.dll' Source='.\lib\msvc\dll\64\libmodplug-1.dll' KeyPath='yes'/>
+                    </Component>
+                    <Component Id='libmpg123_0.dll' Guid='3fa05141-ad15-445c-80c3-359b7bd44e97'>
+                        <File Id='libmpg123_0.dll' Source='.\lib\msvc\dll\64\libmpg123-0.dll' KeyPath='yes'/>
+                    </Component>
+                    <Component Id='libogg_0.dll' Guid='20bcf2e3-2e52-4a09-a15c-17f5b1d8ded7'>
+                        <File Id='libogg_0.dll' Source='.\lib\msvc\dll\64\libogg-0.dll' KeyPath='yes'/>
+                    </Component>
+                    <Component Id='libopus_0.dll' Guid='e66a9db4-1e34-4160-9f75-31209cccc922'>
+                        <File Id='libopus_0.dll' Source='.\lib\msvc\dll\64\libopus-0.dll' KeyPath='yes'/>
+                    </Component>
+                    <Component Id='libopusfile_0.dll' Guid='cc57ebdc-0662-449f-9ff0-3412b564375e'>
+                        <File Id='libopusfile_0.dll' Source='.\lib\msvc\dll\64\libopusfile-0.dll' KeyPath='yes'/>
+                    </Component>
+                    <Component Id='libpng16_16.dll' Guid='363d6c90-d1a4-4a3b-8792-0de6625b7369'>
+                        <File Id='libpng16_16.dll' Source='.\lib\msvc\dll\64\libpng16-16.dll' KeyPath='yes'/>
+                    </Component>
+                    <Component Id='libtiff_5.dll' Guid='df506b22-3de3-431e-953f-84557b019a83'>
+                        <File Id='libtiff_5.dll' Source='.\lib\msvc\dll\64\libtiff-5.dll' KeyPath='yes'/>
+                    </Component>
+                    <Component Id='libvorbis_0.dll' Guid='2c0bef62-1998-4864-96ba-049e096b0658'>
+                        <File Id='libvorbis_0.dll' Source='.\lib\msvc\dll\64\libvorbis-0.dll' KeyPath='yes'/>
+                    </Component>
+                    <Component Id='libvorbisfile_3.dll' Guid='a18d5d80-d51b-4a6a-a5a7-ade41f8d57d8'>
+                        <File Id='libvorbisfile_3.dll' Source='.\lib\msvc\dll\64\libvorbisfile-3.dll' KeyPath='yes'/>
+                    </Component>
+                    <Component Id='libwebp_7.dll' Guid='2b78de86-61b2-4ed9-a4ed-5d0a1a895fa6'>
+                        <File Id='libwebp_7.dll' Source='.\lib\msvc\dll\64\libwebp-7.dll' KeyPath='yes'/>
+                    </Component>
+                    <Component Id='SDL2.dll' Guid='ac2a23f5-a17b-4ec7-ae3c-98b079d665b5'>
+                        <File Id='SDL2.dll' Source='.\lib\msvc\dll\64\SDL2.dll' KeyPath='yes'/>
+                    </Component>
+                    <Component Id='SDL2_gfx.dll' Guid='5cc85256-0b03-4ae8-92ad-8442ad36485b'>
+                        <File Id='SDL2_gfx.dll' Source='.\lib\msvc\dll\64\SDL2_gfx.dll' KeyPath='yes'/>
+                    </Component>
+                    <Component Id='SDL2_image.dll' Guid='20dc9c0b-5767-4548-9bf6-096f921e45f6'>
+                        <File Id='SDL2_image.dll' Source='.\lib\msvc\dll\64\SDL2_image.dll' KeyPath='yes'/>
+                    </Component>
+                    <Component Id='SDL2_mixer.dll' Guid='61cff165-790d-4084-9db6-99a5ec5a8930'>
+                        <File Id='SDL2_mixer.dll' Source='.\lib\msvc\dll\64\SDL2_mixer.dll' KeyPath='yes'/>
+                    </Component>
+                    <Component Id='SDL2_ttf.d' Guid='871F2130-A8B3-4B28-9C5B-3D35174EF913'>
+                        <File Id='SDL2_ttf.d' Source='.\lib\msvc\dll\64\SDL2_ttf.dll' KeyPath='yes'/>
                     </Component>
-                    -->
-
-                    <Directory Id='Bin' Name='bin'>
-                        <Component Id='Path' Guid='5731AE63-80DE-4CD7-ADFA-9E79BEDCE08B' KeyPath='yes'>
-                            <Environment
-                                Id='PATH'
-                                Name='PATH'
-                                Value='[Bin]'
-                                Permanent='no'
-                                Part='last'
-                                Action='set'
-                                System='yes'/>
-                        </Component>
-                        <Component Id='binary0' Guid='*'>
-                            <File
-                                Id='exe0'
-                                Name='tetanes.exe'
-                                DiskId='1'
-                                Source='$(var.CargoTargetBinDir)\tetanes.exe'
-                                KeyPath='yes'/>
-                        </Component>
-                        <Component Id='libFLAC-8.dll' Guid='D6099F00-ED16-40C0-8455-68B54102D2DB'>
-                            <File Id='libFLAC-8.dll' Source='$(var.CargoTargetBinDir)\libFLAC-8.dll' KeyPath='yes'/>
-                        </Component>
-                        <Component Id='SDL2.lib' Guid='38db74ed-4c97-4026-a4a2-ed27bccef1c7'>
-                            <File Id='SDL2.lib' Source='$(var.CargoTargetBinDir)\SDL2.lib' KeyPath='yes'/>
-                        </Component>
-                        <Component Id='SDL2_gfx.lib' Guid='1e3671f8-5778-432e-99a9-118274d8ac45'>
-                            <File Id='SDL2_gfx.lib' Source='$(var.CargoTargetBinDir)\SDL2_gfx.lib' KeyPath='yes'/>
-                        </Component>
-                        <Component Id='SDL2_image.lib' Guid='d7b48cab-5525-4658-984e-fb006bc791ce'>
-                            <File Id='SDL2_image.lib' Source='$(var.CargoTargetBinDir)\SDL2_image.lib' KeyPath='yes'/>
-                        </Component>
-                        <Component Id='SDL2_mixer.lib' Guid='1679090d-d4a6-46f3-82ff-0668533a641d'>
-                            <File Id='SDL2_mixer.lib' Source='$(var.CargoTargetBinDir)\SDL2_mixer.lib' KeyPath='yes'/>
-                        </Component>
-                        <Component Id='SDL2_ttf.lib' Guid='1bf78686-e158-4e9a-a97e-6f3777f24b2d'>
-                            <File Id='SDL2_ttf.lib' Source='$(var.CargoTargetBinDir)\SDL2_ttf.lib' KeyPath='yes'/>
-                        </Component>
-                        <Component Id='SDL2main.lib' Guid='f18008a5-e614-4e16-abe7-7e1aa5b109c6'>
-                            <File Id='SDL2main.lib' Source='$(var.CargoTargetBinDir)\SDL2main.lib' KeyPath='yes'/>
-                        </Component>
-                        <Component Id='SDL2test.lib' Guid='13077e63-978c-419f-823b-bb51c8a19d89'>
-                            <File Id='SDL2test.lib' Source='$(var.CargoTargetBinDir)\SDL2test.lib' KeyPath='yes'/>
-                        </Component>
-                        <Component Id='libjpeg-9.dll' Guid='9ff0ea62-9db4-4948-a3f1-44f59d32b89d'>
-                            <File Id='libjpeg-9.dll' Source='$(var.CargoTargetBinDir)\libjpeg-9.dll' KeyPath='yes'/>
-                        </Component>
-                        <Component Id='libmodplug-1.dll' Guid='35650f65-65af-4335-abd9-dea6d9d7247a'>
-                            <File Id='libmodplug-1.dll' Source='$(var.CargoTargetBinDir)\libmodplug-1.dll' KeyPath='yes'/>
-                        </Component>
-                        <Component Id='libmpg123-0.dll' Guid='3fa05141-ad15-445c-80c3-359b7bd44e97'>
-                            <File Id='libmpg123-0.dll' Source='$(var.CargoTargetBinDir)\libmpg123-0.dll' KeyPath='yes'/>
-                        </Component>
-                        <Component Id='libogg-0.dll' Guid='20bcf2e3-2e52-4a09-a15c-17f5b1d8ded7'>
-                            <File Id='libogg-0.dll' Source='$(var.CargoTargetBinDir)\libogg-0.dll' KeyPath='yes'/>
-                        </Component>
-                        <Component Id='libopus-0.dll' Guid=e66a9db4-1e34-4160-9f75-31209cccc922>
-                            <File Id='libopus-0.dll' Source='$(var.CargoTargetBinDir)\libopus-0.dll' KeyPath='yes'/>
-                        </Component>
-                        <Component Id='libopusfile-0.dll' Guid='cc57ebdc-0662-449f-9ff0-3412b564375e'>
-                            <File Id='libopusfile-0.dll' Source='$(var.CargoTargetBinDir)\libopusfile-0.dll' KeyPath='yes'/>
-                        </Component>
-                        <Component Id='libpng16-16.dll' Guid='363d6c90-d1a4-4a3b-8792-0de6625b7369'>
-                            <File Id='libpng16-16.dll' Source='$(var.CargoTargetBinDir)\libpng16-16.dll' KeyPath='yes'/>
-                        </Component>
-                        <Component Id='libtiff-5.dll' Guid='df506b22-3de3-431e-953f-84557b019a83'>
-                            <File Id='libtiff-5.dll' Source='$(var.CargoTargetBinDir)\libtiff-5.dll' KeyPath='yes'/>
-                        </Component>
-                        <Component Id='libvorbis-0.dll' Guid='2c0bef62-1998-4864-96ba-049e096b0658'>
-                            <File Id='libvorbis-0.dll' Source='$(var.CargoTargetBinDir)\libvorbis-0.dll' KeyPath='yes'/>
-                        </Component>
-                        <Component Id='libvorbisfile-3.dll' Guid=a18d5d80-d51b-4a6a-a5a7-ade41f8d57d8>
-                            <File Id='libvorbisfile-3.dll' Source='$(var.CargoTargetBinDir)\libvorbisfile-3.dll' KeyPath='yes'/>
-                        </Component>
-                        <Component Id='libwebp-7.dll' Guid='2b78de86-61b2-4ed9-a4ed-5d0a1a895fa6'>
-                            <File Id='libwebp-7.dll' Source='$(var.CargoTargetBinDir)\libwebp-7.dll' KeyPath='yes'/>
-                        </Component>
-                        <Component Id='SDL2.dll' Guid=ac2a23f5-a17b-4ec7-ae3c-98b079d665b5>
-                            <File Id='SDL2.dll' Source='$(var.CargoTargetBinDir)\SDL2.dll' KeyPath='yes'/>
-                        </Component>
-                        <Component Id='SDL2_gfx.dll' Guid='5cc85256-0b03-4ae8-92ad-8442ad36485b'>
-                            <File Id='SDL2_gfx.dll' Source='$(var.CargoTargetBinDir)\SDL2_gfx.dll' KeyPath='yes'/>
-                        </Component>
-                        <Component Id='SDL2_image.dll' Guid='20dc9c0b-5767-4548-9bf6-096f921e45f6'>
-                            <File Id='SDL2_image.dll' Source='$(var.CargoTargetBinDir)\SDL2_image.dll' KeyPath='yes'/>
-                        </Component>
-                        <Component Id='SDL2_mixer.dll' Guid='61cff165-790d-4084-9db6-99a5ec5a8930'>
-                            <File Id='SDL2_mixer.dll' Source='$(var.CargoTargetBinDir)\SDL2_mixer.dll' KeyPath='yes'/>
-                        </Component>
-                        <Component Id='SDL2_ttf.d' Guid='871F2130-A8B3-4B28-9C5B-3D35174EF913'>
-                            <File Id='SDL2_ttf.d' Source='$(var.CargoTargetBinDir)\SDL2_ttf.d' KeyPath='yes'/>
-                        </Component>
-                    </Directory>
                 </Directory>
             </Directory>
         </Directory>
 
         <Feature
-            Id='Binaries'
+            Id='Application'
             Title='Application'
-            Description='Installs all binaries and the license.'
+            Description='Installs the [ProductName] executable and SDL2 dependencies.'
             Level='1'
             ConfigurableDirectory='APPLICATIONFOLDER'
             AllowAdvertise='no'
             Display='expand'
             Absent='disallow'>
-            
-            <!--
-              Uncomment the following `ComponentRef` tag to add the license
-              sidecar file to the installer.
-            -->
-            <!--<ComponentRef Id='License'/>-->
 
-            <ComponentRef Id='binary0'/>
+            <ComponentRef Id='TetaNES.exe'/>
+            <ComponentRef Id='libFLAC_8.dll'/>
+            <ComponentRef Id='SDL2.lib'/>
+            <ComponentRef Id='SDL2_gfx.lib'/>
+            <ComponentRef Id='SDL2_image.lib'/>
+            <ComponentRef Id='SDL2_mixer.lib'/>
+            <ComponentRef Id='SDL2_ttf.lib'/>
+            <ComponentRef Id='SDL2main.lib'/>
+            <ComponentRef Id='SDL2test.lib'/>
+            <ComponentRef Id='libjpeg_9.dll'/>
+            <ComponentRef Id='libmodplug_1.dll'/>
+            <ComponentRef Id='libmpg123_0.dll'/>
+            <ComponentRef Id='libogg_0.dll'/>
+            <ComponentRef Id='libopus_0.dll'/>
+            <ComponentRef Id='libopusfile_0.dll'/>
+            <ComponentRef Id='libpng16_16.dll'/>
+            <ComponentRef Id='libtiff_5.dll'/>
+            <ComponentRef Id='libvorbis_0.dll'/>
+            <ComponentRef Id='libvorbisfile_3.dll'/>
+            <ComponentRef Id='libwebp_7.dll'/>
+            <ComponentRef Id='SDL2.dll'/>
+            <ComponentRef Id='SDL2_gfx.dll'/>
+            <ComponentRef Id='SDL2_image.dll'/>
+            <ComponentRef Id='SDL2_mixer.dll'/>
+            <ComponentRef Id='SDL2_ttf.d'/>
 
             <Feature
                 Id='Environment'
                 Title='PATH Environment Variable'
-                Description='Add the install location of the [ProductName] executable to the PATH system environment variable. This allows the [ProductName] executable to be called from any location.'
+                Description='Add the install location of [ProductName] to the PATH system environment variable. This allows [ProductName] to be called from any location.'
                 Level='1'
                 Absent='allow'>
                 <ComponentRef Id='Path'/>
@@ -234,67 +230,25 @@
         </Feature>
 
         <SetProperty Id='ARPINSTALLLOCATION' Value='[APPLICATIONFOLDER]' After='CostFinalize'/>
+        <Property Id='WIXUI_INSTALLDIR' Value='APPLICATIONFOLDER' />
 
-        
-        <!--
-          Uncomment the following `Icon` and `Property` tags to change the product icon.
-
-          The product icon is the graphic that appears in the Add/Remove
-          Programs control panel for the application.
-        -->
-        <!--<Icon Id='ProductICO' SourceFile='wix\Product.ico'/>-->
-        <!--<Property Id='ARPPRODUCTICON' Value='ProductICO' />-->
-
+        <Icon Id='ProductICO' SourceFile='.\assets\tetanes_icon.ico'/>
+        <Property Id='ARPPRODUCTICON' Value='ProductICO' />
         <Property Id='ARPHELPLINK' Value='https://docs.rs/tetanes'/>
-        
-        <UI>
-            <UIRef Id='WixUI_FeatureTree'/>
-            
-            <!--
-              Enabling the EULA dialog in the installer is a three step process:
-
-                1. Comment out or remove the two `Publish` tags that follow the
-                   `WixVariable` tag.
-                2. Uncomment the `<WixVariable Id='WixUILicenseRtf' Value='Path\to\Eula.rft'>` tag futher down
-                3. Replace the `Value` attribute of the `WixVariable` tag with
-                   the path to a RTF file that will be used as the EULA and
-                   displayed in the license agreement dialog.
-            -->
-            <Publish Dialog='WelcomeDlg' Control='Next' Event='NewDialog' Value='CustomizeDlg' Order='99'>1</Publish>
-            <Publish Dialog='CustomizeDlg' Control='Back' Event='NewDialog' Value='WelcomeDlg' Order='99'>1</Publish>
+        <!-- The banner BMP dimensions are 493 x 58 pixels. -->
+        <WixVariable Id='WixUIBannerBmp' Value='.\assets\tetanes_banner.bmp'/>
+        <!-- The dialog BMP dimensions are 493 x 312 pixels. -->
+        <WixVariable Id='WixUIDialogBmp' Value='.\assets\tetanes_dialog.bmp'/>
 
+        <UI>
+            <UIRef Id='WixUI_InstallDir'/>
+            <Publish Dialog='WelcomeDlg' Control='Next' Event='NewDialog' Value='InstallDirDlg' Order='99'>1</Publish>
+            <Publish Dialog='ExitDialog' Control='Finish' Event='DoAction' Value='LaunchApplication' Order='99'>WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed</Publish>
         </UI>
-
-        
-        <!--
-          Enabling the EULA dialog in the installer requires uncommenting
-          the following `WixUILicenseRTF` tag and changing the `Value`
-          attribute.
-        -->
-        <!-- <WixVariable Id='WixUILicenseRtf' Value='Relative\Path\to\Eula.rtf'/> -->
-
-        
-        <!--
-          Uncomment the next `WixVariable` tag to customize the installer's
-          Graphical User Interface (GUI) and add a custom banner image across
-          the top of each screen. See the WiX Toolset documentation for details
-          about customization.
-
-          The banner BMP dimensions are 493 x 58 pixels.
-        -->
-        <!--<WixVariable Id='WixUIBannerBmp' Value='wix\Banner.bmp'/>-->
-
-        
-        <!--
-          Uncomment the next `WixVariable` tag to customize the installer's
-          Graphical User Interface (GUI) and add a custom image to the first
-          dialog, or screen. See the WiX Toolset documentation for details about
-          customization.
-
-          The dialog BMP dimensions are 493 x 312 pixels.
-        -->
-        <!--<WixVariable Id='WixUIDialogBmp' Value='wix\Dialog.bmp'/>-->
-
+        <Property Id='WIXUI_EXITDIALOGOPTIONALTEXT' Value='Have fun gaming!' />
+        <Property Id='WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT' Value='Launch TetaNES' />
+        <Property Id='WixShellExecTarget' Value='[#TetaNES.exe]' />
+        <CustomAction Id='LaunchApplication' BinaryKey='WixCA' DllEntry='WixShellExec' Impersonate='yes' />
     </Product>
 
 </Wix>