add bgm preview to the themeplaza browser

and prevent some errors
Move load_audio into loading.c for consistency
2026-01-24 16:52:43 -05:00 · 2018-05-10 13:53:51 +02:00 · 2018-05-10 07:40:28 -04:00 · 2018-05-10 06:49:03 -04:00 · 2018-05-09 22:26:39 -04:00 · 2018-05-09 00:22:34 +02:00
42 changed files with 1989 additions and 3673 deletions
--- a/.flask/banner.t3x
+++ b/.flask/banner.t3x
--- a/.flask/icon.t3x
+++ b/.flask/icon.t3x
--- a/.flask/meta.json
+++ b/.flask/meta.json
@@ -0,0 +1,5 @@
+{
+	"user": "astronautlevel2",
+	"name": "Anemone3DS",
+	"description": "A theme and boot splash manager for the Nintendo 3DS console"
+}
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -0,0 +1,18 @@
+# Main Contributors
+* Alex Taber ([@astronautlevel2](https://github.com/astronautlevel2))
+* [@LiquidFenrir](https://github.com/LiquidFenrir)
+* Dawid Eckert ([@daedreth](https://github.com/daedreth))
+* Dylan G. ([@helloman892](https://github.com/helloman892))
+* Nils P. ([@ZetaDesigns](https://github.com/ZetaDesigns))
+* Matt Kenny ([@mattkenster](https://github.com/mattkenster))
+
+# Minor Contributors
+* Nic ([@Wizzrobes](https://github.com/Wizzrobes))
+* [@saibotu](https://github.com/saibotu)
+* Jeremy Postelnek ([@TurtleP](https://github.com/TurtleP))
+* [@FrozenChen](https://github.com/FrozenChen)
+* Luís Marques ([@luigoalma](https://github.com/luigoalma))
+* [@uyuiyu](https://github.com/uyuiyu)
+* Guillaume Gérard ([@GreatWizard](https://github.com/GreatWizard))
+* Joel ([@joel16](https://github.com/joel16))
+* [@thedax](https://github.com/thedax)
--- a/10
+++ b/10
@@ -12,13 +12,13 @@ include $(DEVKITARM)/3ds_rules
 # Your values.
 APP_TITLE           :=	Anemone3DS
 APP_DESCRIPTION     :=	A complete theming tool for the 3DS
-APP_AUTHOR          :=	astronautlevel and daedreth
+APP_AUTHOR          :=	Anemone3DS Team


 TARGET              :=	$(subst $e ,_,$(notdir $(APP_TITLE)))
 OUTDIR              :=	out
 BUILD               :=	build
-SOURCES             :=	source source/pp2d/pp2d source/minizip source/quirc
+SOURCES             :=	source source/pp2d/pp2d source/quirc
 INCLUDES            :=	include
 ROMFS               :=	romfs

@@ -55,7 +55,7 @@ CFLAGS	:=	-g -Wall -Wextra -O2 -mword-relocations \

 revision := $(shell git describe --tags --match v[0-9]* --abbrev=8 | sed 's/-[0-9]*-g/-/')

-CFLAGS	+=	$(INCLUDE) -DARM11 -D_3DS -D_GNU_SOURCE -DVERSION="\"$(revision)\"" -DUSER_AGENT="\"$(APP_TITLE)/$(revision)\""
+CFLAGS	+=	$(INCLUDE) -DARM11 -D_3DS -D_GNU_SOURCE -DVERSION="\"$(revision)\"" -DUSER_AGENT="\"$(APP_TITLE)/$(revision)\"" -DAPP_TITLE="\"$(APP_TITLE)\""
 ifneq ($(strip $(CITRA_MODE)),)
 	CFLAGS += -DCITRA_MODE
 endif
@@ -65,13 +65,13 @@ CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
 ASFLAGS	:=	-g $(ARCH)
 LDFLAGS	=	-specs=3dsx.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)

-LIBS	:= -lcitro3d -lctrud -lm -lz
+LIBS	:= -lvorbisidec -logg -larchive -ljansson -lcitro3d -lctrud -lm -lz

 #---------------------------------------------------------------------------------
 # list of directories containing libraries, this must be the top level containing
 # include and lib
 #---------------------------------------------------------------------------------
-LIBDIRS	:= $(CTRULIB) $(DEVKITPRO)/portlibs/armv6k
+LIBDIRS	:= $(CTRULIB) $(PORTLIBS)


 #---------------------------------------------------------------------------------
--- a/README.md
+++ b/README.md
@@ -4,30 +4,34 @@ A Theme and Splashscreen Manager for the Nintendo 3DS, written in C.\
 To-do list here: https://trello.com/b/F1YSa1VK

 # Dependencies
- * zlib, which can be retrieved from the [3ds_portlibs](https://github.com/devkitPro/3ds_portlibs).
- * [makerom](https://github.com/profi200/Project_CTR) and [bannertool](https://github.com/Steveice10/buildtools), which can be retrieved from [SteveIce10's](https://github.com/Steveice10) buildtools repo. These must be added to your PATH.
- * ~~[pp2d](https://github.com/BernardoGiordano/pp2d), which is included in the repo if you do a git clone --recursive.~~ Due to circumstances surrounding the privacy settings on the pp2d repo, the source files are now included directly within the repo.
- * Git needs to be on your PATH, if building in a non-*nix environment.
+ * devkitPro, which can be installed following the instructions [here](https://devkitpro.org/wiki/Getting_Started).
+ * zlib, jansson, and libarchive, which can be retrieved from [devkitPro pacman](https://devkitpro.org/viewtopic.php?f=13&t=8702).
+ * A recent build of [makerom](https://github.com/profi200/Project_CTR) and the latest release of [bannertool](https://github.com/Steveice10/bannertool). These must be added to your PATH.  
+ A 64-bit Windows binary of makerom is available [here](https://hm892.s-ul.eu/U0Irkqih).
+ * ~~[pp2d](https://github.com/BernardoGiordano/pp2d), which is included in the repo if you do a git clone --recursive.~~  
+ Due to circumstances surrounding the privacy settings on the pp2d repo, the source files are now included directly within the repo.
+ * Git needs to be on your PATH (this is usually only manual under Windows).
+
 # Building
-First of all, make sure devkitPRO is properly installed and added to the PATH.
-After that, open the directory you want to clone the repo into, and type: `git clone https://github.com/astronautlevel2/Anemone3DS/ --recursive`.
-Instructions for installing zlib can be found on the [3ds_portlibs repo](https://github.com/devkitPro/3ds_portlibs) (its easy, just run `make` and `make install-zlib`). After also adding [makerom](https://github.com/profi200/Project_CTR) and [bannertool](https://github.com/Steveice10/buildtools) to your PATH, just enter your directory and run `make`. All built files will be in `/out/`.
+First of all, make sure devkitPro is properly installed and added to your PATH.  
+After that, open the directory you want to clone the repo into, and execute  
+`git clone https://github.com/astronautlevel2/Anemone3DS` (or any other cloning method).  
+To install zlib, jansson and libarchive, begin by following the instructions found above ([here](https://devkitpro.org/viewtopic.php?f=13&t=8702)) on the devkitPro forums, and then install the dkP packages `3ds-zlib`, `3ds-jansson` and `3ds-libarchive`.  
+After also adding [makerom](https://github.com/profi200/Project_CTR) and [bannertool](https://github.com/Steveice10/buildtools) to your PATH, just enter your directory and run `make`. All built files will be in `/out/`.
+
 # License
 This project is licensed under the GNU GPLv3. See LICENSE.md for details. Additional terms 7b and 7c apply to this project.

 # Credits
-The following people contributed to Anemone3DS in some way. Without these people, Anemone3DS wouldn't exist, or wouldn't be as good as it is:
- * [Daedreth](https://github.com/daedreth), who wrote the initial implementation of theme installation code and SMDH parsing.
- * [LiquidFenrir](https://github.com/LiquidFenrir), who refactored a lot of my messy code and has been essential in development.
- * [Kenn (mattkenster)](https://github.com/mattkenster), for designing the GUI, a number of sprites used in the application, and drawing the banner and icon.
+The following people contributed to Anemone3DS in some way. Without these people, Anemone3DS wouldn't exist, or wouldn't be as good as it is: [CONTRIBUTORS.md](CONTRIBUTORS.md)

-Special thanks go to these people who, while not directly contributing, helped immensely:
+Special thanks go to these people who, whilst not directly contributing, helped immensely:
 * [Rinnegatamante](https://github.com/Rinnegatamante), whose code served as reference on theme installation.
 * [SteveIce10](https://github.com/SteveIce10), whose QR code in FBI was essential.
 * [BernardoGiordano](https://github.com/BernardoGiordano) for making pp2d, and being super responsive to feature requests and just general help.
 * [yellows8](https://github.com/yellows8) for his home menu extdump tool, which was invaluable in debugging.
 * the folks on #dev of Nintendo Homebrew, who helped with unicode shenanigans (especially [Stary2001](https://github.com/Stary2001), [Fenrir](https://github.com/FenrirWolf), and DanielKO).
- * the maintainers for all used libraries, including ctrulib, zlib, citro3d, pp2d, quirc and minizip.
+ * the maintainers for all used libraries, including but not limited to ctrulib, zlib, citro3d, pp2d, and quirc.
 * all the people who helped keep me going and motivated me to work. This includes, but is definitely not limited to:
 
   + The members of the [Nintendo Homebrew Discord](https://discord.gg/C29hYvh)
--- a/include/camera.h
+++ b/include/camera.h
@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2017 Alex Taber ("astronautlevel"), Dawid Eckert ("daedreth")
+*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -41,9 +41,8 @@ typedef struct {
    struct quirc* context;
 } qr_data;

-bool init_qr(EntryMode current_mode);
+bool init_qr(void);
 void exit_qr(qr_data *data);
 void take_picture(void);
-Result http_get(char *url, const char *path);

 #endif
--- a/include/colors.h
+++ b/include/colors.h
@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2017 Alex Taber ("astronautlevel"), Dawid Eckert ("daedreth")
+*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
--- a/include/common.h
+++ b/include/common.h
@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2017 Alex Taber ("astronautlevel"), Dawid Eckert ("daedreth")
+*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -33,8 +33,6 @@
 #include <stdlib.h>
 #include <string.h>

-#define ENTRIES_PER_SCREEN 4
-
 #define DEBUG(...) fprintf(stderr, __VA_ARGS__)
 #define POS() DEBUG("%s (line %d)...\n", __func__, __LINE__)

@@ -42,6 +40,8 @@
        POS(); \
        DEBUG(__VA_ARGS__)

+#define FASTSCROLL_WAIT 1.5e8
+
 typedef enum {
    MODE_THEMES = 0,
    MODE_SPLASHES,
@@ -50,15 +50,23 @@ typedef enum {
 } EntryMode;

 extern const char * main_paths[MODE_AMOUNT];
+extern const int entries_per_screen_v[MODE_AMOUNT];
+extern const int entries_per_screen_h[MODE_AMOUNT];
+extern const int entry_size[MODE_AMOUNT];
+extern bool quit;

 enum TextureID {
    TEXTURE_FONT_RESERVED = 0, // used by pp2d for the font
    TEXTURE_ARROW,
+    TEXTURE_ARROW_SIDE,
    TEXTURE_SHUFFLE,
    TEXTURE_INSTALLED,
    TEXTURE_PREVIEW_ICON,
+    TEXTURE_SORT,
    TEXTURE_DOWNLOAD,
-    TEXTURE_RELOAD,
+    TEXTURE_BROWSE,
+    TEXTURE_LIST,
+    TEXTURE_EXIT,
    TEXTURE_BATTERY_0,
    TEXTURE_BATTERY_1,
    TEXTURE_BATTERY_2,
@@ -68,10 +76,13 @@ enum TextureID {
    TEXTURE_BATTERY_CHARGE,
    TEXTURE_QR,
    TEXTURE_PREVIEW,
+    TEXTURE_REMOTE_PREVIEW,
    TEXTURE_SELECT_BUTTON,
    TEXTURE_START_BUTTON,

-    TEXTURE_ICON, // always the last
+    // always the last
+    TEXTURE_REMOTE_ICONS,
+    TEXTURE_ICON = TEXTURE_REMOTE_ICONS + 24, 
 };

 #endif
--- a/include/draw.h
+++ b/include/draw.h
@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2017 Alex Taber ("astronautlevel"), Dawid Eckert ("daedreth")
+*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -45,8 +45,14 @@ typedef enum {
    INSTALL_NO_BGM,

    INSTALL_DOWNLOAD,
+    INSTALL_CHECKING_DOWNLOAD,
    INSTALL_ENTRY_DELETE,

+    INSTALL_LOADING_REMOTE_THEMES,
+    INSTALL_LOADING_REMOTE_SPLASHES,
+    INSTALL_LOADING_REMOTE_PREVIEW,
+    INSTALL_LOADING_REMOTE_BGM,
+
    INSTALL_NONE,
 } InstallType;

@@ -84,11 +90,12 @@ void exit_screens(void);
 void throw_error(char* error, ErrorLevel level);
 bool draw_confirm(const char* conf_msg, Entry_List_s* list);

-void draw_preview(int preview_offset);
+void draw_preview(ssize_t previewID, int preview_offset);

 void draw_install(InstallType type);

 void draw_base_interface(void);
+void draw_grid_interface(Entry_List_s* list, Instructions_s instructions);
 void draw_interface(Entry_List_s* list, Instructions_s instructions);

 #endif
--- a/include/fs.h
+++ b/include/fs.h
@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2017 Alex Taber ("astronautlevel"), Dawid Eckert ("daedreth")
+*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -37,9 +37,10 @@ Result open_archives(void);
 Result close_archives(void);

 u32 file_to_buf(FS_Path path, FS_Archive archive, char** buf);
+u32 zip_memory_to_buf(char *file_name, void * zip_memory, size_t zip_size, char ** buf);
 u32 zip_file_to_buf(char *file_name, u16 *zip_path, char **buf);

-Result buf_to_file(u32 size, char *path, FS_Archive archive, char *buf);
-void remake_file(char *path, FS_Archive archive, u32 size);
+Result buf_to_file(u32 size, FS_Path path, FS_Archive archive, char *buf);
+void remake_file(FS_Path path, FS_Archive archive, u32 size);

 #endif
--- a/include/instructions.h
+++ b/include/instructions.h
@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2017 Alex Taber ("astronautlevel"), Dawid Eckert ("daedreth")
+*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -39,7 +39,7 @@ Instructions_s normal_instructions[MODE_AMOUNT] = {
                L"\uE001 Queue shuffle theme"
            },
            {
-                L"\uE002 Reload broken icons",
+                L"\uE002 Hold for more",
                L"\uE003 Preview theme"
            },
            {
@@ -60,7 +60,7 @@ Instructions_s normal_instructions[MODE_AMOUNT] = {
                L"\uE001 Delete installed splash"
            },
            {
-                L"\uE002 Reload broken icons",
+                L"\uE002 Hold for more",
                L"\uE003 Preview splash"
            },
            {
@@ -98,4 +98,51 @@ Instructions_s install_instructions = {
    }
 };

+Instructions_s extra_instructions[3] = {
+    {
+        .info_line = L"Release \uE002 to cancel or hold \uE006 and release \uE002 to sort",
+        .info_line_color = COLOR_WHITE,
+        .instructions = {
+            {
+                L"\uE079 Sort by name",
+                L"\uE07A Sort by author"
+            },
+            {
+                L"\uE07B Sort by filename",
+                NULL
+            },
+            {
+                NULL,
+                NULL
+            },
+            {
+                L"Exit",
+                NULL
+            }
+        }
+    },
+    {
+        .info_line = L"Release \uE002 to cancel or hold \uE006 and release \uE002 to do stuff",
+        .info_line_color = COLOR_WHITE,
+        .instructions = {
+            {
+                L"\uE079 Jump in the list",
+                L"\uE07A Reload broken icons"
+            },
+            {
+                L"\uE07B Browse ThemePlaza",
+                NULL,
+            },
+            {
+                L"\uE004 Sorting menu",
+                NULL
+            },
+            {
+                L"Exit",
+                NULL
+            }
+        }
+    },
+};
+
 #endif
--- a/include/loading.h
+++ b/include/loading.h
@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2017 Alex Taber ("astronautlevel"), Dawid Eckert ("daedreth")
+*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -28,6 +28,8 @@
 #define LOADING_H

 #include "common.h"
+#include "music.h"
+#include <jansson.h>

 enum ICON_IDS_OFFSET {
    ICONS_ABOVE = 0,
@@ -37,6 +39,14 @@ enum ICON_IDS_OFFSET {
    ICONS_OFFSET_AMOUNT,
 };

+typedef enum {
+    SORT_NONE,
+
+    SORT_NAME,
+    SORT_AUTHOR,
+    SORT_PATH,
+} SortMode;
+
 typedef struct {
    u8 _padding1[4 + 2 + 2];

@@ -62,6 +72,8 @@ typedef struct {

    bool in_shuffle;
    bool installed;
+
+    json_int_t tp_download_id;
 } Entry_s;

 typedef struct {
@@ -69,7 +81,7 @@ typedef struct {
    int entries_count;

    ssize_t texture_id_offset;
-    ssize_t icons_ids[ICONS_OFFSET_AMOUNT][ENTRIES_PER_SCREEN];
+    ssize_t * icons_ids;

    int previous_scroll;
    int scroll;
@@ -80,6 +92,16 @@ typedef struct {
    int shuffle_count;

    EntryMode mode;
+    int entries_per_screen_v;
+    int entries_per_screen_h;
+    int entries_loaded;
+    int entry_size;
+
+    SortMode current_sort;
+
+    json_int_t tp_current_page;
+    json_int_t tp_page_count;
+    char * tp_search;
 } Entry_List_s;

 typedef struct {
@@ -87,9 +109,14 @@ typedef struct {
    volatile bool run_thread;
 } Thread_Arg_s;

-void delete_entry(Entry_s entry);
-Result load_entries(const char * loading_path, Entry_List_s * list, EntryMode mode);
+void sort_by_name(Entry_List_s * list);
+void sort_by_author(Entry_List_s * list);
+void sort_by_filename(Entry_List_s * list);
+
+void delete_entry(Entry_s * entry, bool is_file);
+Result load_entries(const char * loading_path, Entry_List_s * list);
 bool load_preview(Entry_List_s list, int * preview_offset);
+Result load_audio(Entry_s, audio_s *);
 void load_icons_first(Entry_List_s * current_list, bool silent);
 void handle_scrolling(Entry_List_s * list);
 void load_icons_thread(void * void_arg);
--- a/include/music.h
+++ b/include/music.h
@@ -0,0 +1,52 @@
+/*
+*   This file is part of Anemone3DS
+*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
+*
+*   This program is free software: you can redistribute it and/or modify
+*   it under the terms of the GNU General Public License as published by
+*   the Free Software Foundation, either version 3 of the License, or
+*   (at your option) any later version.
+*
+*   This program is distributed in the hope that it will be useful,
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*   GNU General Public License for more details.
+*
+*   You should have received a copy of the GNU General Public License
+*   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+*   Additional Terms 7.b and 7.c of GPLv3 apply to this file:
+*       * Requiring preservation of specified reasonable legal notices or
+*         author attributions in that material or in the Appropriate Legal
+*         Notices displayed by works containing it.
+*       * Prohibiting misrepresentation of the origin of that material,
+*         or requiring that modified versions of such material be marked in
+*         reasonable ways as different from the original version.
+*/
+
+#ifndef MUSIC_H
+#define MUSIC_H
+
+#include "common.h"
+#include "fs.h"
+#include "unicode.h"
+
+#include <tremor/ivorbisfile.h>
+#include <tremor/ivorbiscodec.h>
+
+#define BUF_TO_READ 40960 // How much data should be buffered at a time
+
+typedef struct {
+    OggVorbis_File vf;
+    ndspWaveBuf wave_buf[2];
+    float mix[12];
+    u8 buf_pos;
+    long data_read;
+    volatile bool stop;
+    char *filebuf;
+    u32 filesize;
+} audio_s;
+
+void play_audio(audio_s *);
+
+#endif
--- a/include/remote.h
+++ b/include/remote.h
@@ -0,0 +1,55 @@
+/*
+*   This file is part of Anemone3DS
+*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
+*
+*   This program is free software: you can redistribute it and/or modify
+*   it under the terms of the GNU General Public License as published by
+*   the Free Software Foundation, either version 3 of the License, or
+*   (at your option) any later version.
+*
+*   This program is distributed in the hope that it will be useful,
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*   GNU General Public License for more details.
+*
+*   You should have received a copy of the GNU General Public License
+*   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+*   Additional Terms 7.b and 7.c of GPLv3 apply to this file:
+*       * Requiring preservation of specified reasonable legal notices or
+*         author attributions in that material or in the Appropriate Legal
+*         Notices displayed by works containing it.
+*       * Prohibiting misrepresentation of the origin of that material,
+*         or requiring that modified versions of such material be marked in
+*         reasonable ways as different from the original version.
+*/
+
+#ifndef REMOTE_H
+#define REMOTE_H
+
+#include "common.h"
+
+#define THEMEPLAZA_BASE_URL "https://themeplaza.eu"
+#define THEMEPLAZA_API_URL "/api/anemone/v1"
+#define THEMEPLAZA_BASE_API_URL THEMEPLAZA_BASE_URL  THEMEPLAZA_API_URL
+
+#define THEMEPLAZA_PAGE_FORMAT THEMEPLAZA_BASE_API_URL  "/list?page=%"  JSON_INTEGER_FORMAT  "&category=%i&query=%s"
+#define THEMEPLAZA_JSON_PAGE_COUNT   "pages"
+#define THEMEPLAZA_JSON_PAGE_IDS     "items"
+
+#define THEMEPLAZA_JSON_ERROR_MESSAGE             "message"
+#define THEMEPLAZA_JSON_ERROR_MESSAGE_NOT_FOUND   "No items found"
+
+
+#define THEMEPLAZA_DOWNLOAD_FORMAT   THEMEPLAZA_BASE_URL  "/download/%"  JSON_INTEGER_FORMAT
+#define THEMEPLAZA_PREVIEW_FORMAT    THEMEPLAZA_DOWNLOAD_FORMAT  "/preview"
+#define THEMEPLAZA_BGM_FORMAT        THEMEPLAZA_DOWNLOAD_FORMAT  "/bgm"
+#define THEMEPLAZA_ICON_FORMAT       THEMEPLAZA_DOWNLOAD_FORMAT  "/preview/icon"
+#define THEMEPLAZA_SMDH_FORMAT       THEMEPLAZA_DOWNLOAD_FORMAT  "/smdh"
+
+#define CACHE_PATH_FORMAT            "/3ds/"  APP_TITLE  "/cache/%"  JSON_INTEGER_FORMAT
+
+bool themeplaza_browser(EntryMode mode);
+u32 http_get(const char *url, char ** filename, char ** buf);
+
+#endif
--- a/include/splashes.h
+++ b/include/splashes.h
@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2017 Alex Taber ("astronautlevel"), Dawid Eckert ("daedreth")
+*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
--- a/include/themes.h
+++ b/include/themes.h
@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2017 Alex Taber ("astronautlevel"), Dawid Eckert ("daedreth")
+*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
--- a/include/unicode.h
+++ b/include/unicode.h
@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2017 Alex Taber ("astronautlevel"), Dawid Eckert ("daedreth")
+*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
--- a/meta/logo.bin
+++ b/meta/logo.bin
--- a/romfs/arrow_side.png
+++ b/romfs/arrow_side.png
--- a/romfs/browse.png
+++ b/romfs/browse.png
--- a/romfs/exit.png
+++ b/romfs/exit.png
--- a/romfs/list.png
+++ b/romfs/list.png
--- a/romfs/reload.png
+++ b/romfs/reload.png
--- a/romfs/sort.png
+++ b/romfs/sort.png
--- a/source/camera.c
+++ b/source/camera.c
@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2017 Alex Taber ("astronautlevel"), Dawid Eckert ("daedreth")
+*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -32,6 +32,10 @@
 #include "draw.h"
 #include "fs.h"
 #include "loading.h"
+#include "remote.h"
+
+#include <archive.h>
+#include <archive_entry.h>

 /*
 static u32 transfer_size;
@@ -138,7 +142,7 @@ bool start_capture_cam(qr_data *data)
    return true;
 }

-void update_qr(qr_data *data, EntryMode current_mode)
+void update_qr(qr_data *data)
 {
    hidScanInput();
    if (hidKeysDown() & (KEY_R | KEY_B | KEY_TOUCH)) {
@@ -194,14 +198,90 @@ void update_qr(qr_data *data, EntryMode current_mode)
        if (!quirc_decode(&code, &scan_data))
        {
            exit_qr(data);
-            http_get((char*)scan_data.payload, main_paths[current_mode]);
-            data->success = true;
+
+            draw_install(INSTALL_DOWNLOAD);
+            char * zip_buf = NULL;
+            char * filename = NULL;
+            u32 zip_size = http_get((char*)scan_data.payload, &filename, &zip_buf);
+
+            if(zip_size != 0)
+            {
+                draw_install(INSTALL_CHECKING_DOWNLOAD);
+
+                struct archive *a = archive_read_new();
+                archive_read_support_format_zip(a);
+
+                int r = archive_read_open_memory(a, zip_buf, zip_size);
+                archive_read_free(a);
+
+                if(r == ARCHIVE_OK)
+                {
+                    EntryMode mode = MODE_AMOUNT;
+
+                    char * buf = NULL;
+                    do {
+                        if(zip_memory_to_buf("body_LZ.bin", zip_buf, zip_size, &buf) != 0)
+                        {
+                            mode = MODE_THEMES;
+                            break;
+                        }
+
+                        free(buf);
+                        buf = NULL;
+                        if(zip_memory_to_buf("splash.bin", zip_buf, zip_size, &buf) != 0)
+                        {
+                            mode = MODE_SPLASHES;
+                            break;
+                        }
+
+                        free(buf);
+                        buf = NULL;
+                        if(zip_memory_to_buf("splashbottom.bin", zip_buf, zip_size, &buf) != 0)
+                        {
+                            mode = MODE_SPLASHES;
+                            break;
+                        }
+                    }
+                    while(false);
+
+                    free(buf);
+                    buf = NULL;
+
+                    if(mode != MODE_AMOUNT)
+                    {
+                        char path_to_file[0x107] = {0};
+                        sprintf(path_to_file, "%s%s", main_paths[mode], filename);
+                        char * extension = strrchr(path_to_file, '.');
+                        if (extension == NULL || strcmp(extension, ".zip"))
+                            strcat(path_to_file, ".zip");
+
+                        remake_file(fsMakePath(PATH_ASCII, path_to_file), ArchiveSD, zip_size);
+                        buf_to_file(zip_size, fsMakePath(PATH_ASCII, path_to_file), ArchiveSD, zip_buf);
+                        data->success = true;
+                    }
+                    else
+                    {
+                        throw_error("Zip downloaded is neither\na splash nor a theme.", ERROR_LEVEL_WARNING);
+                    }
+                }
+                else
+                {
+                    throw_error("File downloaded isn't a zip.", ERROR_LEVEL_WARNING);
+                }
+            }
+            else
+            {
+                throw_error("Download failed.", ERROR_LEVEL_WARNING);
+            }
+
+            free(filename);
+            free(zip_buf);
        }   
    }

 }

-bool init_qr(EntryMode current_mode)
+bool init_qr(void)
 {
    qr_data *data = calloc(1, sizeof(qr_data));
    data->capturing = false;
@@ -212,159 +292,8 @@ bool init_qr(EntryMode current_mode)
    data->camera_buffer = calloc(1, 400 * 240 * sizeof(u16));
    data->texture_buffer = calloc(1, 400 * 240 * sizeof(u32));

-    while (!data->finished) update_qr(data, current_mode);
+    while (!data->finished) update_qr(data);

    return (bool)data->success;
 }

-/*
-Putting this in camera because I'm too lazy to make a network.c
-This'll probably get refactored later
-*/
-Result http_get(char *url, const char *path)
-{
-    Result ret;
-    httpcContext context;
-    char *new_url = NULL;
-    u32 status_code;
-    u32 content_size = 0;
-    u32 read_size = 0;
-    u32 size = 0;
-    u8 *buf;
-    u8 *last_buf;
-
-    do {
-        ret = httpcOpenContext(&context, HTTPC_METHOD_GET, url, 1);
-        ret = httpcSetSSLOpt(&context, SSLCOPT_DisableVerify); // should let us do https
-        ret = httpcSetKeepAlive(&context, HTTPC_KEEPALIVE_ENABLED);
-        ret = httpcAddRequestHeaderField(&context, "User-Agent", USER_AGENT);
-        ret = httpcAddRequestHeaderField(&context, "Connection", "Keep-Alive");
-        draw_install(INSTALL_DOWNLOAD);
-
-        ret = httpcBeginRequest(&context);
-        if (ret != 0)
-        {
-            httpcCloseContext(&context);
-            if (new_url != NULL) free(new_url);
-            return ret;
-        }
-
-        ret = httpcGetResponseStatusCode(&context, &status_code);
-        if(ret!=0){
-            httpcCloseContext(&context);
-            if(new_url!=NULL) free(new_url);
-            return ret;
-        }
-
-        if ((status_code >= 301 && status_code <= 303) || (status_code >= 307 && status_code <= 308))
-        {
-            if (new_url == NULL) new_url = malloc(0x1000);
-            ret = httpcGetResponseHeader(&context, "Location", new_url, 0x1000);
-            url = new_url;
-            httpcCloseContext(&context);
-        }
-    } while ((status_code >= 301 && status_code <= 303) || (status_code >= 307 && status_code <= 308));
-
-    if (status_code != 200)
-    {
-        httpcCloseContext(&context);
-        if (new_url != NULL) free(new_url);
-        return ret;
-    }
-
-    ret = httpcGetDownloadSizeState(&context, NULL, &content_size);
-    if (ret != 0)
-    {
-        httpcCloseContext(&context);
-        if (new_url != NULL) free(new_url);
-        return ret;
-    }
-
-    buf = malloc(0x1000);
-    if (buf == NULL)
-    {
-        httpcCloseContext(&context);
-        free(new_url);
-        return -2;
-    }
-
-    char *content_disposition = malloc(1024);
-    ret = httpcGetResponseHeader(&context, "Content-Disposition", content_disposition, 1024);
-    if (ret != 0)
-    {
-        free(content_disposition);
-        free(new_url);
-        free(buf);
-        return ret;
-    }
-
-    char *filename;
-    filename = strtok(content_disposition, "\"");
-    filename = strtok(NULL, "\"");
-
-    char *illegal_characters = "\"?;:/\\+";
-    if(!filename)
-    {
-        free(content_disposition);
-        free(new_url);
-        free(buf);
-        throw_error("Target is not valid!", ERROR_LEVEL_WARNING);
-        return -1;
-    }
-    for (size_t i = 0; i < strlen(filename); i++)
-    {
-        for (size_t n = 0; n < strlen(illegal_characters); n++)
-        {
-            if (filename[i] == illegal_characters[n]) 
-            {
-                filename[i] = '-';
-            }
-        }
-    }
-
-    do {
-        ret = httpcDownloadData(&context, buf + size, 0x1000, &read_size);
-        size += read_size;
-
-        if (ret == (s32)HTTPC_RESULTCODE_DOWNLOADPENDING)
-        {
-            last_buf = buf;
-            buf = realloc(buf, size + 0x1000);
-            if (buf == NULL)
-            {
-                httpcCloseContext(&context);
-                free(content_disposition);
-                free(new_url);
-                free(last_buf);
-                return ret;
-            }
-        }
-    } while (ret == (s32)HTTPC_RESULTCODE_DOWNLOADPENDING);
-
-    last_buf = buf;
-    buf = realloc(buf, size);
-    if (buf == NULL)
-    {
-        httpcCloseContext(&context);
-        free(content_disposition);
-        free(new_url);
-        free(last_buf);
-        return -1;
-    }
-
-    char path_to_file[0x106] = {0};
-    strcpy(path_to_file, path);
-    strcat(path_to_file, filename);
-    char * extension = strrchr(path_to_file, '.');
-    if (extension == NULL || strcmp(extension, ".zip"))
-        strcat(path_to_file, ".zip");
-
-    remake_file(path_to_file, ArchiveSD, size);
-    buf_to_file(size, path_to_file, ArchiveSD, (char*)buf);
-
-    free(content_disposition);
-    free(new_url);
-    free(buf);
-
-    return 0;
-}
--- a/source/draw.c
+++ b/source/draw.c
@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2017 Alex Taber ("astronautlevel"), Dawid Eckert ("daedreth")
+*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -40,11 +40,15 @@ void init_screens(void)
    pp2d_set_screen_color(GFX_BOTTOM, COLOR_BACKGROUND);

    pp2d_load_texture_png(TEXTURE_ARROW, "romfs:/arrow.png");
+    pp2d_load_texture_png(TEXTURE_ARROW_SIDE, "romfs:/arrow_side.png");
    pp2d_load_texture_png(TEXTURE_SHUFFLE, "romfs:/shuffle.png");
    pp2d_load_texture_png(TEXTURE_INSTALLED, "romfs:/installed.png");
-    pp2d_load_texture_png(TEXTURE_RELOAD, "romfs:/reload.png");
    pp2d_load_texture_png(TEXTURE_PREVIEW_ICON, "romfs:/preview.png");
+    pp2d_load_texture_png(TEXTURE_SORT, "romfs:/sort.png");
    pp2d_load_texture_png(TEXTURE_DOWNLOAD, "romfs:/download.png");
+    pp2d_load_texture_png(TEXTURE_BROWSE, "romfs:/browse.png");
+    pp2d_load_texture_png(TEXTURE_LIST, "romfs:/list.png");
+    pp2d_load_texture_png(TEXTURE_EXIT, "romfs:/exit.png");
    pp2d_load_texture_png(TEXTURE_BATTERY_0, "romfs:/battery0.png");
    pp2d_load_texture_png(TEXTURE_BATTERY_1, "romfs:/battery1.png");
    pp2d_load_texture_png(TEXTURE_BATTERY_2, "romfs:/battery2.png");
@@ -169,12 +173,12 @@ bool draw_confirm(const char* conf_msg, Entry_List_s* list)
    return false;
 }

-void draw_preview(int preview_offset)
+void draw_preview(ssize_t previewID, int preview_offset)
 {
    pp2d_begin_draw(GFX_TOP, GFX_LEFT);
-    pp2d_draw_texture_part(TEXTURE_PREVIEW, 0, 0, preview_offset, 0, 400, 240);
+    pp2d_draw_texture_part(previewID, 0, 0, preview_offset, 0, 400, 240);
    pp2d_draw_on(GFX_BOTTOM, GFX_LEFT);
-    pp2d_draw_texture_part(TEXTURE_PREVIEW, 0, 0, 40 + preview_offset, 240, 320, 240);
+    pp2d_draw_texture_part(previewID, 0, 0, 40 + preview_offset, 240, 320, 240);
 }

 void draw_install(InstallType type)
@@ -191,6 +195,18 @@ void draw_install(InstallType type)
        case INSTALL_LOADING_ICONS:
            pp2d_draw_text_center(GFX_TOP, 120, 0.8, 0.8, COLOR_WHITE, "Loading icons, please wait...");
            break;
+        case INSTALL_LOADING_REMOTE_THEMES:
+            pp2d_draw_text_center(GFX_TOP, 120, 0.8, 0.8, COLOR_WHITE, "Downloading theme list, please wait...");
+            break;
+        case INSTALL_LOADING_REMOTE_SPLASHES:
+            pp2d_draw_text_center(GFX_TOP, 120, 0.8, 0.8, COLOR_WHITE, "Downloading splash list, please wait...");
+            break;
+        case INSTALL_LOADING_REMOTE_PREVIEW:
+            pp2d_draw_text_center(GFX_TOP, 120, 0.8, 0.8, COLOR_WHITE, "Downloading preview, please wait...");
+            break;
+        case INSTALL_LOADING_REMOTE_BGM:
+            pp2d_draw_text_center(GFX_TOP, 120, 0.8, 0.8, COLOR_WHITE, "Downloading BGM, please wait...");
+            break;
        case INSTALL_SINGLE:
            pp2d_draw_text_center(GFX_TOP, 120, 0.8, 0.8, COLOR_WHITE, "Installing a single theme...");
            break;
@@ -203,6 +219,9 @@ void draw_install(InstallType type)
        case INSTALL_DOWNLOAD:
            pp2d_draw_text_center(GFX_TOP, 120, 0.8, 0.8, COLOR_WHITE, "Downloading...");
            break;
+        case INSTALL_CHECKING_DOWNLOAD:
+            pp2d_draw_text_center(GFX_TOP, 120, 0.8, 0.8, COLOR_WHITE, "Checking downloaded file...");
+            break;
        case INSTALL_SPLASH:
            pp2d_draw_text_center(GFX_TOP, 120, 0.8, 0.8, COLOR_WHITE, "Installing a splash...");
            break;
@@ -257,6 +276,109 @@ static void draw_instructions(Instructions_s instructions)
    }
 }

+static void draw_entry_info(Entry_s * entry)
+{
+    float wrap = 363;
+
+    wchar_t author[0x41] = {0};
+    utf16_to_utf32((u32*)author, entry->author, 0x40);
+    pp2d_draw_text(20, 35, 0.5, 0.5, COLOR_WHITE, "By ");
+    pp2d_draw_wtext_wrap(40, 35, 0.5, 0.5, COLOR_WHITE, wrap, author);
+
+    wchar_t title[0x41] = {0};
+    utf16_to_utf32((u32*)title, entry->name, 0x40);
+    pp2d_draw_wtext_wrap(20, 50, 0.7, 0.7, COLOR_WHITE, wrap, title);
+
+    int width = (int)pp2d_get_wtext_width(title, 0.7, 0.7);
+    int height = (int)pp2d_get_wtext_height(title, 0.7, 0.7);
+    int count = ((width - (width % (int)wrap))/wrap) + 1;
+
+    wchar_t description[0x81] = {0};
+    utf16_to_utf32((u32*)description, entry->desc, 0x80);
+    pp2d_draw_wtext_wrap(20, 50+count*height, 0.5, 0.5, COLOR_WHITE, wrap, description);
+}
+
+void draw_grid_interface(Entry_List_s* list, Instructions_s instructions)
+{
+    draw_base_interface();
+    EntryMode current_mode = list->mode;
+
+    const char* mode_string[MODE_AMOUNT] = {
+        "ThemePlaza Theme mode",
+        "ThemePlaza Splash mode",
+    };
+
+    pp2d_draw_text_center(GFX_TOP, 4, 0.5, 0.5, COLOR_WHITE, mode_string[current_mode]);
+
+    draw_instructions(instructions);
+
+    int selected_entry = list->selected_entry;
+    Entry_s * current_entry = &list->entries[selected_entry];
+    draw_entry_info(current_entry);
+
+    pp2d_draw_on(GFX_BOTTOM, GFX_LEFT);
+
+    pp2d_draw_text(7, 3, 0.6, 0.6, COLOR_WHITE, "Search...");
+
+    pp2d_draw_texture_blend(TEXTURE_LIST, 320-96, 0, COLOR_WHITE);
+    pp2d_draw_texture_blend(TEXTURE_EXIT, 320-72, 0, COLOR_WHITE);
+    pp2d_draw_texture_blend(TEXTURE_PREVIEW_ICON, 320-48, 0, COLOR_WHITE);
+    pp2d_draw_textf(320-24+2.5, -3, 1, 1, COLOR_WHITE, "%c", mode_string[!list->mode][11]);
+
+    pp2d_draw_texture(TEXTURE_ARROW_SIDE, 3, 114);
+    pp2d_draw_texture_flip(TEXTURE_ARROW_SIDE, 308, 114, HORIZONTAL);
+
+    for(int i = list->scroll; i < (list->entries_loaded + list->scroll); i++)
+    {
+        if(i >= list->entries_count) break;
+
+        current_entry = &list->entries[i];
+
+        wchar_t name[0x41] = {0};
+        utf16_to_utf32((u32*)name, current_entry->name, 0x40);
+
+        int vertical_offset = 0;
+        int horizontal_offset = i - list->scroll;
+        vertical_offset = horizontal_offset/list->entries_per_screen_h;
+        horizontal_offset %= list->entries_per_screen_h;
+
+        horizontal_offset *= list->entry_size;
+        vertical_offset *= list->entry_size;
+        vertical_offset += 24;
+        horizontal_offset += 16;
+
+        if(!current_entry->placeholder_color)
+        {
+            ssize_t id = list->icons_ids[i];
+            pp2d_draw_texture(id, horizontal_offset, vertical_offset);
+        }
+        else
+            pp2d_draw_rectangle(horizontal_offset, vertical_offset, list->entry_size, list->entry_size, current_entry->placeholder_color);
+
+        if(i == selected_entry)
+        {
+            unsigned int border_width = 3;
+            pp2d_draw_rectangle(horizontal_offset, vertical_offset, border_width, list->entry_size, COLOR_CURSOR);
+            pp2d_draw_rectangle(horizontal_offset, vertical_offset, list->entry_size, border_width, COLOR_CURSOR);
+            pp2d_draw_rectangle(horizontal_offset, vertical_offset+list->entry_size-border_width, list->entry_size, border_width, COLOR_CURSOR);
+            pp2d_draw_rectangle(horizontal_offset+list->entry_size-border_width, vertical_offset, border_width, list->entry_size, COLOR_CURSOR);
+        }
+    }
+
+    char entries_count_str[0x20] = {0};
+    sprintf(entries_count_str, "/%"  JSON_INTEGER_FORMAT, list->tp_page_count);
+    float x = 316;
+    x -= pp2d_get_text_width(entries_count_str, 0.6, 0.6);
+    pp2d_draw_text(x, 219, 0.6, 0.6, COLOR_WHITE, entries_count_str);
+
+    char selected_entry_str[0x20] = {0};
+    sprintf(selected_entry_str, "%"  JSON_INTEGER_FORMAT, list->tp_current_page);
+    x -= pp2d_get_text_width(selected_entry_str, 0.6, 0.6);
+    pp2d_draw_text(x, 219, 0.6, 0.6, COLOR_WHITE, selected_entry_str);
+
+    pp2d_draw_text(176, 219, 0.6, 0.6, COLOR_WHITE, "Page:");
+}
+
 void draw_interface(Entry_List_s* list, Instructions_s instructions)
 {
    draw_base_interface();
@@ -287,86 +409,91 @@ void draw_interface(Entry_List_s* list, Instructions_s instructions)
        pp2d_texture_blend(COLOR_YELLOW);
        pp2d_texture_scale(1.25, 1.4);
        pp2d_texture_draw();
+
+        pp2d_draw_on(GFX_BOTTOM, GFX_LEFT);
+
+        pp2d_draw_texture_blend(TEXTURE_SORT, 320-144, 0, COLOR_WHITE);
+        pp2d_draw_texture_blend(TEXTURE_DOWNLOAD, 320-120, 0, COLOR_WHITE);
+        pp2d_draw_texture_blend(TEXTURE_BROWSE, 320-96, 0, COLOR_WHITE);
+        pp2d_draw_texture_blend(TEXTURE_EXIT, 320-72, 0, COLOR_WHITE);
+        pp2d_draw_texture_blend(TEXTURE_PREVIEW_ICON, 320-48, 0, COLOR_WHITE);
+        pp2d_draw_textf(320-24+2.5, -3, 1, 1, COLOR_WHITE, "%c", mode_string[!list->mode][0]);
+
        return;
    }

    draw_instructions(instructions);

    int selected_entry = list->selected_entry;
-    Entry_s current_entry = list->entries[selected_entry];
-
-    wchar_t title[0x41] = {0};
-    utf16_to_utf32((u32*)title, current_entry.name, 0x40);
-    pp2d_draw_wtext_wrap(20, 30, 0.7, 0.7, COLOR_WHITE, 380, title);
-
-    wchar_t author[0x41] = {0};
-    utf16_to_utf32((u32*)author, current_entry.author, 0x40);
-    pp2d_draw_text(20, 50, 0.5, 0.5, COLOR_WHITE, "By: ");
-    pp2d_draw_wtext_wrap(44, 50, 0.5, 0.5, COLOR_WHITE, 380, author);
-
-    wchar_t description[0x81] = {0};
-    utf16_to_utf32((u32*)description, current_entry.desc, 0x80);
-    pp2d_draw_wtext_wrap(20, 65, 0.5, 0.5, COLOR_WHITE, 363, description);
+    Entry_s * current_entry = &list->entries[selected_entry];
+    draw_entry_info(current_entry);

    pp2d_draw_on(GFX_BOTTOM, GFX_LEFT);

    switch(current_mode)
    {
        case MODE_THEMES:
-            pp2d_draw_textf(7, 3, 0.6, 0.6, list->shuffle_count <= 10 ? COLOR_WHITE : COLOR_RED, "Shuffle: %i/10", list->shuffle_count);
-            pp2d_draw_texture_blend(TEXTURE_SHUFFLE, 320-120, 0, COLOR_WHITE);
+            pp2d_draw_textf(7, 3, 0.6, 0.6, list->shuffle_count <= 10 && list->shuffle_count >= 2 ? COLOR_WHITE : COLOR_RED, "Shuffle: %i/10", list->shuffle_count);
            break;
        default:
            break;
    }

-    pp2d_draw_texture_blend(TEXTURE_RELOAD, 320-96, 0, COLOR_WHITE);
-    pp2d_draw_texture_blend(TEXTURE_PREVIEW_ICON, 320-72, 0, COLOR_WHITE);
-    pp2d_draw_texture_blend(TEXTURE_DOWNLOAD, 320-48, 0, COLOR_WHITE);
-    pp2d_draw_textf(320-24+2.5, -3, 1, 1, COLOR_WHITE, "%c", *mode_string[!list->mode]);
-
+    pp2d_draw_texture_blend(TEXTURE_SORT, 320-144, 0, COLOR_WHITE);
+    pp2d_draw_texture_blend(TEXTURE_DOWNLOAD, 320-120, 0, COLOR_WHITE);
+    pp2d_draw_texture_blend(TEXTURE_BROWSE, 320-96, 0, COLOR_WHITE);
+    pp2d_draw_texture_blend(TEXTURE_EXIT, 320-72, 0, COLOR_WHITE);
+    pp2d_draw_texture_blend(TEXTURE_PREVIEW_ICON, 320-48, 0, COLOR_WHITE);
+    pp2d_draw_textf(320-24+2.5, -3, 1, 1, COLOR_WHITE, "%c", mode_string[!list->mode][0]);

    // Show arrows if there are themes out of bounds
    //----------------------------------------------------------------
    if(list->scroll > 0)
-        pp2d_draw_texture(TEXTURE_ARROW, 155, 6);
-    if(list->scroll + ENTRIES_PER_SCREEN < list->entries_count)
-        pp2d_draw_texture_flip(TEXTURE_ARROW, 155, 224, VERTICAL);
+        pp2d_draw_texture(TEXTURE_ARROW, 152, 4);
+    if(list->scroll + list->entries_loaded < list->entries_count)
+        pp2d_draw_texture_flip(TEXTURE_ARROW, 152, 220, VERTICAL);

-    for(int i = list->scroll; i < (ENTRIES_PER_SCREEN + list->scroll); i++)
+    for(int i = list->scroll; i < (list->entries_loaded + list->scroll); i++)
    {
        if(i >= list->entries_count) break;

-        current_entry = list->entries[i];
+        current_entry = &list->entries[i];

        wchar_t name[0x41] = {0};
-        utf16_to_utf32((u32*)name, current_entry.name, 0x40);
+        utf16_to_utf32((u32*)name, current_entry->name, 0x40);
+
+        int vertical_offset = i - list->scroll;
+        int horizontal_offset = 0;
+        horizontal_offset *= list->entry_size;
+        vertical_offset *= list->entry_size;
+        vertical_offset += 24;

-        int vertical_offset = 48 * (i - list->scroll);
        u32 font_color = COLOR_WHITE;

-        if(i == list->selected_entry)
+        if(i == selected_entry)
        {
            font_color = COLOR_BLACK;
-            pp2d_draw_rectangle(0, 24 + vertical_offset, 320, 48, COLOR_CURSOR);
+            pp2d_draw_rectangle(0, vertical_offset, 320, list->entry_size, COLOR_CURSOR);
        }
-        pp2d_draw_wtext(54, 40 + vertical_offset, 0.55, 0.55, font_color, name);
-        if(!current_entry.placeholder_color)
+
+        pp2d_draw_wtext(list->entry_size+6, vertical_offset + 16, 0.55, 0.55, font_color, name);
+
+        if(current_entry->in_shuffle)
+            pp2d_draw_texture_blend(TEXTURE_SHUFFLE, 320-24-4, vertical_offset, font_color);
+        if(current_entry->installed)
+            pp2d_draw_texture_blend(TEXTURE_INSTALLED, 320-24-4, vertical_offset + 22, font_color);
+
+        if(!current_entry->placeholder_color)
        {
            ssize_t id = 0;
-            if(list->entries_count > ICONS_OFFSET_AMOUNT*ENTRIES_PER_SCREEN)
-                id = list->icons_ids[ICONS_VISIBLE][i - list->scroll];
+            if(list->entries_count > list->entries_loaded*ICONS_OFFSET_AMOUNT)
+                id = list->icons_ids[ICONS_VISIBLE*list->entries_loaded + (i - list->scroll)];
            else
-                id = ((size_t *)list->icons_ids)[i];
-            pp2d_draw_texture(id, 0, 24 + vertical_offset);
+                id = list->icons_ids[i];
+            pp2d_draw_texture(id, horizontal_offset, vertical_offset);
        }
        else
-            pp2d_draw_rectangle(0, 24 + vertical_offset, 48, 48, current_entry.placeholder_color);
-
-        if(current_entry.in_shuffle)
-            pp2d_draw_texture_blend(TEXTURE_SHUFFLE, 320-24-4, 24 + vertical_offset, font_color);
-        if(current_entry.installed)
-            pp2d_draw_texture_blend(TEXTURE_INSTALLED, 320-24-4, 24 + 22 + vertical_offset, font_color);
+            pp2d_draw_rectangle(horizontal_offset, vertical_offset, list->entry_size, list->entry_size, current_entry->placeholder_color);
    }

    char entries_count_str[0x20] = {0};
--- a/source/fs.c
+++ b/source/fs.c
@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2017 Alex Taber ("astronautlevel"), Dawid Eckert ("daedreth")
+*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -29,12 +29,8 @@
 #include "fs.h"
 #include "unicode.h"
 
-#include "minizip/unzip.h"
- 
-int filename_compare(__attribute__((unused)) unzFile file, const char *current_filename, const char *filename)
-{
-    return strcasecmp(current_filename, filename);
-}
+#include <archive.h>
+#include <archive_entry.h>
 
 Result open_archives(void)
 {
@@ -72,6 +68,9 @@ Result open_archives(void)

    FSUSER_CreateDirectory(ArchiveSD, fsMakePath(PATH_ASCII, "/Themes"), FS_ATTRIBUTE_DIRECTORY);
    FSUSER_CreateDirectory(ArchiveSD, fsMakePath(PATH_ASCII, "/Splashes"), FS_ATTRIBUTE_DIRECTORY);
+    FSUSER_CreateDirectory(ArchiveSD, fsMakePath(PATH_ASCII, "/3ds"), FS_ATTRIBUTE_DIRECTORY);
+    FSUSER_CreateDirectory(ArchiveSD, fsMakePath(PATH_ASCII, "/3ds/"  APP_TITLE), FS_ATTRIBUTE_DIRECTORY);
+    FSUSER_CreateDirectory(ArchiveSD, fsMakePath(PATH_ASCII, "/3ds/"  APP_TITLE  "/cache"), FS_ATTRIBUTE_DIRECTORY);
 
    u32 homeMenuPath[3] = {MEDIATYPE_SD, archive2, 0};
    home.type = PATH_BINARY;
@@ -120,61 +119,85 @@ u32 file_to_buf(FS_Path path, FS_Archive archive, char** buf)
    return (u32)size;
 }

+static u32 zip_to_buf(struct archive *a, char *file_name, char ** buf)
+{
+    struct archive_entry *entry;
+
+    bool found = false;
+    u64 file_size = 0;
+
+    while(!found && archive_read_next_header(a, &entry) == ARCHIVE_OK)
+    {
+        found = !strcasecmp(archive_entry_pathname(entry), file_name);
+    }
+
+    if(found)
+    {
+        file_size = archive_entry_size(entry);
+        *buf = calloc(file_size, sizeof(char));
+        archive_read_data(a, *buf, file_size);
+    }
+    else
+    {
+        DEBUG("Couldn't find file in zip\n");
+    }
+
+    archive_read_free(a);
+
+    return (u32)file_size;
+}
+
+u32 zip_memory_to_buf(char *file_name, void * zip_memory, size_t zip_size, char ** buf)
+{
+    struct archive *a = archive_read_new();
+    archive_read_support_format_zip(a);
+
+    int r = archive_read_open_memory(a, zip_memory, zip_size);
+    if(r != ARCHIVE_OK)
+    {
+        DEBUG("Invalid zip being opened from memory\n");
+        return 0;
+    }
+
+    return zip_to_buf(a, file_name, buf);
+}
+
 u32 zip_file_to_buf(char *file_name, u16 *zip_path, char **buf)
 {
    ssize_t len = strulen(zip_path, 0x106);
    char *path = calloc(sizeof(char), len*sizeof(u16));
    utf16_to_utf8((u8*)path, zip_path, len*sizeof(u16));

-    unzFile zip_handle = unzOpen(path);
-    free(path);
+    struct archive *a = archive_read_new();
+    archive_read_support_format_zip(a);

-    if(zip_handle == NULL)
+    int r = archive_read_open_filename(a, path, 0x4000);
+    if(r != ARCHIVE_OK)
    {
-        DEBUG("invalid zip being opened\n");
+        DEBUG("Invalid zip being opened\n");
        return 0;
    }

-    u32 file_size = 0;
-    int status = unzLocateFile(zip_handle, file_name, filename_compare);
-
-    if(status == UNZ_OK)
-    {
-        unz_file_info *file_info = calloc(1, sizeof(unz_file_info));
-        unzGetCurrentFileInfo(zip_handle, file_info, NULL, 0, NULL, 0, NULL, 0);
-        file_size = file_info->uncompressed_size;
-        free(file_info);
-        *buf = calloc(1, file_size);
-        unzOpenCurrentFile(zip_handle);
-        unzReadCurrentFile(zip_handle, *buf, file_size);
-        unzCloseCurrentFile(zip_handle);
-    }
-    else if(status == UNZ_END_OF_LIST_OF_FILE)
-        DEBUG("file not found in zip\n");
-    else
-        DEBUG("other zip error\n");
-
-    unzClose(zip_handle);
-    return file_size;
+    return zip_to_buf(a, file_name, buf);
 }

-Result buf_to_file(u32 size, char *path, FS_Archive archive, char *buf)
+Result buf_to_file(u32 size, FS_Path path, FS_Archive archive, char *buf)
 {
    Handle handle;
    Result res = 0;
-    if (R_FAILED(res = FSUSER_OpenFile(&handle, archive, fsMakePath(PATH_ASCII, path), FS_OPEN_WRITE, 0))) return res;
+    if (R_FAILED(res = FSUSER_OpenFile(&handle, archive, path, FS_OPEN_WRITE, 0))) return res;
    if (R_FAILED(res = FSFILE_Write(handle, NULL, 0, buf, size, FS_WRITE_FLUSH))) return res;
    if (R_FAILED(res = FSFILE_Close(handle))) return res;
    return 0;
 }
 
-void remake_file(char *path, FS_Archive archive, u32 size)
+void remake_file(FS_Path path, FS_Archive archive, u32 size)
 {
    Handle handle;
-    if (R_SUCCEEDED(FSUSER_OpenFile(&handle, archive, fsMakePath(PATH_ASCII, path), FS_OPEN_READ, 0)))
+    if (R_SUCCEEDED(FSUSER_OpenFile(&handle, archive, path, FS_OPEN_READ, 0)))
    {
        FSFILE_Close(handle);
-        FSUSER_DeleteFile(archive, fsMakePath(PATH_ASCII, path));
+        FSUSER_DeleteFile(archive, path);
    }
-    FSUSER_CreateFile(archive, fsMakePath(PATH_ASCII, path), 0, size);
+    FSUSER_CreateFile(archive, path, 0, size);
 }
--- a/source/loading.c
+++ b/source/loading.c
@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2017 Alex Taber ("astronautlevel"), Dawid Eckert ("daedreth")
+*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -28,14 +28,15 @@
 #include "pp2d/pp2d/pp2d.h"
 #include "fs.h"
 #include "unicode.h"
+#include "music.h"
 #include "draw.h"

-void delete_entry(Entry_s entry)
+void delete_entry(Entry_s * entry, bool is_file)
 {
-    if(entry.is_zip)
-        FSUSER_DeleteFile(ArchiveSD, fsMakePath(PATH_UTF16, entry.path));
+    if(is_file)
+        FSUSER_DeleteFile(ArchiveSD, fsMakePath(PATH_UTF16, entry->path));
    else
-        FSUSER_DeleteDirectoryRecursively(ArchiveSD, fsMakePath(PATH_UTF16, entry.path));
+        FSUSER_DeleteDirectoryRecursively(ArchiveSD, fsMakePath(PATH_UTF16, entry->path));
 }

 u32 load_data(char * filename, Entry_s entry, char ** buf)
@@ -104,25 +105,60 @@ static void load_smdh_icon(Entry_s entry, const ssize_t textureID)
    free(image);
 }

-static int compare_entries(const void * a, const void * b)
+typedef int (*sort_comparator)(const void *, const void *);
+static int compare_entries_by_name(const void * a, const void * b)
 {
    Entry_s *entry_a = (Entry_s *)a;
    Entry_s *entry_b = (Entry_s *)b;

    return memcmp(entry_a->name, entry_b->name, 0x40*sizeof(u16));
 }
-
-static void sort_list(Entry_List_s * list)
+static int compare_entries_by_author(const void * a, const void * b)
 {
-    qsort(list->entries, list->entries_count, sizeof(Entry_s), compare_entries); //alphabet sort
+    Entry_s *entry_a = (Entry_s *)a;
+    Entry_s *entry_b = (Entry_s *)b;
+
+    return memcmp(entry_a->author, entry_b->author, 0x40*sizeof(u16));
+}
+static int compare_entries_by_filename(const void * a, const void * b)
+{
+    Entry_s *entry_a = (Entry_s *)a;
+    Entry_s *entry_b = (Entry_s *)b;
+
+    return memcmp(entry_a->path, entry_b->path, 0x106*sizeof(u16));
 }

-Result load_entries(const char * loading_path, Entry_List_s * list, EntryMode mode)
+static void sort_list(Entry_List_s * list, sort_comparator compare_entries)
+{
+    if(list->entries != NULL && list->entries != NULL)
+        qsort(list->entries, list->entries_count, sizeof(Entry_s), compare_entries); //alphabet sort
+}
+
+void sort_by_name(Entry_List_s * list)
+{
+    sort_list(list, compare_entries_by_name);
+    list->current_sort = SORT_NAME;
+}
+void sort_by_author(Entry_List_s * list)
+{
+    sort_list(list, compare_entries_by_author);
+    list->current_sort = SORT_AUTHOR;
+}
+void sort_by_filename(Entry_List_s * list)
+{
+    sort_list(list, compare_entries_by_filename);
+    list->current_sort = SORT_PATH;
+}
+
+Result load_entries(const char * loading_path, Entry_List_s * list)
 {
    Handle dir_handle;
    Result res = FSUSER_OpenDirectory(&dir_handle, ArchiveSD, fsMakePath(PATH_ASCII, loading_path));
    if(R_FAILED(res))
+    {
+        DEBUG("Failed to open folder: %s\n", loading_path);
        return res;
+    }

    u32 entries_read = 1;

@@ -133,7 +169,7 @@ Result load_entries(const char * loading_path, Entry_List_s * list, EntryMode mo
        if(R_FAILED(res) || entries_read == 0)
            break;

-        if(!(dir_entry.attributes & FS_ATTRIBUTE_DIRECTORY) && strcmp(dir_entry.shortExt, "ZIP"))
+        if(!(dir_entry.attributes & FS_ATTRIBUTE_DIRECTORY) && strcmp(dir_entry.shortExt, "ZIP")) 
            continue;

        list->entries_count++;
@@ -143,6 +179,7 @@ Result load_entries(const char * loading_path, Entry_List_s * list, EntryMode mo
            free(list->entries);
            list->entries = NULL;
            res = -1;
+            DEBUG("break\n");
            break;
        }
        else
@@ -155,15 +192,11 @@ Result load_entries(const char * loading_path, Entry_List_s * list, EntryMode mo
        strucat(current_entry->path, dir_entry.name);

        current_entry->is_zip = !strcmp(dir_entry.shortExt, "ZIP");
-
        parse_smdh(current_entry, dir_entry.name);
    }

    FSDIR_Close(dir_handle);

-    sort_list(list);
-    list->mode = mode;
-
    return res;
 }

@@ -176,7 +209,7 @@ void load_icons_first(Entry_List_s * list, bool silent)

    int starti = 0, endi = 0;

-    if(list->entries_count <= ENTRIES_PER_SCREEN*ICONS_OFFSET_AMOUNT)
+    if(list->entries_count <= list->entries_loaded*ICONS_OFFSET_AMOUNT)
    {
        DEBUG("small load\n");
        // if the list is one that doesnt need swapping, load everything at once
@@ -186,14 +219,15 @@ void load_icons_first(Entry_List_s * list, bool silent)
    {
        DEBUG("extended load\n");
        // otherwise, load around to prepare for swapping
-        starti = list->scroll - ENTRIES_PER_SCREEN*ICONS_VISIBLE;
-        endi = starti + ENTRIES_PER_SCREEN*ICONS_OFFSET_AMOUNT;
+        starti = list->scroll - list->entries_loaded*ICONS_VISIBLE;
+        endi = starti + list->entries_loaded*ICONS_OFFSET_AMOUNT;
    }

-    ssize_t * icon_ids = (ssize_t *)list->icons_ids;
+    list->icons_ids = calloc(endi-starti, sizeof(ssize_t));
+
+    ssize_t * icons_ids = list->icons_ids;
    ssize_t id = list->texture_id_offset;

-    memset(icon_ids, 0, ENTRIES_PER_SCREEN*ICONS_OFFSET_AMOUNT*sizeof(ssize_t));
    for(int i = starti; i < endi; i++, id++)
    {
        int offset = i;
@@ -204,7 +238,8 @@ void load_icons_first(Entry_List_s * list, bool silent)

        Entry_s current_entry = list->entries[offset];
        load_smdh_icon(current_entry, id);
-        icon_ids[i-starti] = id;
+
+        icons_ids[i-starti] = id;
    }
 }

@@ -229,21 +264,21 @@ void handle_scrolling(Entry_List_s * list)
 {
    // Scroll the menu up or down if the selected theme is out of its bounds
    //----------------------------------------------------------------
-    if(list->entries_count > ENTRIES_PER_SCREEN)
+    if(list->entries_count > list->entries_loaded)
    {
        for(int i = 0; i < list->entries_count; i++)
        {
            int change = 0;

-            if(list->entries_count > ENTRIES_PER_SCREEN*2 && list->previous_scroll < ENTRIES_PER_SCREEN && list->selected_entry >= list->entries_count - ENTRIES_PER_SCREEN)
+            if(list->entries_count > list->entries_loaded*2 && list->previous_scroll < list->entries_loaded && list->selected_entry >= list->entries_count - list->entries_loaded)
            {
-                list->scroll = list->entries_count - ENTRIES_PER_SCREEN;
+                list->scroll = list->entries_count - list->entries_loaded;
            }
-            else if(list->entries_count > ENTRIES_PER_SCREEN*2 && list->selected_entry < ENTRIES_PER_SCREEN && list->previous_selected >= list->entries_count - ENTRIES_PER_SCREEN)
+            else if(list->entries_count > list->entries_loaded*2 && list->selected_entry < list->entries_loaded && list->previous_selected >= list->entries_count - list->entries_loaded)
            {
                list->scroll = 0;
            }
-            else if(list->selected_entry == list->previous_selected+1 && list->selected_entry == list->scroll+ENTRIES_PER_SCREEN)
+            else if(list->selected_entry == list->previous_selected+1 && list->selected_entry == list->scroll+list->entries_loaded)
            {
                change = 1;
            }
@@ -251,21 +286,21 @@ void handle_scrolling(Entry_List_s * list)
            {
                change = -1;
            }
-            else if(list->selected_entry == list->previous_selected+ENTRIES_PER_SCREEN || list->selected_entry >= list->scroll + ENTRIES_PER_SCREEN)
+            else if(list->selected_entry == list->previous_selected+list->entries_loaded || list->selected_entry >= list->scroll + list->entries_loaded)
            {
-                change = ENTRIES_PER_SCREEN;
+                change = list->entries_loaded;
            }
-            else if(list->selected_entry == list->previous_selected-ENTRIES_PER_SCREEN || list->selected_entry < list->scroll)
+            else if(list->selected_entry == list->previous_selected-list->entries_loaded || list->selected_entry < list->scroll)
            {
-                change = -ENTRIES_PER_SCREEN;
+                change = -list->entries_loaded;
            }

            list->scroll += change;

            if(list->scroll < 0)
                list->scroll = 0;
-            else if(list->scroll > list->entries_count - ENTRIES_PER_SCREEN)
-                list->scroll = list->entries_count - ENTRIES_PER_SCREEN;
+            else if(list->scroll > list->entries_count - list->entries_loaded)
+                list->scroll = list->entries_count - list->entries_loaded;

            if(!change)
                list->previous_selected = list->selected_entry;
@@ -283,13 +318,13 @@ static void load_icons(Entry_List_s * current_list)

    handle_scrolling(current_list);

-    if(current_list->entries_count <= ENTRIES_PER_SCREEN*ICONS_OFFSET_AMOUNT || current_list->previous_scroll == current_list->scroll)
+    if(current_list->entries_count <= current_list->entries_loaded*ICONS_OFFSET_AMOUNT || current_list->previous_scroll == current_list->scroll)
        return; // return if the list is one that doesnt need swapping, or if nothing changed

    #define SIGN(x) (x > 0 ? 1 : ((x < 0) ? -1 : 0))

    int delta = current_list->scroll - current_list->previous_scroll;
-    if(abs(delta) >= current_list->entries_count - ENTRIES_PER_SCREEN*(ICONS_OFFSET_AMOUNT-1))
+    if(abs(delta) >= current_list->entries_count - current_list->entries_loaded*(ICONS_OFFSET_AMOUNT-1))
        delta = -SIGN(delta) * (current_list->entries_count - abs(delta));

    int starti = current_list->scroll;
@@ -306,26 +341,26 @@ static void load_icons(Entry_List_s * current_list)
    ssize_t * ids = calloc(abs(delta), sizeof(ssize_t));

    #define FIRST(arr) arr[0]
-    #define LAST(arr) arr[ENTRIES_PER_SCREEN*ICONS_OFFSET_AMOUNT - 1]
+    #define LAST(arr) arr[current_list->entries_loaded*ICONS_OFFSET_AMOUNT - 1]

-    ssize_t * icons_ids = (ssize_t *)current_list->icons_ids;
+    ssize_t * icons_ids = current_list->icons_ids;

    for(int i = starti; i != endi; i++, ctr++)
    {
        ssize_t id = 0;
        int offset = i;

-        rotate(icons_ids, ICONS_OFFSET_AMOUNT*ENTRIES_PER_SCREEN, -1*SIGN(delta));
+        rotate(icons_ids, ICONS_OFFSET_AMOUNT*current_list->entries_loaded, -1*SIGN(delta));

        if(delta > 0)
        {
            id = LAST(icons_ids);
-            offset += ENTRIES_PER_SCREEN*ICONS_UNDER - delta;
+            offset += current_list->entries_loaded*ICONS_UNDER - delta;
        }
        else
        {
            id = FIRST(icons_ids);
-            offset -= ENTRIES_PER_SCREEN*ICONS_VISIBLE;
+            offset -= current_list->entries_loaded*ICONS_VISIBLE;
            i -= 2; //i-- twice to counter the i++, needed only for this case
        }

@@ -344,7 +379,11 @@ static void load_icons(Entry_List_s * current_list)

    svcSleepThread(1e6);
    for(int i = 0; i < abs(delta); i++)
-        load_smdh_icon(*entries[i], ids[i]);
+    {
+        Entry_s current_entry = *entries[i];
+        ssize_t id = ids[i];
+        load_smdh_icon(current_entry, id);
+    }

    free(entries);
    free(ids);
@@ -420,3 +459,44 @@ bool load_preview(Entry_List_s list, int * preview_offset)

    return ret;
 }
+
+// Initialize the audio struct
+Result load_audio(Entry_s entry, audio_s *audio) 
+{
+    audio->filesize = load_data("/bgm.ogg", entry, &audio->filebuf);
+
+    audio->mix[0] = audio->mix[1] = 1.0f; // Determines volume for the 12 (?) different outputs. See http://smealum.github.io/ctrulib/channel_8h.html#a30eb26f1972cc3ec28370263796c0444
+
+    ndspChnSetInterp(0, NDSP_INTERP_LINEAR); 
+    ndspChnSetRate(0, 44100);
+    ndspChnSetFormat(0, NDSP_FORMAT_STEREO_PCM16); // Tremor outputs ogg files in 16 bit PCM stereo
+    ndspChnSetMix(0, audio->mix); // See mix comment above
+
+    FILE *file = fmemopen(audio->filebuf, audio->filesize, "rb");
+    if(file != NULL) 
+    {
+        int e = ov_open(file, &audio->vf, NULL, 0);
+        if (e < 0) 
+        {
+            char error[50];
+            sprintf(error, "Vorbis: %d\n", e);
+            DEBUG(error);
+            return MAKERESULT(RL_FATAL, RS_INVALIDARG, RM_APPLICATION, RD_NO_DATA);
+        }
+
+        vorbis_info *vi = ov_info(&audio->vf, -1);
+        ndspChnSetRate(0, vi->rate);// Set sample rate to what's read from the ogg file
+
+        audio->wave_buf[0].nsamples = audio->wave_buf[1].nsamples = vi->rate / 4; // 4 bytes per sample, samples = rate (bytes) / 4
+        audio->wave_buf[0].status = audio->wave_buf[1].status = NDSP_WBUF_DONE; // Used in play to stop from writing to current buffer
+        audio->wave_buf[0].data_vaddr = linearAlloc(BUF_TO_READ); // Most vorbis packets should only be 4 KB at most (?) Possibly dangerous assumption
+        audio->wave_buf[1].data_vaddr = linearAlloc(BUF_TO_READ);
+        DEBUG("Success!");
+        return MAKERESULT(RL_SUCCESS, RS_SUCCESS, RM_APPLICATION, RD_SUCCESS);
+    } else {
+        free(audio->filebuf);
+        free(audio);
+        DEBUG("File not found!\n");
+        return MAKERESULT(RL_FATAL, RS_NOTFOUND, RM_APPLICATION, RD_NOT_FOUND);
+    }
+}
--- a/source/main.c
+++ b/source/main.c
@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2017 Alex Taber ("astronautlevel"), Dawid Eckert ("daedreth")
+*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -30,12 +30,14 @@
 #include "splashes.h"
 #include "draw.h"
 #include "camera.h"
+#include "music.h"
+#include "remote.h"
 #include "instructions.h"
 #include "pp2d/pp2d/pp2d.h"
 #include <time.h>

-#define FASTSCROLL_WAIT 1.5e8
-
+bool quit = false;
+audio_s * audio;
 static bool homebrew = false;
 static bool installed_themes = false;

@@ -56,6 +58,18 @@ const char * main_paths[MODE_AMOUNT] = {
    "/Themes/",
    "/Splashes/",
 };
+const int entries_per_screen_v[MODE_AMOUNT] = {
+    4,
+    4,
+};
+const int entries_per_screen_h[MODE_AMOUNT] = { //for themeplaza browser
+    6,
+    6,
+};
+const int entry_size[MODE_AMOUNT] = {
+    48,
+    48,
+};

 static void init_services(void)
 {
@@ -63,6 +77,7 @@ static void init_services(void)
    cfguInit();
    ptmuInit();
    acInit();
+    ndspInit();
    APT_GetAppCpuTimeLimit(&old_time_limit);
    APT_SetAppCpuTimeLimit(30);
    httpcInit(0);
@@ -83,16 +98,14 @@ static void exit_services(void)
    if (old_time_limit != UINT32_MAX) APT_SetAppCpuTimeLimit(old_time_limit);
    httpcExit();
    acExit();
+    ndspExit();
 }

 static void stop_install_check(void)
 {
    for(int i = 0; i < MODE_AMOUNT; i++)
    {
-        if(installCheckThreads_arg[i].run_thread)
-        {
-            installCheckThreads_arg[i].run_thread = false;
-        }
+        installCheckThreads_arg[i].run_thread = false;
    }
 }

@@ -115,6 +128,7 @@ void free_lists(void)
    {
        Entry_List_s * current_list = &lists[i];
        free(current_list->entries);
+        free(current_list->icons_ids);
        memset(current_list, 0, sizeof(Entry_List_s));
    }
    exit_thread();
@@ -140,6 +154,72 @@ void exit_function(bool power_pressed)
    }
 }

+static void start_thread(void)
+{
+    if(iconLoadingThread_arg.run_thread)
+    {
+        DEBUG("starting thread\n");
+        iconLoadingThread = threadCreate(load_icons_thread, &iconLoadingThread_arg, __stacksize__, 0x38, -2, false);
+    }
+}
+
+static void load_lists(Entry_List_s * lists)
+{
+    ssize_t texture_id_offset = TEXTURE_ICON;
+
+    free_lists();
+    for(int i = 0; i < MODE_AMOUNT; i++)
+    {
+        InstallType loading_screen = INSTALL_NONE;
+        if(i == MODE_THEMES)
+            loading_screen = INSTALL_LOADING_THEMES;
+        else if(i == MODE_SPLASHES)
+            loading_screen = INSTALL_LOADING_SPLASHES;
+
+        draw_install(loading_screen);
+        draw_install(loading_screen);
+
+        Entry_List_s * current_list = &lists[i];
+        current_list->mode = i;
+        current_list->entries_per_screen_v = entries_per_screen_v[i];
+        current_list->entries_per_screen_h = 1;
+        current_list->entries_loaded = current_list->entries_per_screen_v * current_list->entries_per_screen_h;
+        current_list->entry_size = entry_size[i];
+        Result res = load_entries(main_paths[i], current_list);
+        if(R_SUCCEEDED(res))
+        {
+            if(current_list->entries_count > current_list->entries_loaded*ICONS_OFFSET_AMOUNT)
+                iconLoadingThread_arg.run_thread = true;
+
+            sort_by_name(current_list);
+
+            DEBUG("total: %i\n", current_list->entries_count);
+
+            current_list->texture_id_offset = texture_id_offset;
+            load_icons_first(current_list, false);
+
+            texture_id_offset += current_list->entries_loaded*ICONS_OFFSET_AMOUNT;
+
+            void (*install_check_function)(void*) = NULL;
+            if(i == MODE_THEMES)
+                install_check_function = themes_check_installed;
+            else if(i == MODE_SPLASHES)
+                install_check_function = splash_check_installed;
+
+            Thread_Arg_s * current_arg = &installCheckThreads_arg[i];
+            current_arg->run_thread = true;
+            current_arg->thread_arg = (void**)current_list;
+
+            if(install_check_function != NULL)
+            {
+                installCheckThreads[i] = threadCreate(install_check_function, current_arg, __stacksize__, 0x3f, -2, true);
+                svcSleepThread(1e8);
+            }
+        }
+    }
+    start_thread();
+}
+
 static SwkbdCallbackResult jump_menu_callback(void* entries_count, const char** ppMessage, const char* text, size_t textlen)
 {
    int typed_value = atoi(text);
@@ -185,8 +265,8 @@ static void jump_menu(Entry_List_s * list)
    {
        list->selected_entry = atoi(numbuf) - 1;
        list->scroll = list->selected_entry;
-        if(list->scroll >= list->entries_count - ENTRIES_PER_SCREEN)
-            list->scroll = list->entries_count - ENTRIES_PER_SCREEN - 1;
+        if(list->scroll >= list->entries_count - list->entries_loaded)
+            list->scroll = list->entries_count - list->entries_loaded - 1;
    }
 }

@@ -194,66 +274,13 @@ static void change_selected(Entry_List_s * list, int change_value)
 {
    if(abs(change_value) >= list->entries_count) return;

-    list->selected_entry += change_value;
-    if(list->selected_entry < 0)
-        list->selected_entry += list->entries_count;
-    list->selected_entry %= list->entries_count;
-}
+    int newval = list->selected_entry + change_value;

-static void start_thread(void)
-{
-    if(iconLoadingThread_arg.run_thread)
-    {
-        DEBUG("starting thread\n");
-        iconLoadingThread = threadCreate(load_icons_thread, &iconLoadingThread_arg, __stacksize__, 0x38, -2, false);
-    }
-}
+    if(newval < 0)
+        newval += list->entries_count;
+    newval %= list->entries_count;

-static void load_lists(Entry_List_s * lists)
-{
-    ssize_t texture_id_offset = TEXTURE_ICON;
-
-    free_lists();
-    for(int i = 0; i < MODE_AMOUNT; i++)
-    {
-        InstallType loading_screen = INSTALL_NONE;
-        if(i == MODE_THEMES)
-            loading_screen = INSTALL_LOADING_THEMES;
-        else if(i == MODE_SPLASHES)
-            loading_screen = INSTALL_LOADING_SPLASHES;
-
-        draw_install(loading_screen);
-        draw_install(loading_screen);
-
-        Entry_List_s * current_list = &lists[i];
-        Result res = load_entries(main_paths[i], current_list, i);
-        if(R_SUCCEEDED(res))
-        {
-            if(current_list->entries_count > ENTRIES_PER_SCREEN*ICONS_OFFSET_AMOUNT)
-                iconLoadingThread_arg.run_thread = true;
-
-            DEBUG("total: %i\n", current_list->entries_count);
-
-            current_list->texture_id_offset = texture_id_offset;
-            load_icons_first(current_list, false);
-
-            texture_id_offset += ENTRIES_PER_SCREEN*ICONS_OFFSET_AMOUNT;
-
-            void (*install_check_function)(void*) = NULL;
-            if(i == MODE_THEMES)
-                install_check_function = themes_check_installed;
-            else if(i == MODE_SPLASHES)
-                install_check_function = splash_check_installed;
-
-            Thread_Arg_s * current_arg = &installCheckThreads_arg[i];
-            current_arg->run_thread = true;
-            current_arg->thread_arg = (void**)current_list;
-
-            installCheckThreads[i] = threadCreate(install_check_function, current_arg, __stacksize__, 0x3f, -2, true);
-            svcSleepThread(1e8);
-        }
-    }
-    start_thread();
+    list->selected_entry = newval;
 }

 static void toggle_shuffle(Entry_List_s * list)
@@ -283,6 +310,8 @@ int main(void)
    #ifndef CITRA_MODE
    if(R_SUCCEEDED(archive_result))
        load_lists(lists);
+    #else
+    load_lists(lists);
    #endif

    EntryMode current_mode = MODE_THEMES;
@@ -292,8 +321,7 @@ int main(void)

    bool qr_mode = false;
    bool install_mode = false;
-
-    bool quit = false;
+    bool extra_mode = false;

    while(aptMainLoop())
    {
@@ -322,9 +350,26 @@ int main(void)
        Instructions_s instructions = normal_instructions[current_mode];
        if(install_mode)
            instructions = install_instructions;
+        if(extra_mode)
+        {
+            int index = 1;
+            bool key_l = (kDown | kHeld) & KEY_L;
+            bool key_r = (kDown | kHeld) & KEY_R;
+            if(key_l ^ key_r)
+            {
+                if(key_l)
+                    index = 0;
+                // else if(key_r)  // uncomment when we use the right menu. we don't for now
+                    // index = 2;
+            }
+            instructions = extra_instructions[index];
+        }

        if(qr_mode) take_picture();
-        else if(preview_mode) draw_preview(preview_offset);
+        else if(preview_mode) 
+        {
+            draw_preview(TEXTURE_PREVIEW, preview_offset);
+        }
        else {
            if(!iconLoadingThread_arg.run_thread)
            {
@@ -345,7 +390,7 @@ int main(void)

        if(kDown & KEY_START) quit = true;

-        if(!install_mode)
+        if(!install_mode && !extra_mode)
        {
            if(!preview_mode && !qr_mode && kDown & KEY_L) //toggle between splashes and themes
            {
@@ -364,20 +409,22 @@ int main(void)
                    ACU_GetWifiStatus(&out);
                    if(out)
                    {
-
-                        if(init_qr(current_mode))
+                        if(init_qr())
                        {
                            load_lists(lists);
                        }
                    }
                    else
                    {
-                        throw_error("Please connect to Wi-Fi before scanning QRs", ERROR_LEVEL_WARNING);
+                        throw_error("Please connect to Wi-Fi before scanning QR codes", ERROR_LEVEL_WARNING);
                    }
                }
                else
                {
-                    throw_error("Your camera seems to have a problem, unable to scan QRs.", ERROR_LEVEL_WARNING);
+                    if(homebrew)
+                        throw_error("QR scanning doesnt work from the Homebrew\nLauncher, use the ThemePlaza browser instead.", ERROR_LEVEL_WARNING);
+                    else
+                        throw_error("Your camera seems to have a problem,\nunable to scan QR codes.", ERROR_LEVEL_WARNING);
                }

                continue;
@@ -386,20 +433,34 @@ int main(void)
            {
                toggle_preview:
                if(!preview_mode)
+                {
                    preview_mode = load_preview(*current_list, &preview_offset);
+                    if(current_mode == MODE_THEMES)
+                    {
+                        audio = calloc(1, sizeof(audio_s));
+                        load_audio(current_list->entries[current_list->selected_entry], audio);
+                        play_audio(audio);
+                    }
+                }
                else
+                {
                    preview_mode = false;
+                    if(current_mode == MODE_THEMES && audio)
+                        audio->stop = true;
+                }
                continue;
            }
            else if(preview_mode && kDown & (KEY_B | KEY_TOUCH))
            {
                preview_mode = false;
+                if(current_mode == MODE_THEMES && audio)
+                    audio->stop = true;
                continue;
            }
        }

        if(qr_mode || preview_mode || current_list->entries == NULL)
-            continue;
+            goto touch;

        int selected_entry = current_list->selected_entry;
        Entry_s * current_entry = &current_list->entries[selected_entry];
@@ -464,9 +525,9 @@ int main(void)
                    {
                        throw_error("You have too many themes selected.", ERROR_LEVEL_WARNING);
                    }
-                    else if(current_list->shuffle_count == 0)
+                    else if(current_list->shuffle_count < 2)
                    {
-                        throw_error("You don't have any themes selected.", ERROR_LEVEL_WARNING);
+                        throw_error("You don't have enough themes selected.", ERROR_LEVEL_WARNING);
                    }
                    else
                    {
@@ -493,6 +554,60 @@ int main(void)
            }
            continue;
        }
+        else if(extra_mode)
+        {
+            if(kUp & KEY_X)
+                extra_mode = false;
+            if(!extra_mode)
+            {
+                bool key_l = (kDown | kHeld) & KEY_L;
+                bool key_r = (kDown | kHeld) & KEY_R;
+                if(!(key_l ^ key_r))
+                {
+                    if((kDown | kHeld) & KEY_DLEFT)
+                    {
+                        browse_themeplaza:
+                        if(themeplaza_browser(current_mode))
+                        {
+                            current_mode = MODE_THEMES;
+                            load_lists(lists);
+                        }
+                    }
+                    else if((kDown | kHeld) & KEY_DUP)
+                    {
+                        jump:
+                        jump_menu(current_list);
+
+                    }
+                    else if((kDown | kHeld) & KEY_DDOWN)
+                    {
+                        load_icons_first(current_list, false);
+                    }
+                }
+                else if(key_l)
+                {
+                    if((kDown | kHeld) & KEY_DLEFT)
+                    {
+                        sort_path:
+                        sort_by_filename(current_list);
+                        load_icons_first(current_list, false);
+                    }
+                    else if(((kDown | kHeld)) & KEY_DUP)
+                    {
+                        sort_name:
+                        sort_by_name(current_list);
+                        load_icons_first(current_list, false);
+                    }
+                    else if(((kDown | kHeld)) & KEY_DDOWN)
+                    {
+                        sort_author:
+                        sort_by_author(current_list);
+                        load_icons_first(current_list, false);
+                    }
+                }
+            }
+            continue;
+        }

        // Actions

@@ -531,24 +646,14 @@ int main(void)
        }
        else if(kDown & KEY_X)
        {
-            switch(current_mode)
-            {
-                case MODE_THEMES:
-                    load_icons_first(current_list, false);
-                    break;
-                case MODE_SPLASHES:
-                    load_icons_first(current_list, false);
-                    break;
-                default:
-                    break;
-            }
+            extra_mode = true;
        }
        else if(kDown & KEY_SELECT)
        {
            if(draw_confirm("Are you sure you would like to delete this?", current_list))
            {
                draw_install(INSTALL_ENTRY_DELETE);
-                delete_entry(*current_entry);
+                delete_entry(current_entry, current_entry->is_zip);
                load_lists(lists);
            }
        }
@@ -565,11 +670,11 @@ int main(void)
        // Quick moving
        else if(kDown & KEY_LEFT)
        {
-            change_selected(current_list, -ENTRIES_PER_SCREEN);
+            change_selected(current_list, -current_list->entries_per_screen_v);
        }
        else if(kDown & KEY_RIGHT)
        {
-            change_selected(current_list, ENTRIES_PER_SCREEN);
+            change_selected(current_list, current_list->entries_per_screen_v);
        }

        // Fast scroll using circle pad
@@ -585,16 +690,17 @@ int main(void)
        }
        else if(kHeld & KEY_CPAD_LEFT)
        {
-            change_selected(current_list, -ENTRIES_PER_SCREEN);
+            change_selected(current_list, -current_list->entries_per_screen_v);
            svcSleepThread(FASTSCROLL_WAIT);
        }
        else if(kHeld & KEY_CPAD_RIGHT)
        {
-            change_selected(current_list, ENTRIES_PER_SCREEN);
+            change_selected(current_list, current_list->entries_per_screen_v);
            svcSleepThread(FASTSCROLL_WAIT);
        }

        // Movement using the touchscreen
+        touch:
        if((kDown | kHeld) & KEY_TOUCH)
        {
            touchPosition touch = {0};
@@ -612,51 +718,68 @@ int main(void)
            {
                if(y < 24)
                {
-                    if(BETWEEN(arrowStartX, x, arrowEndX) && current_list->scroll > 0)
+                    if(current_list->entries != NULL && BETWEEN(arrowStartX, x, arrowEndX) && current_list->scroll > 0)
                    {
-                        change_selected(current_list, -ENTRIES_PER_SCREEN);
+                        change_selected(current_list, -current_list->entries_per_screen_v);
+                    }
+                    else if(BETWEEN(320-144, x, 320-120))
+                    {
+                        switch(current_list->current_sort)
+                        {
+                            case SORT_NAME:
+                                goto sort_author;
+                                break;
+                            case SORT_AUTHOR:
+                                goto sort_path;
+                                break;
+                            case SORT_PATH:
+                                goto sort_name;
+                                break;
+                            default:
+                                break;
+                        }
+                    }
+                    else if(BETWEEN(320-120, x, 320-96))
+                    {
+                        goto enable_qr;
+                    }
+                    else if(BETWEEN(320-96, x, 320-72))
+                    {
+                        goto browse_themeplaza;
+                    }
+                    else if(BETWEEN(320-72, x, 320-48))
+                    {
+                        quit = true;
+                    }
+                    else if(BETWEEN(320-48, x, 320-24))
+                    {
+                        goto toggle_preview;
                    }
                    else if(BETWEEN(320-24, x, 320))
                    {
                        goto switch_mode;
                    }
-                    else if(BETWEEN(320-48, x, 320-24))
-                    {
-                        goto enable_qr;
-                    }
-                    else if(BETWEEN(320-72, x, 320-48))
-                    {
-                        goto toggle_preview;
-                    }
-                    else if(BETWEEN(320-96, x, 320-72))
-                    {
-                        load_icons_first(current_list, false);
-                    }
-                    else if(BETWEEN(320-120, x, 320-96) && current_mode == MODE_THEMES)
-                    {
-                        toggle_shuffle(current_list);
-                    }
                }
                else if(y >= 216)
                {
-                    if(BETWEEN(arrowStartX, x, arrowEndX) && current_list->scroll < current_list->entries_count - ENTRIES_PER_SCREEN)
+                    if(current_list->entries != NULL && BETWEEN(arrowStartX, x, arrowEndX) && current_list->scroll < current_list->entries_count - current_list->entries_per_screen_v)
                    {
-                        change_selected(current_list, ENTRIES_PER_SCREEN);
+                        change_selected(current_list, current_list->entries_per_screen_v);
                    }
-                    else if(BETWEEN(176, x, 320))
+                    else if(current_list->entries != NULL && BETWEEN(176, x, 320))
                    {
-                        jump_menu(current_list);
+                        goto jump;
                    }
                }
            }
            else
            {
-                if(BETWEEN(24, y, 216))
+                if(current_list->entries != NULL && BETWEEN(24, y, 216))
                {
-                    for(int i = 0; i < ENTRIES_PER_SCREEN; i++)
+                    for(int i = 0; i < current_list->entries_loaded; i++)
                    {
-                        u16 miny = 24 + 48*i;
-                        u16 maxy = miny + 48;
+                        u16 miny = 24 + current_list->entry_size*i;
+                        u16 maxy = miny + current_list->entry_size;
                        if(BETWEEN(miny, y, maxy) && current_list->scroll + i < current_list->entries_count)
                        {
                            current_list->selected_entry = current_list->scroll + i;
--- a/source/minizip/crypt.h
+++ b/source/minizip/crypt.h
@@ -1,137 +0,0 @@
-/* crypt.h -- base code for traditional PKWARE encryption
-   Version 1.01e, February 12th, 2005
-
-   Copyright (C) 1998-2005 Gilles Vollant
-   Modifications for Info-ZIP crypting
-     Copyright (C) 2003 Terry Thorsen
-
-   This code is a modified version of crypting code in Info-ZIP distribution
-
-   Copyright (C) 1990-2000 Info-ZIP.  All rights reserved.
-
-   See the Info-ZIP LICENSE file version 2000-Apr-09 or later for terms of use
-   which also may be found at: ftp://ftp.info-zip.org/pub/infozip/license.html
-
-   The encryption/decryption parts of this source code (as opposed to the
-   non-echoing password parts) were originally written in Europe. The
-   whole source package can be freely distributed, including from the USA.
-   (Prior to January 2000, re-export from the US was a violation of US law.)
-
-   This encryption code is a direct transcription of the algorithm from
-   Roger Schlafly, described by Phil Katz in the file appnote.txt. This
-   file (appnote.txt) is distributed with the PKZIP program (even in the
-   version without encryption capabilities).
-
-   If you don't need crypting in your application, just define symbols
-   NOCRYPT and NOUNCRYPT.
-   
-   Mar 8th, 2016 - Lucio Cosmo 
-   Fixed support for 64bit builds for archives with "PKWARE" password.
-   Changed long, unsigned long, unsigned to unsigned int in 
-   access functions to crctables and pkeys
-
-*/
-
-#define CRC32(c, b) ((*(pcrc_32_tab+(((unsigned int)(c) ^ (b)) & 0xff))) ^ ((c) >> 8))
-
-/***********************************************************************
- * Return the next byte in the pseudo-random sequence
- */
-static int decrypt_byte(unsigned int* pkeys)
-{
-    unsigned temp;  /* POTENTIAL BUG:  temp*(temp^1) may overflow in an
-                     * unpredictable manner on 16-bit systems; not a problem
-                     * with any known compiler so far, though */
-
-    temp = ((unsigned int)(*(pkeys+2)) & 0xffff) | 2;
-    return (unsigned int)(((temp * (temp ^ 1)) >> 8) & 0xff);
-}
-
-/***********************************************************************
- * Update the encryption keys with the next byte of plain text
- */
-static int update_keys(unsigned int* pkeys,const unsigned int* pcrc_32_tab,int c)
-{
-    (*(pkeys+0)) = CRC32((*(pkeys+0)), c);
-    (*(pkeys+1)) += (*(pkeys+0)) & 0xff;
-    (*(pkeys+1)) = (*(pkeys+1)) * 134775813L + 1;
-    {
-        register int keyshift = (int)((*(pkeys+1)) >> 24);
-        (*(pkeys+2)) = CRC32((*(pkeys+2)), keyshift);
-    }
-    return c;
-}
-
-
-/***********************************************************************
- * Initialize the encryption keys and the random header according to
- * the given password.
- */
-static void init_keys(const char* passwd,unsigned int* pkeys,const unsigned int* pcrc_32_tab)
-{
-    *(pkeys+0) = 305419896L;
-    *(pkeys+1) = 591751049L;
-    *(pkeys+2) = 878082192L;
-    while (*passwd != 0)
-    {
-        update_keys(pkeys,pcrc_32_tab,(int)*passwd);
-        passwd++;
-    }
-}
-
-#define zdecode(pkeys,pcrc_32_tab,c) \
-    (update_keys(pkeys,pcrc_32_tab,c ^= decrypt_byte(pkeys)))
-
-#define zencode(pkeys,pcrc_32_tab,c,t) \
-    (t=decrypt_byte(pkeys), update_keys(pkeys,pcrc_32_tab,c), t^(c))
-
-#ifdef INCLUDECRYPTINGCODE_IFCRYPTALLOWED
-
-#define RAND_HEAD_LEN  12
-   /* "last resort" source for second part of crypt seed pattern */
-#  ifndef ZCR_SEED2
-#    define ZCR_SEED2 3141592654UL     /* use PI as default pattern */
-#  endif
-
-static int crypthead(const char* passwd,      /* password string */
-                     unsigned char* buf,      /* where to write header */
-                     int bufSize,
-                     unsigned int* pkeys,
-                     const unsigned int* pcrc_32_tab,
-                     unsigned int crcForCrypting)
-{
-    int n;                                  /* index in random header */
-    int t;                                  /* temporary */
-    int c;                                  /* random byte */
-    unsigned char header[RAND_HEAD_LEN-2];  /* random header */
-    static unsigned calls = 0;              /* ensure different random header each time */
-
-    if (bufSize < RAND_HEAD_LEN)
-        return 0;
-
-    /* First generate RAND_HEAD_LEN-2 random bytes. We encrypt the
-     * output of rand() to get less predictability, since rand() is
-     * often poorly implemented.
-     */
-    if (++calls == 1)
-    {
-        srand((unsigned)(time(NULL) ^ ZCR_SEED2));
-    }
-    init_keys(passwd, pkeys, pcrc_32_tab);
-    for (n = 0; n < RAND_HEAD_LEN-2; n++)
-    {
-        c = (rand() >> 7) & 0xff;
-        header[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, c, t);
-    }
-    /* Encrypt random header (last two bytes is high word of crc) */
-    init_keys(passwd, pkeys, pcrc_32_tab);
-    for (n = 0; n < RAND_HEAD_LEN-2; n++)
-    {
-        buf[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, header[n], t);
-    }
-    buf[n++] = (unsigned char)zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 16) & 0xff, t);
-    buf[n++] = (unsigned char)zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 24) & 0xff, t);
-    return n;
-}
-
-#endif
--- a/source/minizip/ioapi.c
+++ b/source/minizip/ioapi.c
@@ -1,380 +0,0 @@
-/* ioapi.h -- IO base function header for compress/uncompress .zip
-   part of the MiniZip project
-
-   Copyright (C) 1998-2010 Gilles Vollant
-     http://www.winimage.com/zLibDll/minizip.html
-   Modifications for Zip64 support
-     Copyright (C) 2009-2010 Mathias Svensson
-     http://result42.com
-
-   This program is distributed under the terms of the same license as zlib.
-   See the accompanying LICENSE file for the full text of the license.
-*/
-
-//taken and adapted from https://stackoverflow.com/a/13492589
-
-// save diagnostic state
-#pragma GCC diagnostic push 
-
-// turn off the specific warning. Can also use "-Wall"
-#pragma GCC diagnostic ignored "-Wunused-parameter"
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "ioapi.h"
-
-#if defined(_WIN32)
-#  define snprintf _snprintf
-#endif
-
-#ifdef __APPLE__
-/* In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions */
-#  define FOPEN_FUNC(filename, mode) fopen(filename, mode)
-#  define FTELLO_FUNC(stream) ftello(stream)
-#  define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin)
-#else
-#  define FOPEN_FUNC(filename, mode) fopen64(filename, mode)
-#  define FTELLO_FUNC(stream) ftello64(stream)
-#  define FSEEKO_FUNC(stream, offset, origin) fseeko64(stream, offset, origin)
-#endif
-
-/* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */
-#ifndef SEEK_CUR
-#  define SEEK_CUR    1
-#endif
-#ifndef SEEK_END
-#  define SEEK_END    2
-#endif
-#ifndef SEEK_SET
-#  define SEEK_SET    0
-#endif
-
-voidpf call_zopen64 (const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode)
-{
-    if (pfilefunc->zfile_func64.zopen64_file != NULL)
-        return (*(pfilefunc->zfile_func64.zopen64_file)) (pfilefunc->zfile_func64.opaque,filename,mode);
-    return (*(pfilefunc->zopen32_file))(pfilefunc->zfile_func64.opaque,(const char*)filename,mode);
-}
-
-voidpf call_zopendisk64 OF((const zlib_filefunc64_32_def* pfilefunc, voidpf filestream, int number_disk, int mode))
-{
-    if (pfilefunc->zfile_func64.zopendisk64_file != NULL)
-        return (*(pfilefunc->zfile_func64.zopendisk64_file)) (pfilefunc->zfile_func64.opaque,filestream,number_disk,mode);
-    return (*(pfilefunc->zopendisk32_file))(pfilefunc->zfile_func64.opaque,filestream,number_disk,mode);
-}
-
-long call_zseek64 (const zlib_filefunc64_32_def* pfilefunc,voidpf filestream, ZPOS64_T offset, int origin)
-{
-    uLong offsetTruncated;
-    if (pfilefunc->zfile_func64.zseek64_file != NULL)
-        return (*(pfilefunc->zfile_func64.zseek64_file)) (pfilefunc->zfile_func64.opaque,filestream,offset,origin);
-    offsetTruncated = (uLong)offset;
-    if (offsetTruncated != offset)
-        return -1;
-    return (*(pfilefunc->zseek32_file))(pfilefunc->zfile_func64.opaque,filestream,offsetTruncated,origin);
-}
-
-ZPOS64_T call_ztell64 (const zlib_filefunc64_32_def* pfilefunc,voidpf filestream)
-{
-    uLong tell_uLong;
-    if (pfilefunc->zfile_func64.zseek64_file != NULL)
-        return (*(pfilefunc->zfile_func64.ztell64_file)) (pfilefunc->zfile_func64.opaque,filestream);
-    tell_uLong = (*(pfilefunc->ztell32_file))(pfilefunc->zfile_func64.opaque,filestream);
-    if ((tell_uLong) == 0xffffffff)
-        return (ZPOS64_T)-1;
-    return tell_uLong;
-}
-
-void fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filefunc64_32,const zlib_filefunc_def* p_filefunc32)
-{
-    p_filefunc64_32->zfile_func64.zopen64_file = NULL;
-    p_filefunc64_32->zfile_func64.zopendisk64_file = NULL;
-    p_filefunc64_32->zopen32_file = p_filefunc32->zopen_file;
-    p_filefunc64_32->zopendisk32_file = p_filefunc32->zopendisk_file;
-    p_filefunc64_32->zfile_func64.zerror_file = p_filefunc32->zerror_file;
-    p_filefunc64_32->zfile_func64.zread_file = p_filefunc32->zread_file;
-    p_filefunc64_32->zfile_func64.zwrite_file = p_filefunc32->zwrite_file;
-    p_filefunc64_32->zfile_func64.ztell64_file = NULL;
-    p_filefunc64_32->zfile_func64.zseek64_file = NULL;
-    p_filefunc64_32->zfile_func64.zclose_file = p_filefunc32->zclose_file;
-    p_filefunc64_32->zfile_func64.zerror_file = p_filefunc32->zerror_file;
-    p_filefunc64_32->zfile_func64.opaque = p_filefunc32->opaque;
-    p_filefunc64_32->zseek32_file = p_filefunc32->zseek_file;
-    p_filefunc64_32->ztell32_file = p_filefunc32->ztell_file;
-}
-
-static voidpf  ZCALLBACK fopen_file_func OF((voidpf opaque, const char* filename, int mode));
-static uLong   ZCALLBACK fread_file_func OF((voidpf opaque, voidpf stream, void* buf, uLong size));
-static uLong   ZCALLBACK fwrite_file_func OF((voidpf opaque, voidpf stream, const void* buf,uLong size));
-static ZPOS64_T ZCALLBACK ftell64_file_func OF((voidpf opaque, voidpf stream));
-static long    ZCALLBACK fseek64_file_func OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin));
-static int     ZCALLBACK fclose_file_func OF((voidpf opaque, voidpf stream));
-static int     ZCALLBACK ferror_file_func OF((voidpf opaque, voidpf stream));
-
-typedef struct 
-{
-    FILE *file;
-    int filenameLength;
-    void *filename;
-} FILE_IOPOSIX;
-
-static voidpf file_build_ioposix(FILE *file, const char *filename)
-{
-    FILE_IOPOSIX *ioposix = NULL;
-    if (file == NULL)
-        return NULL;
-    ioposix = (FILE_IOPOSIX*)malloc(sizeof(FILE_IOPOSIX));
-    ioposix->file = file;
-    ioposix->filenameLength = strlen(filename) + 1;
-    ioposix->filename = (char*)malloc(ioposix->filenameLength * sizeof(char));
-    strncpy(ioposix->filename, filename, ioposix->filenameLength);
-    return (voidpf)ioposix;
-}
-
-static voidpf ZCALLBACK fopen_file_func (voidpf opaque, const char* filename, int mode)
-{
-    FILE* file = NULL;
-    const char* mode_fopen = NULL;
-    if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER) == ZLIB_FILEFUNC_MODE_READ)
-        mode_fopen = "rb";
-    else if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
-        mode_fopen = "r+b";
-    else if (mode & ZLIB_FILEFUNC_MODE_CREATE)
-        mode_fopen = "wb";
-
-    if ((filename != NULL) && (mode_fopen != NULL))
-    {
-        file = fopen(filename, mode_fopen);
-        return file_build_ioposix(file, filename);
-    }
-    return file;
-}
-
-static voidpf ZCALLBACK fopen64_file_func (voidpf opaque, const void* filename, int mode)
-{
-    FILE* file = NULL;
-    const char* mode_fopen = NULL;
-    if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER) == ZLIB_FILEFUNC_MODE_READ)
-        mode_fopen = "rb";
-    else if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
-        mode_fopen = "r+b";
-    else if (mode & ZLIB_FILEFUNC_MODE_CREATE)
-        mode_fopen = "wb";
-
-    if ((filename != NULL) && (mode_fopen != NULL))
-    {
-        file = FOPEN_FUNC((const char*)filename, mode_fopen);
-        return file_build_ioposix(file, (const char*)filename);
-    }
-    return file;
-}
-
-static voidpf ZCALLBACK fopendisk64_file_func (voidpf opaque, voidpf stream, int number_disk, int mode)
-{
-    FILE_IOPOSIX *ioposix = NULL;
-    char *diskFilename = NULL;
-    voidpf ret = NULL;
-    int i = 0;
-
-    if (stream == NULL)
-        return NULL;
-    ioposix = (FILE_IOPOSIX*)stream;
-    diskFilename = (char*)malloc(ioposix->filenameLength * sizeof(char));
-    strncpy(diskFilename, ioposix->filename, ioposix->filenameLength);
-    for (i = ioposix->filenameLength - 1; i >= 0; i -= 1)
-    {
-        if (diskFilename[i] != '.')
-            continue;
-        snprintf(&diskFilename[i], ioposix->filenameLength - i, ".z%02d", number_disk + 1);
-        break;
-    }
-    if (i >= 0)
-        ret = fopen64_file_func(opaque, diskFilename, mode);
-    free(diskFilename);
-    return ret;
-}
-
-static voidpf ZCALLBACK fopendisk_file_func (voidpf opaque, voidpf stream, int number_disk, int mode)
-{
-    FILE_IOPOSIX *ioposix = NULL;
-    char *diskFilename = NULL;
-    voidpf ret = NULL;
-    int i = 0;
-
-    if (stream == NULL)
-        return NULL;
-    ioposix = (FILE_IOPOSIX*)stream;
-    diskFilename = (char*)malloc(ioposix->filenameLength * sizeof(char));
-    strncpy(diskFilename, ioposix->filename, ioposix->filenameLength);
-    for (i = ioposix->filenameLength - 1; i >= 0; i -= 1)
-    {
-        if (diskFilename[i] != '.')
-            continue;
-        snprintf(&diskFilename[i], ioposix->filenameLength - i, ".z%02d", number_disk + 1);
-        break;
-    }
-    if (i >= 0)
-        ret = fopen_file_func(opaque, diskFilename, mode);
-    free(diskFilename);
-    return ret;
-}
-
-static uLong ZCALLBACK fread_file_func (voidpf opaque, voidpf stream, void* buf, uLong size)
-{
-    FILE_IOPOSIX *ioposix = NULL;
-    uLong ret;
-    if (stream == NULL)
-        return -1;
-    ioposix = (FILE_IOPOSIX*)stream;
-    ret = (uLong)fread(buf, 1, (size_t)size, ioposix->file);
-    return ret;
-}
-
-static uLong ZCALLBACK fwrite_file_func (voidpf opaque, voidpf stream, const void* buf, uLong size)
-{
-    FILE_IOPOSIX *ioposix = NULL;
-    uLong ret;
-    if (stream == NULL)
-        return -1;
-    ioposix = (FILE_IOPOSIX*)stream;
-    ret = (uLong)fwrite(buf, 1, (size_t)size, ioposix->file);
-    return ret;
-}
-
-static long ZCALLBACK ftell_file_func (voidpf opaque, voidpf stream)
-{
-    FILE_IOPOSIX *ioposix = NULL;
-    long ret = -1;
-    if (stream == NULL)
-        return ret;
-    ioposix = (FILE_IOPOSIX*)stream;
-    ret = ftell(ioposix->file);
-    return ret;
-}
-
-static ZPOS64_T ZCALLBACK ftell64_file_func (voidpf opaque, voidpf stream)
-{
-    FILE_IOPOSIX *ioposix = NULL;
-    ZPOS64_T ret = -1;
-    if (stream == NULL)
-        return ret;
-    ioposix = (FILE_IOPOSIX*)stream;
-    ret = FTELLO_FUNC(ioposix->file);
-    return ret;
-}
-
-static long ZCALLBACK fseek_file_func (voidpf opaque, voidpf stream, uLong offset, int origin)
-{
-    FILE_IOPOSIX *ioposix = NULL;
-    int fseek_origin = 0;
-    long ret = 0;
-
-    if (stream == NULL)
-        return -1;
-    ioposix = (FILE_IOPOSIX*)stream;
-
-    switch (origin)
-    {
-        case ZLIB_FILEFUNC_SEEK_CUR:
-            fseek_origin = SEEK_CUR;
-            break;
-        case ZLIB_FILEFUNC_SEEK_END:
-            fseek_origin = SEEK_END;
-            break;
-        case ZLIB_FILEFUNC_SEEK_SET:
-            fseek_origin = SEEK_SET;
-            break;
-        default:
-            return -1;
-    }
-    if (fseek(ioposix->file, offset, fseek_origin) != 0)
-        ret = -1;
-    return ret;
-}
-
-static long ZCALLBACK fseek64_file_func (voidpf opaque, voidpf stream, ZPOS64_T offset, int origin)
-{
-    FILE_IOPOSIX *ioposix = NULL;
-    int fseek_origin = 0;
-    long ret = 0;
-
-    if (stream == NULL)
-        return -1;
-    ioposix = (FILE_IOPOSIX*)stream;
-
-    switch (origin)
-    {
-        case ZLIB_FILEFUNC_SEEK_CUR:
-            fseek_origin = SEEK_CUR;
-            break;
-        case ZLIB_FILEFUNC_SEEK_END:
-            fseek_origin = SEEK_END;
-            break;
-        case ZLIB_FILEFUNC_SEEK_SET:
-            fseek_origin = SEEK_SET;
-            break;
-        default:
-            return -1;
-    }
-
-    if(FSEEKO_FUNC(ioposix->file, offset, fseek_origin) != 0)
-        ret = -1;
-
-    return ret;
-}
-
-
-static int ZCALLBACK fclose_file_func (voidpf opaque, voidpf stream)
-{
-    FILE_IOPOSIX *ioposix = NULL;
-    int ret = -1;
-    if (stream == NULL)
-        return ret;
-    ioposix = (FILE_IOPOSIX*)stream;
-    if (ioposix->filename != NULL)
-        free(ioposix->filename);
-    ret = fclose(ioposix->file);
-    free(ioposix);
-    return ret;
-}
-
-static int ZCALLBACK ferror_file_func (voidpf opaque, voidpf stream)
-{
-    FILE_IOPOSIX *ioposix = NULL;
-    int ret = -1;
-    if (stream == NULL)
-        return ret;
-    ioposix = (FILE_IOPOSIX*)stream;
-    ret = ferror(ioposix->file);
-    return ret;
-}
-
-void fill_fopen_filefunc (zlib_filefunc_def* pzlib_filefunc_def)
-{
-    pzlib_filefunc_def->zopen_file = fopen_file_func;
-    pzlib_filefunc_def->zopendisk_file = fopendisk_file_func;
-    pzlib_filefunc_def->zread_file = fread_file_func;
-    pzlib_filefunc_def->zwrite_file = fwrite_file_func;
-    pzlib_filefunc_def->ztell_file = ftell_file_func;
-    pzlib_filefunc_def->zseek_file = fseek_file_func;
-    pzlib_filefunc_def->zclose_file = fclose_file_func;
-    pzlib_filefunc_def->zerror_file = ferror_file_func;
-    pzlib_filefunc_def->opaque = NULL;
-}
-
-void fill_fopen64_filefunc (zlib_filefunc64_def* pzlib_filefunc_def)
-{
-    pzlib_filefunc_def->zopen64_file = fopen64_file_func;
-    pzlib_filefunc_def->zopendisk64_file = fopendisk64_file_func;
-    pzlib_filefunc_def->zread_file = fread_file_func;
-    pzlib_filefunc_def->zwrite_file = fwrite_file_func;
-    pzlib_filefunc_def->ztell64_file = ftell64_file_func;
-    pzlib_filefunc_def->zseek64_file = fseek64_file_func;
-    pzlib_filefunc_def->zclose_file = fclose_file_func;
-    pzlib_filefunc_def->zerror_file = ferror_file_func;
-    pzlib_filefunc_def->opaque = NULL;
-}
-
-// turn the warnings back on
-#pragma GCC diagnostic pop
--- a/source/minizip/ioapi.h
+++ b/source/minizip/ioapi.h
@@ -1,158 +0,0 @@
-/* ioapi.h -- IO base function header for compress/uncompress .zip
-   part of the MiniZip project
-
-   Copyright (C) 1998-2010 Gilles Vollant
-     http://www.winimage.com/zLibDll/minizip.html
-   Modifications for Zip64 support
-     Copyright (C) 2009-2010 Mathias Svensson
-     http://result42.com
-
-   This program is distributed under the terms of the same license as zlib.
-   See the accompanying LICENSE file for the full text of the license.
-*/
-
-#ifndef _ZLIBIOAPI64_H
-#define _ZLIBIOAPI64_H
-
-#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__))
-#  ifndef __USE_FILE_OFFSET64
-#    define __USE_FILE_OFFSET64
-#  endif
-#  ifndef __USE_LARGEFILE64
-#    define __USE_LARGEFILE64
-#  endif
-#  ifndef _LARGEFILE64_SOURCE
-#    define _LARGEFILE64_SOURCE
-#  endif
-#  ifndef _FILE_OFFSET_BIT
-#    define _FILE_OFFSET_BIT 64
-#  endif
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <zlib.h>
-
-
-#define fopen64 fopen
-#define ftello64 ftell
-#define fseeko64 fseek
-
-/* a type choosen by DEFINE */
-#ifdef HAVE_64BIT_INT_CUSTOM
-typedef 64BIT_INT_CUSTOM_TYPE ZPOS64_T;
-#else
-#  ifdef HAVE_STDINT_H
-#    include "stdint.h"
-     typedef uint64_t ZPOS64_T;
-#  else
-#    if defined(_MSC_VER) || defined(__BORLANDC__)
-       typedef unsigned __int64 ZPOS64_T;
-#    else
-       typedef unsigned long long int ZPOS64_T;
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define ZLIB_FILEFUNC_SEEK_CUR (1)
-#define ZLIB_FILEFUNC_SEEK_END (2)
-#define ZLIB_FILEFUNC_SEEK_SET (0)
-
-#define ZLIB_FILEFUNC_MODE_READ             (1)
-#define ZLIB_FILEFUNC_MODE_WRITE            (2)
-#define ZLIB_FILEFUNC_MODE_READWRITEFILTER  (3)
-#define ZLIB_FILEFUNC_MODE_EXISTING         (4)
-#define ZLIB_FILEFUNC_MODE_CREATE           (8)
-
-#ifndef ZCALLBACK
-#  if (defined(WIN32) || defined(_WIN32) || defined (WINDOWS) || \
-       defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK)
-#    define ZCALLBACK CALLBACK
-#  else
-#    define ZCALLBACK
-#  endif
-#endif
-
-typedef voidpf   (ZCALLBACK *open_file_func)      OF((voidpf opaque, const char* filename, int mode));
-typedef voidpf   (ZCALLBACK *opendisk_file_func)  OF((voidpf opaque, voidpf stream, int number_disk, int mode));
-typedef uLong    (ZCALLBACK *read_file_func)      OF((voidpf opaque, voidpf stream, void* buf, uLong size));
-typedef uLong    (ZCALLBACK *write_file_func)     OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
-typedef int      (ZCALLBACK *close_file_func)     OF((voidpf opaque, voidpf stream));
-typedef int      (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream));
-
-typedef long     (ZCALLBACK *tell_file_func)      OF((voidpf opaque, voidpf stream));
-typedef long     (ZCALLBACK *seek_file_func)      OF((voidpf opaque, voidpf stream, uLong offset, int origin));
-
-/* here is the "old" 32 bits structure structure */
-typedef struct zlib_filefunc_def_s
-{
-    open_file_func      zopen_file;
-    opendisk_file_func  zopendisk_file;
-    read_file_func      zread_file;
-    write_file_func     zwrite_file;
-    tell_file_func      ztell_file;
-    seek_file_func      zseek_file;
-    close_file_func     zclose_file;
-    testerror_file_func zerror_file;
-    voidpf              opaque;
-} zlib_filefunc_def;
-
-typedef ZPOS64_T (ZCALLBACK *tell64_file_func)    OF((voidpf opaque, voidpf stream));
-typedef long     (ZCALLBACK *seek64_file_func)    OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin));
-typedef voidpf   (ZCALLBACK *open64_file_func)    OF((voidpf opaque, const void* filename, int mode));
-typedef voidpf   (ZCALLBACK *opendisk64_file_func)OF((voidpf opaque, voidpf stream, int number_disk, int mode));
-
-typedef struct zlib_filefunc64_def_s
-{
-    open64_file_func     zopen64_file;
-    opendisk64_file_func zopendisk64_file;
-    read_file_func       zread_file;
-    write_file_func      zwrite_file;
-    tell64_file_func     ztell64_file;
-    seek64_file_func     zseek64_file;
-    close_file_func      zclose_file;
-    testerror_file_func  zerror_file;
-    voidpf               opaque;
-} zlib_filefunc64_def;
-
-void fill_fopen_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
-void fill_fopen64_filefunc OF((zlib_filefunc64_def* pzlib_filefunc_def));
-
-/* now internal definition, only for zip.c and unzip.h */
-typedef struct zlib_filefunc64_32_def_s
-{
-    zlib_filefunc64_def zfile_func64;
-    open_file_func      zopen32_file;
-    opendisk_file_func  zopendisk32_file;
-    tell_file_func      ztell32_file;
-    seek_file_func      zseek32_file;
-} zlib_filefunc64_32_def;
-
-#define ZREAD64(filefunc,filestream,buf,size)       ((*((filefunc).zfile_func64.zread_file))        ((filefunc).zfile_func64.opaque,filestream,buf,size))
-#define ZWRITE64(filefunc,filestream,buf,size)      ((*((filefunc).zfile_func64.zwrite_file))       ((filefunc).zfile_func64.opaque,filestream,buf,size))
-/*#define ZTELL64(filefunc,filestream)                ((*((filefunc).ztell64_file))                   ((filefunc).opaque,filestream))*/
-/*#define ZSEEK64(filefunc,filestream,pos,mode)       ((*((filefunc).zseek64_file))                   ((filefunc).opaque,filestream,pos,mode))*/
-#define ZCLOSE64(filefunc,filestream)               ((*((filefunc).zfile_func64.zclose_file))       ((filefunc).zfile_func64.opaque,filestream))
-#define ZERROR64(filefunc,filestream)               ((*((filefunc).zfile_func64.zerror_file))       ((filefunc).zfile_func64.opaque,filestream))
-
-voidpf   call_zopen64 OF((const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode));
-voidpf   call_zopendisk64 OF((const zlib_filefunc64_32_def* pfilefunc, voidpf filestream, int number_disk, int mode));
-long     call_zseek64 OF((const zlib_filefunc64_32_def* pfilefunc,voidpf filestream, ZPOS64_T offset, int origin));
-ZPOS64_T call_ztell64 OF((const zlib_filefunc64_32_def* pfilefunc,voidpf filestream));
-
-void fill_zlib_filefunc64_32_def_from_filefunc32 OF((zlib_filefunc64_32_def* p_filefunc64_32,const zlib_filefunc_def* p_filefunc32));
-
-#define ZOPEN64(filefunc,filename,mode)             (call_zopen64((&(filefunc)),(filename),(mode)))
-#define ZOPENDISK64(filefunc,filestream,diskn,mode) (call_zopendisk64((&(filefunc)),(filestream),(diskn),(mode)))
-#define ZTELL64(filefunc,filestream)                (call_ztell64((&(filefunc)),(filestream)))
-#define ZSEEK64(filefunc,filestream,pos,mode)       (call_zseek64((&(filefunc)),(filestream),(pos),(mode)))
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
--- a/source/minizip/ioapi_mem.c
+++ b/source/minizip/ioapi_mem.c
@@ -1,202 +0,0 @@
-/* ioapi_mem.h -- IO base function header for compress/uncompress .zip
-   files using zlib + zip or unzip API
-
-   This version of ioapi is designed to access memory rather than files.
-   We do use a region of memory to put data in to and take it out of. We do
-   not have auto-extending buffers and do not inform anyone else that the
-   data has been written. It is really intended for accessing a zip archive
-   embedded in an application such that I can write an installer with no
-   external files. Creation of archives has not been attempted, although
-   parts of the framework are present.
-
-   Based on Unzip ioapi.c version 0.22, May 19th, 2003
-
-   Copyright (C) 1998-2003 Gilles Vollant
-             (C) 2003 Justin Fletcher
-
-   This file is under the same license as the Unzip tool it is distributed
-   with.
-*/
-
-//taken and adapted from https://stackoverflow.com/a/13492589
-
-// save diagnostic state
-#pragma GCC diagnostic push 
-
-// turn off the specific warning. Can also use "-Wall"
-#pragma GCC diagnostic ignored "-Wunused-parameter"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "zlib.h"
-#include "ioapi.h"
-
-#include "ioapi_mem.h"
-
-#ifndef IOMEM_BUFFERSIZE
-#  define IOMEM_BUFFERSIZE (64 * 1024)
-#endif 
-
-voidpf ZCALLBACK fopen_mem_func (opaque, filename, mode)
-   voidpf opaque;
-   const char* filename;
-   int mode;
-{
-    ourmemory_t *mem = (ourmemory_t *)opaque;
-    if (mem == NULL)
-        return NULL; /* Mem structure passed in was null */
-    
-    if (mode & ZLIB_FILEFUNC_MODE_CREATE)
-    {
-        if (mem->grow)
-        {
-            mem->size = IOMEM_BUFFERSIZE;
-            mem->base = (char *)malloc(mem->size);
-        }
-
-        mem->limit = 0; /* When writing we start with 0 bytes written */
-    }
-    else
-        mem->limit = mem->size;
-
-    mem->cur_offset = 0;
-
-    return mem;
-}
-
-voidpf ZCALLBACK fopendisk_mem_func (opaque, stream, number_disk, mode)
-   voidpf opaque;
-   voidpf stream;
-   int number_disk;
-   int mode;
-{
-    /* Not used */
-    return NULL;
-}
-
-uLong ZCALLBACK fread_mem_func (opaque, stream, buf, size)
-   voidpf opaque;
-   voidpf stream;
-   void* buf;
-   uLong size;
-{
-    ourmemory_t *mem = (ourmemory_t *)stream;
-
-    if (size > mem->size - mem->cur_offset)
-        size = mem->size - mem->cur_offset;
-
-    memcpy(buf, mem->base + mem->cur_offset, size);
-    mem->cur_offset += size;
-
-    return size;
-}
-
-
-uLong ZCALLBACK fwrite_mem_func (opaque, stream, buf, size)
-   voidpf opaque;
-   voidpf stream;
-   const void* buf;
-   uLong size;
-{
-    ourmemory_t *mem = (ourmemory_t *)stream;
-    char *newbase = NULL;
-    uLong newmemsize = 0;
-
-    if (size > mem->size - mem->cur_offset)
-    {
-        if (mem->grow)
-        {
-            newmemsize = mem->size;
-            if (size < IOMEM_BUFFERSIZE)
-                newmemsize += IOMEM_BUFFERSIZE;
-            else
-                newmemsize += size;
-            newbase = (char *)malloc(newmemsize);
-            memcpy(newbase, mem->base, mem->size);
-            free(mem->base);
-            mem->base = newbase;
-            mem->size = newmemsize;
-        }
-        else
-            size = mem->size - mem->cur_offset;
-    }
-    memcpy(mem->base + mem->cur_offset, buf, size);
-    mem->cur_offset += size;
-    if (mem->cur_offset > mem->limit)
-        mem->limit = mem->cur_offset;
-
-    return size;
-}
-
-long ZCALLBACK ftell_mem_func (opaque, stream)
-   voidpf opaque;
-   voidpf stream;
-{
-    ourmemory_t *mem = (ourmemory_t *)stream;
-    return mem->cur_offset;
-}
-
-long ZCALLBACK fseek_mem_func (opaque, stream, offset, origin)
-   voidpf opaque;
-   voidpf stream;
-   uLong offset;
-   int origin;
-{
-    ourmemory_t *mem = (ourmemory_t *)stream;
-    uLong new_pos;
-    switch (origin)
-    {
-        case ZLIB_FILEFUNC_SEEK_CUR:
-            new_pos = mem->cur_offset + offset;
-            break;
-        case ZLIB_FILEFUNC_SEEK_END:
-            new_pos = mem->limit + offset;
-            break;
-        case ZLIB_FILEFUNC_SEEK_SET:
-            new_pos = offset;
-            break;
-        default: 
-            return -1;
-    }
-
-    if (new_pos > mem->size)
-        return 1; /* Failed to seek that far */
-    mem->cur_offset = new_pos;
-    return 0;
-}
-
-int ZCALLBACK fclose_mem_func (opaque, stream)
-   voidpf opaque;
-   voidpf stream;
-{
-    /* Even with grow = 1, caller must always free() memory */
-    return 0;
-}
-
-int ZCALLBACK ferror_mem_func (opaque, stream)
-   voidpf opaque;
-   voidpf stream;
-{
-    /* We never return errors */
-    return 0;
-}
-
-void fill_memory_filefunc (pzlib_filefunc_def, ourmem)
-   zlib_filefunc_def* pzlib_filefunc_def;
-   ourmemory_t *ourmem;
-{
-    pzlib_filefunc_def->zopen_file = fopen_mem_func;
-    pzlib_filefunc_def->zopendisk_file = fopendisk_mem_func;
-    pzlib_filefunc_def->zread_file = fread_mem_func;
-    pzlib_filefunc_def->zwrite_file = fwrite_mem_func;
-    pzlib_filefunc_def->ztell_file = ftell_mem_func;
-    pzlib_filefunc_def->zseek_file = fseek_mem_func;
-    pzlib_filefunc_def->zclose_file = fclose_mem_func;
-    pzlib_filefunc_def->zerror_file = ferror_mem_func;
-    pzlib_filefunc_def->opaque = ourmem;
-}
-
-// turn the warnings back on
-#pragma GCC diagnostic pop
--- a/source/minizip/ioapi_mem.h
+++ b/source/minizip/ioapi_mem.h
@@ -1,51 +0,0 @@
-/* ioapi_mem.h -- IO base function header for compress/uncompress .zip
-   files using zlib + zip or unzip API
-
-   This version of ioapi is designed to access memory rather than files.
-   We do use a region of memory to put data in to and take it out of.
-
-   Copyright (C) 1998-2003 Gilles Vollant
-             (C) 2003 Justin Fletcher
-
-   This program is distributed under the terms of the same license as zlib.
-   See the accompanying LICENSE file for the full text of the license.
-*/
-
-#ifndef _IOAPI_MEM_H
-#define _IOAPI_MEM_H
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "zlib.h"
-#include "ioapi.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-voidpf ZCALLBACK fopen_mem_func OF((voidpf opaque,const char* filename,int mode));
-voidpf ZCALLBACK fopendisk_mem_func OF((voidpf opaque, voidpf stream, int number_disk, int mode));
-uLong ZCALLBACK fread_mem_func OF((voidpf opaque,voidpf stream,void* buf,uLong size));
-uLong ZCALLBACK fwrite_mem_func OF((voidpf opaque,voidpf stream,const void* buf,uLong size));
-long ZCALLBACK ftell_mem_func OF((voidpf opaque,voidpf stream));
-long ZCALLBACK fseek_mem_func OF((voidpf opaque,voidpf stream,uLong offset,int origin));
-int ZCALLBACK fclose_mem_func OF((voidpf opaque,voidpf stream));
-int ZCALLBACK ferror_mem_func OF((voidpf opaque,voidpf stream));
-
-typedef struct ourmemory_s {
-    char *base;       /* Base of the region of memory we're using */
-    uLong size;       /* Size of the region of memory we're using */
-    uLong limit;      /* Furthest we've written */
-    uLong cur_offset; /* Current offset in the area */
-    int grow;         /* Growable memory buffer */
-} ourmemory_t;
-
-void fill_memory_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def, ourmemory_t *ourmem));
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
--- a/source/minizip/unzip.c
+++ b/source/minizip/unzip.c
--- a/source/minizip/unzip.h
+++ b/source/minizip/unzip.h
@@ -1,320 +0,0 @@
-/* unzip.h -- IO for uncompress .zip files using zlib
-   Version 1.1, February 14h, 2010
-   part of the MiniZip project
-
-   Copyright (C) 1998-2010 Gilles Vollant
-     http://www.winimage.com/zLibDll/minizip.html
-   Modifications of Unzip for Zip64
-     Copyright (C) 2007-2008 Even Rouault
-   Modifications for Zip64 support on both zip and unzip
-     Copyright (C) 2009-2010 Mathias Svensson
-     http://result42.com
-
-   This program is distributed under the terms of the same license as zlib.
-   See the accompanying LICENSE file for the full text of the license.
-*/
-
-#ifndef _UNZ_H
-#define _UNZ_H
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef _ZLIB_H
-#include <zlib.h>
-#endif
-
-#ifndef _ZLIBIOAPI_H
-#include "ioapi.h"
-#endif
-
-#ifdef HAVE_BZIP2
-#include "bzlib.h"
-#endif
-
-#define Z_BZIP2ED 12
-
-#if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
-/* like the STRICT of WIN32, we define a pointer that cannot be converted
-    from (void*) without cast */
-typedef struct TagunzFile__ { int unused; } unzFile__;
-typedef unzFile__ *unzFile;
-#else
-typedef voidp unzFile;
-#endif
-
-#define UNZ_OK                          (0)
-#define UNZ_END_OF_LIST_OF_FILE         (-100)
-#define UNZ_ERRNO                       (Z_ERRNO)
-#define UNZ_EOF                         (0)
-#define UNZ_PARAMERROR                  (-102)
-#define UNZ_BADZIPFILE                  (-103)
-#define UNZ_INTERNALERROR               (-104)
-#define UNZ_CRCERROR                    (-105)
-
-/* tm_unz contain date/time info */
-typedef struct tm_unz_s
-{
-    uInt tm_sec;                /* seconds after the minute - [0,59] */
-    uInt tm_min;                /* minutes after the hour - [0,59] */
-    uInt tm_hour;               /* hours since midnight - [0,23] */
-    uInt tm_mday;               /* day of the month - [1,31] */
-    uInt tm_mon;                /* months since January - [0,11] */
-    uInt tm_year;               /* years - [1980..2044] */
-} tm_unz;
-
-/* unz_global_info structure contain global data about the ZIPfile
-   These data comes from the end of central dir */
-typedef struct unz_global_info64_s
-{
-    ZPOS64_T number_entry;      /* total number of entries in the central dir on this disk */
-    uLong number_disk_with_CD;  /* number the the disk with central dir, used for spanning ZIP*/
-    uLong size_comment;         /* size of the global comment of the zipfile */
-} unz_global_info64;
-
-typedef struct unz_global_info_s
-{
-    uLong number_entry;         /* total number of entries in the central dir on this disk */
-    uLong number_disk_with_CD;  /* number the the disk with central dir, used for spanning ZIP*/
-    uLong size_comment;         /* size of the global comment of the zipfile */
-} unz_global_info;
-
-/* unz_file_info contain information about a file in the zipfile */
-typedef struct unz_file_info64_s
-{
-    uLong version;              /* version made by                 2 bytes */
-    uLong version_needed;       /* version needed to extract       2 bytes */
-    uLong flag;                 /* general purpose bit flag        2 bytes */
-    uLong compression_method;   /* compression method              2 bytes */
-    uLong dosDate;              /* last mod file date in Dos fmt   4 bytes */
-    uLong crc;                  /* crc-32                          4 bytes */
-    ZPOS64_T compressed_size;   /* compressed size                 8 bytes */
-    ZPOS64_T uncompressed_size; /* uncompressed size               8 bytes */
-    uLong size_filename;        /* filename length                 2 bytes */
-    uLong size_file_extra;      /* extra field length              2 bytes */
-    uLong size_file_comment;    /* file comment length             2 bytes */
-
-    uLong disk_num_start;       /* disk number start               2 bytes */
-    uLong internal_fa;          /* internal file attributes        2 bytes */
-    uLong external_fa;          /* external file attributes        4 bytes */
-
-    tm_unz tmu_date;
-    ZPOS64_T disk_offset;
-    uLong size_file_extra_internal;
-} unz_file_info64;
-
-typedef struct unz_file_info_s
-{
-    uLong version;              /* version made by                 2 bytes */
-    uLong version_needed;       /* version needed to extract       2 bytes */
-    uLong flag;                 /* general purpose bit flag        2 bytes */
-    uLong compression_method;   /* compression method              2 bytes */
-    uLong dosDate;              /* last mod file date in Dos fmt   4 bytes */
-    uLong crc;                  /* crc-32                          4 bytes */
-    uLong compressed_size;      /* compressed size                 4 bytes */
-    uLong uncompressed_size;    /* uncompressed size               4 bytes */
-    uLong size_filename;        /* filename length                 2 bytes */
-    uLong size_file_extra;      /* extra field length              2 bytes */
-    uLong size_file_comment;    /* file comment length             2 bytes */
-
-    uLong disk_num_start;       /* disk number start               2 bytes */
-    uLong internal_fa;          /* internal file attributes        2 bytes */
-    uLong external_fa;          /* external file attributes        4 bytes */
-
-    tm_unz tmu_date;
-    uLong disk_offset;
-} unz_file_info;
-
-/***************************************************************************/
-/* Opening and close a zip file */
-
-extern unzFile ZEXPORT unzOpen OF((const char *path));
-extern unzFile ZEXPORT unzOpen64 OF((const void *path));
-/* Open a Zip file.
-
-   path should contain the full pathname (by example, on a Windows XP computer 
-      "c:\\zlib\\zlib113.zip" or on an Unix computer "zlib/zlib113.zip". 
-   return NULL if zipfile cannot be opened or doesn't exist
-   return unzFile handle if no error
-
-   NOTE: The "64" function take a const void* pointer, because  the path is just the value passed to the
-   open64_file_func callback. Under Windows, if UNICODE is defined, using fill_fopen64_filefunc, the path 
-   is a pointer to a wide unicode string  (LPCTSTR is LPCWSTR), so const char* does not describe the reality */
-
-extern unzFile ZEXPORT unzOpen2 OF((const char *path, zlib_filefunc_def* pzlib_filefunc_def));
-/* Open a Zip file, like unzOpen, but provide a set of file low level API for read/write operations */
-extern unzFile ZEXPORT unzOpen2_64 OF((const void *path, zlib_filefunc64_def* pzlib_filefunc_def));
-/* Open a Zip file, like unz64Open, but provide a set of file low level API for read/write 64-bit operations */
-
-extern int ZEXPORT unzClose OF((unzFile file));
-/* Close a ZipFile opened with unzOpen. If there is files inside the .Zip opened with unzOpenCurrentFile,
-   these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
-
-   return UNZ_OK if there is no error */
-
-extern int ZEXPORT unzGetGlobalInfo OF((unzFile file, unz_global_info *pglobal_info));
-extern int ZEXPORT unzGetGlobalInfo64 OF((unzFile file, unz_global_info64 *pglobal_info));
-/* Write info about the ZipFile in the *pglobal_info structure.
-
-   return UNZ_OK if no error */
-
-extern int ZEXPORT unzGetGlobalComment OF((unzFile file, char *comment, uLong comment_size));
-/* Get the global comment string of the ZipFile, in the comment buffer.
-
-   uSizeBuf is the size of the szComment buffer.
-   return the number of byte copied or an error code <0 */
-
-/***************************************************************************/
-/* Reading the content of the current zipfile, you can open it, read data from it, and close it
-   (you can close it before reading all the file) */
-
-extern int ZEXPORT unzOpenCurrentFile OF((unzFile file));
-/* Open for reading data the current file in the zipfile.
-
-   return UNZ_OK if no error */
-
-extern int ZEXPORT unzOpenCurrentFilePassword OF((unzFile file, const char* password));
-/* Open for reading data the current file in the zipfile.
-   password is a crypting password
-
-   return UNZ_OK if no error */
-
-extern int ZEXPORT unzOpenCurrentFile2 OF((unzFile file, int* method, int* level, int raw));
-/* Same as unzOpenCurrentFile, but open for read raw the file (not uncompress)
-   if raw==1 *method will receive method of compression, *level will receive level of compression
-
-   NOTE: you can set level parameter as NULL (if you did not want known level,
-         but you CANNOT set method parameter as NULL */
-
-extern int ZEXPORT unzOpenCurrentFile3 OF((unzFile file, int* method, int* level, int raw, const char* password));
-/* Same as unzOpenCurrentFile, but takes extra parameter password for encrypted files */
-
-extern int ZEXPORT unzReadCurrentFile OF((unzFile file, voidp buf, unsigned len));
-/* Read bytes from the current file (opened by unzOpenCurrentFile)
-   buf contain buffer where data must be copied
-   len the size of buf.
-
-   return the number of byte copied if somes bytes are copied
-   return 0 if the end of file was reached
-   return <0 with error code if there is an error (UNZ_ERRNO for IO error, or zLib error for uncompress error) */
-
-extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file, unz_file_info *pfile_info, char *filename, 
-    uLong filename_size, void *extrafield, uLong extrafield_size, char *comment, uLong comment_size));
-extern int ZEXPORT unzGetCurrentFileInfo64 OF((unzFile file, unz_file_info64 *pfile_info, char *filename,
-    uLong filename_size, void *extrafield, uLong extrafield_size, char *comment, uLong comment_size));
-/* Get Info about the current file
-
-   pfile_info if != NULL, the *pfile_info structure will contain somes info about the current file
-   filename if != NULL, the file name string will be copied in filename 
-   filename_size is the size of the filename buffer
-   extrafield if != NULL, the extra field information from the central header will be copied in to
-   extrafield_size is the size of the extraField buffer 
-   comment if != NULL, the comment string of the file will be copied in to
-   comment_size is the size of the comment buffer */
-
-extern ZPOS64_T ZEXPORT unzGetCurrentFileZStreamPos64 OF((unzFile file));
-
-extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file, voidp buf, unsigned len));
-/* Read extra field from the current file (opened by unzOpenCurrentFile)
-   This is the local-header version of the extra field (sometimes, there is
-   more info in the local-header version than in the central-header)
-
-   if buf == NULL, it return the size of the local extra field
-   if buf != NULL, len is the size of the buffer, the extra header is copied in buf.
-
-   return number of bytes copied in buf, or (if <0) the error code */
-
-extern int ZEXPORT unzCloseCurrentFile OF((unzFile file));
-/* Close the file in zip opened with unzOpenCurrentFile
-
-   return UNZ_CRCERROR if all the file was read but the CRC is not good */
-
-/***************************************************************************/
-/* Browse the directory of the zipfile */
-
-typedef int (*unzFileNameComparer)(unzFile file, const char *filename1, const char *filename2);
-typedef int (*unzIteratorFunction)(unzFile file);
-typedef int (*unzIteratorFunction2)(unzFile file, unz_file_info64 *pfile_info, char *filename,
-    uLong filename_size, void *extrafield, uLong extrafield_size, char *comment, uLong comment_size);
-
-extern int ZEXPORT unzGoToFirstFile OF((unzFile file));
-/* Set the current file of the zipfile to the first file.
-
-   return UNZ_OK if no error */
-
-extern int ZEXPORT unzGoToFirstFile2 OF((unzFile file, unz_file_info64 *pfile_info, char *filename,
-    uLong filename_size, void *extrafield, uLong extrafield_size, char *comment, uLong comment_size));
-/* Set the current file of the zipfile to the first file and retrieves the current info on success. 
-   Not as seek intensive as unzGoToFirstFile + unzGetCurrentFileInfo.
-
-   return UNZ_OK if no error */
-
-extern int ZEXPORT unzGoToNextFile OF((unzFile file));
-/* Set the current file of the zipfile to the next file.
-
-   return UNZ_OK if no error
-   return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest */
-
-extern int ZEXPORT unzGoToNextFile2 OF((unzFile file, unz_file_info64 *pfile_info, char *filename,
-    uLong filename_size, void *extrafield, uLong extrafield_size, char *comment, uLong comment_size));
-/* Set the current file of the zipfile to the next file and retrieves the current 
-   info on success. Does less seeking around than unzGotoNextFile + unzGetCurrentFileInfo.
-
-   return UNZ_OK if no error
-   return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest */
-
-extern int ZEXPORT unzLocateFile OF((unzFile file, const char *filename, unzFileNameComparer filename_compare_func));
-/* Try locate the file szFileName in the zipfile. For custom filename comparison pass in comparison function.
-
-   return UNZ_OK if the file is found (it becomes the current file)
-   return UNZ_END_OF_LIST_OF_FILE if the file is not found */
-
-/***************************************************************************/
-/* Raw access to zip file */
-
-typedef struct unz_file_pos_s
-{
-    uLong pos_in_zip_directory;     /* offset in zip file directory */
-    uLong num_of_file;              /* # of file */
-} unz_file_pos;
-
-extern int ZEXPORT unzGetFilePos OF((unzFile file, unz_file_pos* file_pos));
-extern int ZEXPORT unzGoToFilePos OF((unzFile file, unz_file_pos* file_pos));
-
-typedef struct unz64_file_pos_s
-{
-    ZPOS64_T pos_in_zip_directory;   /* offset in zip file directory */
-    ZPOS64_T num_of_file;            /* # of file */
-} unz64_file_pos;
-
-extern int ZEXPORT unzGetFilePos64 OF((unzFile file, unz64_file_pos* file_pos));
-extern int ZEXPORT unzGoToFilePos64 OF((unzFile file, const unz64_file_pos* file_pos));
-
-extern uLong ZEXPORT unzGetOffset OF((unzFile file));
-extern ZPOS64_T ZEXPORT unzGetOffset64 OF((unzFile file));
-/* Get the current file offset */
-
-extern int ZEXPORT unzSetOffset OF((unzFile file, uLong pos));
-extern int ZEXPORT unzSetOffset64 OF((unzFile file, ZPOS64_T pos));
-/* Set the current file offset */
-
-extern z_off_t ZEXPORT unztell OF((unzFile file));
-extern ZPOS64_T ZEXPORT unztell64 OF((unzFile file));
-/* return current position in uncompressed data */
-
-extern int ZEXPORT unzseek OF((unzFile file, z_off_t offset, int origin));
-extern int ZEXPORT unzseek64 OF((unzFile file, ZPOS64_T offset, int origin));
-/* Seek within the uncompressed data if compression method is storage */
-
-extern int ZEXPORT unzeof OF((unzFile file));
-/* return 1 if the end of file was reached, 0 elsewhere */
-
-/***************************************************************************/
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _UNZ_H */
--- a/source/music.c
+++ b/source/music.c
@@ -0,0 +1,79 @@
+/*
+*   This file is part of Anemone3DS
+*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
+*
+*   This program is free software: you can redistribute it and/or modify
+*   it under the terms of the GNU General Public License as published by
+*   the Free Software Foundation, either version 3 of the License, or
+*   (at your option) any later version.
+*
+*   This program is distributed in the hope that it will be useful,
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*   GNU General Public License for more details.
+*
+*   You should have received a copy of the GNU General Public License
+*   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+*   Additional Terms 7.b and 7.c of GPLv3 apply to this file:
+*       * Requiring preservation of specified reasonable legal notices or
+*         author attributions in that material or in the Appropriate Legal
+*         Notices displayed by works containing it.
+*       * Prohibiting misrepresentation of the origin of that material,
+*         or requiring that modified versions of such material be marked in
+*         reasonable ways as different from the original version.
+*/
+
+#include "music.h"
+#include "loading.h"
+
+// Play a given audio struct
+Result update_audio(audio_s *audio) 
+{
+    long size = audio->wave_buf[audio->buf_pos].nsamples * 4 - audio->data_read;
+    char size_info[50] = {0};
+    sprintf(size_info, "Audio Size: %ld\n", size);
+    DEBUG(size_info);
+    if (audio->wave_buf[audio->buf_pos].status == NDSP_WBUF_DONE) // only run if the current selected buffer has already finished playing
+    { 
+        size_t read = ov_read(&audio->vf, (char*)audio->wave_buf[audio->buf_pos].data_vaddr + audio->data_read, size, NULL); // read 1 vorbis packet into wave buffer
+
+        if (read <= 0) // EoF or error
+        { 
+            ov_clear(&audio->vf);
+            if (read == 0) // EoF
+            { 
+                ov_open(fmemopen(audio->filebuf, audio->filesize, "rb"), &audio->vf, NULL, 0); // Reopen file. Don't need to reinit channel stuff since it's all the same as before
+            } else // Error :(
+            { 
+                char error[100] = {0};
+                sprintf(error, "Vorbis play error: %d\n", read);
+                DEBUG(error);
+                ndspChnReset(0);
+                return MAKERESULT(RL_FATAL, RS_INVALIDARG, RM_APPLICATION, RD_NO_DATA);
+            }
+        } else 
+        {
+            audio->data_read += read;
+            if (read == size) {
+                audio->data_read = 0;
+                ndspChnWaveBufAdd(0, &audio->wave_buf[audio->buf_pos]); // Add buffer to ndsp 
+                audio->buf_pos = 1 - audio->buf_pos; // switch to other buffer to load and prepare it while the current one is playing
+            }
+        }
+    }
+    return MAKERESULT(RL_SUCCESS, RS_SUCCESS, RM_APPLICATION, RD_SUCCESS);
+}
+
+void thread_audio(void* data) {
+    audio_s *audio = (audio_s*)data;
+    while(!audio->stop) {
+        update_audio(audio);
+    }
+    free(audio->filebuf);
+    free(audio);
+}
+
+void play_audio(audio_s *audio) {
+    threadCreate(thread_audio, audio, 0x1000, 0x3F, 1, true);
+}
--- a/source/remote.c
+++ b/source/remote.c
@@ -0,0 +1,914 @@
+/*
+*   This file is part of Anemone3DS
+*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
+*
+*   This program is free software: you can redistribute it and/or modify
+*   it under the terms of the GNU General Public License as published by
+*   the Free Software Foundation, either version 3 of the License, or
+*   (at your option) any later version.
+*
+*   This program is distributed in the hope that it will be useful,
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*   GNU General Public License for more details.
+*
+*   You should have received a copy of the GNU General Public License
+*   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+*   Additional Terms 7.b and 7.c of GPLv3 apply to this file:
+*       * Requiring preservation of specified reasonable legal notices or
+*         author attributions in that material or in the Appropriate Legal
+*         Notices displayed by works containing it.
+*       * Prohibiting misrepresentation of the origin of that material,
+*         or requiring that modified versions of such material be marked in
+*         reasonable ways as different from the original version.
+*/
+
+#include "remote.h"
+#include "loading.h"
+#include "draw.h"
+#include "fs.h"
+#include "unicode.h"
+#include "music.h"
+#include "pp2d/pp2d/pp2d.h"
+
+static Instructions_s browser_instructions[MODE_AMOUNT] = {
+    {
+        .info_line = NULL,
+        .instructions = {
+            {
+                L"\uE000 Download theme",
+                L"\uE001 Go back"
+            },
+            {
+                L"\uE002 Hold for more",
+                L"\uE003 Preview theme"
+            },
+            {
+                L"\uE004 Previous page",
+                L"\uE005 Next page"
+            },
+            {
+                L"Exit",
+                NULL
+            }
+        }
+    },
+    {
+        .info_line = NULL,
+        .instructions = {
+            {
+                L"\uE000 Download splash",
+                L"\uE001 Go back"
+            },
+            {
+                L"\uE002 Hold for more",
+                L"\uE003 Preview splash"
+            },
+            {
+                L"\uE004 Previous page",
+                L"\uE005 Next page"
+            },
+            {
+                L"Exit",
+                NULL
+            }
+        }
+    }
+};
+
+static Instructions_s extra_instructions = {
+    .info_line = L"Release \uE002 to cancel or hold \uE006 and release \uE002 to do stuff",
+    .info_line_color = COLOR_WHITE,
+    .instructions = {
+        {
+            L"\uE079 Jump to page",
+            L"\uE07A Search tags"
+        },
+        {
+            L"\uE07B Toggle splash/theme",
+            L"\uE07C Reload without cache"
+        },
+        {
+            NULL,
+            NULL
+        },
+        {
+            L"Exit",
+            NULL
+        }
+    }
+};
+
+static void load_remote_smdh(Entry_s * entry, size_t textureID, bool ignore_cache)
+{
+    bool not_cached = true;
+    char * smdh_buf = NULL;
+    u32 smdh_size = load_data("/info.smdh", *entry, &smdh_buf);
+    Icon_s * smdh = (Icon_s *)smdh_buf;
+
+    not_cached = !smdh_size || ignore_cache;  // if the size is 0, the file wasn't there
+
+    if(not_cached)
+    {
+        free(smdh_buf);
+        smdh_buf = NULL;
+        char * api_url = NULL;
+        asprintf(&api_url, THEMEPLAZA_SMDH_FORMAT, entry->tp_download_id);
+        smdh_size = http_get(api_url, NULL, &smdh_buf);
+        free(api_url);
+        smdh = (Icon_s *)smdh_buf;
+    }
+
+    if(!smdh_size)
+    {
+        free(smdh_buf);
+        utf8_to_utf16(entry->name, (u8*)"No name", 0x80);
+        utf8_to_utf16(entry->desc, (u8*)"No description", 0x100);
+        utf8_to_utf16(entry->author, (u8*)"Unknown author", 0x80);
+        entry->placeholder_color = RGBA8(rand() % 255, rand() % 255, rand() % 255, 255);
+        return;
+    }
+
+    memcpy(entry->name, smdh->name, 0x40*sizeof(u16));
+    memcpy(entry->desc, smdh->desc, 0x80*sizeof(u16));
+    memcpy(entry->author, smdh->author, 0x40*sizeof(u16));
+
+    const u32 width = 48, height = 48;
+    u32 *image = malloc(width*height*sizeof(u32));
+
+    for(u32 x = 0; x < width; x++)
+    {
+        for(u32 y = 0; y < height; y++)
+        {
+            unsigned int dest_pixel = (x + y*width);
+            unsigned int source_pixel = (((y >> 3) * (width >> 3) + (x >> 3)) << 6) + ((x & 1) | ((y & 1) << 1) | ((x & 2) << 1) | ((y & 2) << 2) | ((x & 4) << 2) | ((y & 4) << 3));
+
+            image[dest_pixel] = RGB565_TO_ABGR8(smdh->big_icon[source_pixel]);
+        }
+    }
+
+    pp2d_free_texture(textureID);
+    pp2d_load_texture_memory(textureID, (u8*)image, (u32)width, (u32)height);
+    free(image);
+
+    if(not_cached)
+    {
+        FSUSER_CreateDirectory(ArchiveSD, fsMakePath(PATH_UTF16, entry->path), FS_ATTRIBUTE_DIRECTORY);
+        u16 path[0x107] = {0};
+        strucat(path, entry->path);
+        struacat(path, "/info.smdh");
+        remake_file(fsMakePath(PATH_UTF16, path), ArchiveSD, smdh_size);
+        buf_to_file(smdh_size, fsMakePath(PATH_UTF16, path), ArchiveSD, smdh_buf);
+    }
+    free(smdh_buf);
+}
+
+static void load_remote_entries(Entry_List_s * list, json_t *ids_array, bool ignore_cache)
+{
+    list->entries_count = json_array_size(ids_array);
+    free(list->entries);
+    list->entries = calloc(list->entries_count, sizeof(Entry_s));
+    free(list->icons_ids);
+    list->icons_ids = calloc(list->entries_count, sizeof(ssize_t));
+    list->entries_loaded = list->entries_count;
+
+    size_t i = 0;
+    json_t * id = NULL;
+    json_array_foreach(ids_array, i, id)
+    {
+        size_t offset = i;
+        Entry_s * current_entry = &list->entries[offset];
+        current_entry->tp_download_id = json_integer_value(id);
+        size_t textureID = list->texture_id_offset + i;
+
+        char * entry_path = NULL;
+        asprintf(&entry_path, CACHE_PATH_FORMAT, current_entry->tp_download_id);
+        utf8_to_utf16(current_entry->path, (u8*)entry_path, 0x106);
+        free(entry_path);
+
+        load_remote_smdh(current_entry, textureID, ignore_cache);
+        list->icons_ids[offset] = textureID;
+    }
+}
+
+static void load_remote_list(Entry_List_s * list, json_int_t page, EntryMode mode, bool ignore_cache)
+{
+    if(page > list->tp_page_count)
+        page = 1;
+    if(page <= 0)
+        page = list->tp_page_count;
+
+    InstallType loading_screen = INSTALL_NONE;
+    if(mode == MODE_THEMES)
+        loading_screen = INSTALL_LOADING_REMOTE_THEMES;
+    else if(mode == MODE_SPLASHES)
+        loading_screen = INSTALL_LOADING_REMOTE_SPLASHES;
+    draw_install(loading_screen);
+
+    char * page_json = NULL;
+    char * api_url = NULL;
+    asprintf(&api_url, THEMEPLAZA_PAGE_FORMAT, page, mode+1, list->tp_search);
+    u32 json_len = http_get(api_url, NULL, &page_json);
+    free(api_url);
+
+    if(json_len)
+    {
+        list->texture_id_offset = TEXTURE_REMOTE_ICONS;
+        list->tp_current_page = page;
+        list->mode = mode;
+        list->entry_size = entry_size[mode];
+        list->entries_per_screen_v = entries_per_screen_v[mode];
+        list->entries_per_screen_h = entries_per_screen_h[mode];
+
+        json_error_t error;
+        json_t *root = json_loadb(page_json, json_len, 0, &error);
+        if(root)
+        {
+            const char *key;
+            json_t *value;
+            json_object_foreach(root, key, value)
+            {
+                if(json_is_integer(value) && !strcmp(key, THEMEPLAZA_JSON_PAGE_COUNT))
+                    list->tp_page_count = json_integer_value(value);
+                else if(json_is_array(value) && !strcmp(key, THEMEPLAZA_JSON_PAGE_IDS))
+                    load_remote_entries(list, value, ignore_cache);
+                else if(json_is_string(value) && !strcmp(key, THEMEPLAZA_JSON_ERROR_MESSAGE) && !strcmp(json_string_value(value), THEMEPLAZA_JSON_ERROR_MESSAGE_NOT_FOUND))
+                    throw_error("No results for this search.", ERROR_LEVEL_WARNING);
+            }
+        }
+        else
+            DEBUG("json error on line %d: %s\n", error.line, error.text);
+
+        json_decref(root);
+    }
+    else
+        throw_error("Couldn't download ThemePlaza data.\nMake sure WiFi is on.", ERROR_LEVEL_WARNING);
+
+    free(page_json);
+}
+
+static u16 previous_path_preview[0x106] = {0};
+static bool load_remote_preview(Entry_s * entry, int * preview_offset)
+{
+    bool not_cached = true;
+
+    if(!memcmp(&previous_path_preview, entry->path, 0x106*sizeof(u16))) return true;
+
+    char * preview_png = NULL;
+    u32 preview_size = load_data("/preview.png", *entry, &preview_png);
+
+    not_cached = !preview_size;
+
+    if(not_cached)
+    {
+        free(preview_png);
+        preview_png = NULL;
+
+        char * preview_url = NULL;
+        asprintf(&preview_url, THEMEPLAZA_PREVIEW_FORMAT, entry->tp_download_id);
+
+        draw_install(INSTALL_LOADING_REMOTE_PREVIEW);
+
+        preview_size = http_get(preview_url, NULL, &preview_png);
+        free(preview_url);
+    }
+
+    if(!preview_size)
+    {
+        free(preview_png);
+        return false;
+    }
+
+    bool ret = false;
+    u8 * image = NULL;
+    unsigned int width = 0, height = 0;
+
+    if((lodepng_decode32(&image, &width, &height, (u8*)preview_png, preview_size)) == 0) // no error
+    {
+        for(u32 i = 0; i < width; i++)
+        {
+            for(u32 j = 0; j < height; j++)
+            {
+                u32* pixel = (u32*)(image + (i + j*width) * 4);
+                *pixel = __builtin_bswap32(*pixel); //swap from RGBA to ABGR, needed for pp2d
+            }
+        }
+
+        // mark the new preview as loaded for optimisation
+        memcpy(&previous_path_preview, entry->path, 0x106*sizeof(u16));
+        // free the previously loaded preview. wont do anything if there wasnt one
+        pp2d_free_texture(TEXTURE_REMOTE_PREVIEW);
+
+        pp2d_load_texture_memory(TEXTURE_REMOTE_PREVIEW, image, (u32)width, (u32)height);
+
+        *preview_offset = (width-400)/2;
+        ret = true;
+    }
+    else
+    {
+        throw_error("Corrupted/invalid preview.png", ERROR_LEVEL_WARNING);
+    }
+
+    free(image);
+
+    if(not_cached)
+    {
+        u16 path[0x107] = {0};
+        strucat(path, entry->path);
+        struacat(path, "/preview.png");
+        remake_file(fsMakePath(PATH_UTF16, path), ArchiveSD, preview_size);
+        buf_to_file(preview_size, fsMakePath(PATH_UTF16, path), ArchiveSD, preview_png);
+    }
+    free(preview_png);
+
+    return ret;
+}
+
+static u16 previous_path_bgm[0x106] = {0};
+static void load_remote_bgm(Entry_s * entry)
+{
+    if(!memcmp(&previous_path_bgm, entry->path, 0x106*sizeof(u16))) return;
+
+    char * bgm_ogg = NULL;
+    u32 bgm_size = load_data("/bgm.ogg", *entry, &bgm_ogg);
+
+    if(!bgm_size)
+    {
+        free(bgm_ogg);
+        bgm_ogg = NULL;
+
+        char * bgm_url = NULL;
+        asprintf(&bgm_url, THEMEPLAZA_BGM_FORMAT, entry->tp_download_id);
+
+        draw_install(INSTALL_LOADING_REMOTE_BGM);
+
+        bgm_size = http_get(bgm_url, NULL, &bgm_ogg);
+        free(bgm_url);
+
+        u16 path[0x107] = {0};
+        strucat(path, entry->path);
+        struacat(path, "/bgm.ogg");
+        remake_file(fsMakePath(PATH_UTF16, path), ArchiveSD, bgm_size);
+        buf_to_file(bgm_size, fsMakePath(PATH_UTF16, path), ArchiveSD, bgm_ogg);
+
+        memcpy(&previous_path_bgm, entry->path, 0x106*sizeof(u16));
+    }
+
+    free(bgm_ogg);
+}
+
+static void download_remote_entry(Entry_s * entry, EntryMode mode)
+{
+    char * download_url = NULL;
+    asprintf(&download_url, THEMEPLAZA_DOWNLOAD_FORMAT, entry->tp_download_id);
+
+    char * zip_buf = NULL;
+    char * filename = NULL;
+    draw_install(INSTALL_DOWNLOAD);
+    u32 zip_size = http_get(download_url, &filename, &zip_buf);
+    free(download_url);
+
+    char path_to_file[0x107] = {0};
+    sprintf(path_to_file, "%s%s", main_paths[mode], filename);
+    free(filename);
+
+    char * extension = strrchr(path_to_file, '.');
+    if (extension == NULL || strcmp(extension, ".zip"))
+        strcat(path_to_file, ".zip");
+
+    DEBUG("Saving to sd: %s\n", path_to_file);
+    remake_file(fsMakePath(PATH_ASCII, path_to_file), ArchiveSD, zip_size);
+    buf_to_file(zip_size, fsMakePath(PATH_ASCII, path_to_file), ArchiveSD, zip_buf);
+    free(zip_buf);
+}
+
+static SwkbdCallbackResult jump_menu_callback(void* page_number, const char** ppMessage, const char* text, size_t textlen)
+{
+    int typed_value = atoi(text);
+    if(typed_value > *(json_int_t*)page_number)
+    {
+        *ppMessage = "The new page has to be\nsmaller or equal to the\nnumber of pages!";
+        return SWKBD_CALLBACK_CONTINUE;
+    }
+    else if(typed_value == 0)
+    {
+        *ppMessage = "The new position has to\nbe positive!";
+        return SWKBD_CALLBACK_CONTINUE;
+    }
+    return SWKBD_CALLBACK_OK;
+}
+
+static void jump_menu(Entry_List_s * list)
+{
+    if(list == NULL) return;
+
+    char numbuf[64] = {0};
+
+    SwkbdState swkbd;
+
+    sprintf(numbuf, "%"  JSON_INTEGER_FORMAT, list->tp_page_count);
+    int max_chars = strlen(numbuf);
+    swkbdInit(&swkbd, SWKBD_TYPE_NUMPAD, 2, max_chars);
+
+    sprintf(numbuf, "%"  JSON_INTEGER_FORMAT, list->tp_current_page);
+    swkbdSetInitialText(&swkbd, numbuf);
+
+    sprintf(numbuf, "Which page do you want to jump to?");
+    swkbdSetHintText(&swkbd, numbuf);
+
+    swkbdSetButton(&swkbd, SWKBD_BUTTON_LEFT, "Cancel", false);
+    swkbdSetButton(&swkbd, SWKBD_BUTTON_RIGHT, "Jump", true);
+    swkbdSetValidation(&swkbd, SWKBD_NOTEMPTY_NOTBLANK, 0, max_chars);
+    swkbdSetFilterCallback(&swkbd, jump_menu_callback, &list->tp_page_count);
+
+    memset(numbuf, 0, sizeof(numbuf));
+    SwkbdButton button = swkbdInputText(&swkbd, numbuf, sizeof(numbuf));
+    if(button == SWKBD_BUTTON_CONFIRM)
+    {
+        json_int_t newpage = (json_int_t)atoi(numbuf);
+        if(newpage != list->tp_current_page)
+            load_remote_list(list, newpage, list->mode, false);
+    }
+}
+
+static void search_menu(Entry_List_s * list)
+{
+    const int max_chars = 256;
+    char * search = calloc(max_chars+1, sizeof(char));
+
+    SwkbdState swkbd;
+
+    swkbdInit(&swkbd, SWKBD_TYPE_WESTERN, 2, max_chars);
+    swkbdSetHintText(&swkbd, "Which tags do you want to search for?");
+
+    swkbdSetButton(&swkbd, SWKBD_BUTTON_LEFT, "Cancel", false);
+    swkbdSetButton(&swkbd, SWKBD_BUTTON_RIGHT, "Search", true);
+    swkbdSetValidation(&swkbd, SWKBD_NOTBLANK, 0, max_chars);
+
+    SwkbdButton button = swkbdInputText(&swkbd, search, max_chars);
+    if(button == SWKBD_BUTTON_CONFIRM)
+    {
+        free(list->tp_search);
+        for(unsigned int i = 0; i < strlen(search); i++)
+        {
+            if(search[i] == ' ')
+                search[i] = '+';
+        }
+        list->tp_search = search;
+        load_remote_list(list, 1, list->mode, false);
+    }
+    else
+    {
+        free(search);
+    }
+}
+
+static void change_selected(Entry_List_s * list, int change_value)
+{
+    if(abs(change_value) >= list->entries_count) return;
+
+    int newval = list->selected_entry + change_value;
+
+    if(abs(change_value) == 1)
+    {
+        if(newval < 0)
+            newval += list->entries_per_screen_h;
+        if(newval/list->entries_per_screen_h != list->selected_entry/list->entries_per_screen_h)
+            newval += list->entries_per_screen_h*(-change_value);
+    }
+    else
+    {
+        if(newval < 0)
+            newval += list->entries_per_screen_h*list->entries_per_screen_v;
+        newval %= list->entries_count;
+    }
+    list->selected_entry = newval;
+}
+
+bool themeplaza_browser(EntryMode mode)
+{
+    bool downloaded = false;
+
+    bool preview_mode = false;
+    int preview_offset = 0;
+    audio_s * audio = NULL;
+
+    Entry_List_s list = {0};
+    Entry_List_s * current_list = &list;
+    current_list->tp_search = strdup("");
+    load_remote_list(current_list, 1, mode, false);
+
+    bool extra_mode = false;
+
+    while(aptMainLoop())
+    {
+        if(current_list->entries == NULL)
+            break;
+
+        if(preview_mode)
+            draw_preview(TEXTURE_REMOTE_PREVIEW, preview_offset);
+        else
+        {
+            Instructions_s instructions = browser_instructions[mode];
+            if(extra_mode)
+                instructions = extra_instructions;
+            draw_grid_interface(current_list, instructions);
+        }
+        pp2d_end_draw();
+
+        hidScanInput();
+        u32 kDown = hidKeysDown();
+        u32 kHeld = hidKeysHeld();
+        u32 kUp = hidKeysUp();
+
+
+
+        if(kDown & KEY_START)
+        {
+            exit:
+            quit = true;
+            downloaded = false;
+            if(audio)
+                audio->stop = true;
+            break;
+        }
+
+        if(extra_mode)
+        {
+            if(kUp & KEY_X)
+                extra_mode = false;
+            if(!extra_mode)
+            {
+                if((kDown | kHeld) & KEY_DLEFT)
+                {
+                    change_mode:
+                    mode++;
+                    mode %= MODE_AMOUNT;
+
+                    free(current_list->tp_search);
+                    current_list->tp_search = strdup("");
+
+                    load_remote_list(current_list, 1, mode, false);
+                }
+                else if((kDown | kHeld) & KEY_DUP)
+                {
+                    jump_menu(current_list);
+                }
+                else if((kDown | kHeld) & KEY_DRIGHT)
+                {
+                    load_remote_list(current_list, current_list->tp_current_page, mode, true);
+                }
+                else if((kDown | kHeld) & KEY_DDOWN)
+                {
+                    search_menu(current_list);
+                }
+            }
+            continue;
+        }
+
+        int selected_entry = current_list->selected_entry;
+        Entry_s * current_entry = &current_list->entries[selected_entry];
+
+        if(kDown & KEY_Y)
+        {
+            toggle_preview:
+            if(!preview_mode)
+            {
+                preview_mode = load_remote_preview(current_entry, &preview_offset);
+                if(mode == MODE_THEMES)
+                {
+                    load_remote_bgm(current_entry);
+                    audio = calloc(1, sizeof(audio_s));
+                    load_audio(*current_entry, audio);
+                    play_audio(audio);
+                }
+            }
+            else
+            {
+                preview_mode = false;
+                if(mode == MODE_THEMES && audio)
+                    audio->stop = true;
+            }
+        }
+        else if(kDown & KEY_B)
+        {
+            if(preview_mode)
+            {
+                preview_mode = false;
+                if(mode == MODE_THEMES && audio)
+                    audio->stop = true;
+            }
+            else
+                break;
+        }
+
+        if(preview_mode)
+            goto touch;
+
+        if(kDown & KEY_A)
+        {
+            download_remote_entry(current_entry, mode);
+            downloaded = true;
+        }
+        else if(kDown & KEY_X)
+        {
+            extra_mode = true;
+        }
+        else if(kDown & KEY_L)
+        {
+            load_remote_list(current_list, current_list->tp_current_page-1, mode, false);
+        }
+        else if(kDown & KEY_R)
+        {
+            load_remote_list(current_list, current_list->tp_current_page+1, mode, false);
+        }
+
+        // Movement in the UI
+        else if(kDown & KEY_UP)
+        {
+            change_selected(current_list, -current_list->entries_per_screen_h);
+        }
+        else if(kDown & KEY_DOWN)
+        {
+            change_selected(current_list, current_list->entries_per_screen_h);
+        }
+        // Quick moving
+        else if(kDown & KEY_LEFT)
+        {
+            change_selected(current_list, -1);
+        }
+        else if(kDown & KEY_RIGHT)
+        {
+            change_selected(current_list, 1);
+        }
+
+        // Fast scroll using circle pad
+        else if(kHeld & KEY_CPAD_UP)
+        {
+            change_selected(current_list, -1);
+            svcSleepThread(FASTSCROLL_WAIT);
+        }
+        else if(kHeld & KEY_CPAD_DOWN)
+        {
+            change_selected(current_list, 1);
+            svcSleepThread(FASTSCROLL_WAIT);
+        }
+        else if(kHeld & KEY_CPAD_LEFT)
+        {
+            change_selected(current_list, -current_list->entries_per_screen_v);
+            svcSleepThread(FASTSCROLL_WAIT);
+        }
+        else if(kHeld & KEY_CPAD_RIGHT)
+        {
+            change_selected(current_list, current_list->entries_per_screen_v);
+            svcSleepThread(FASTSCROLL_WAIT);
+        }
+
+        touch:
+        if((kDown | kHeld) & KEY_TOUCH)
+        {
+            touchPosition touch = {0};
+            hidTouchRead(&touch);
+
+            u16 x = touch.px;
+            u16 y = touch.py;
+
+            #define BETWEEN(min, x, max) (min < x && x < max)
+
+            int border = 16;
+            if(kDown & KEY_TOUCH)
+            {
+                if(preview_mode)
+                {
+                    preview_mode = false;
+                    if(mode == MODE_THEMES && audio)
+                        audio->stop = true;
+                    continue;
+                }
+                else if(y < 24)
+                {
+                    if(BETWEEN(0, x, 80))
+                    {
+                        search_menu(current_list);
+                    }
+                    else if(BETWEEN(320-96, x, 320-72))
+                    {
+                        break;
+                    }
+                    else if(BETWEEN(320-72, x, 320-48))
+                    {
+                        goto exit;
+                    }
+                    else if(BETWEEN(320-48, x, 320-24))
+                    {
+                        goto toggle_preview;
+                    }
+                    else if(BETWEEN(320-24, x, 320))
+                    {
+                        goto change_mode;
+                    }
+                }
+                else if(BETWEEN(240-24, y, 240) && BETWEEN(176, x, 320))
+                {
+                    jump_menu(current_list);
+                }
+                else
+                {
+                    if(BETWEEN(0, x, border))
+                    {
+                        load_remote_list(current_list, current_list->tp_current_page-1, mode, false);
+                    }
+                    else if(BETWEEN(320-border, x, 320))
+                    {
+                        load_remote_list(current_list, current_list->tp_current_page+1, mode, false);
+                    }
+                }
+            }
+            else
+            {
+                if(preview_mode)
+                {
+                    preview_mode = false;
+                    continue;
+                }
+                else if(BETWEEN(24, y, 240-24))
+                {
+                    if(BETWEEN(border, x, 320-border))
+                    {
+                        x -= border;
+                        x /= current_list->entry_size;
+                        y -= 24;
+                        y /= current_list->entry_size;
+                        int new_selected = y*current_list->entries_per_screen_h + x;
+                        if(new_selected < current_list->entries_count)
+                            current_list->selected_entry = new_selected;
+                    }
+                }
+            }
+        }
+    }
+
+    free(current_list->entries);
+    free(current_list->icons_ids);
+    free(current_list->tp_search);
+
+    return downloaded;
+}
+
+u32 http_get(const char *url, char ** filename, char ** buf)
+{
+    Result ret;
+    httpcContext context;
+    char *new_url = NULL;
+    u32 status_code;
+    u32 content_size = 0;
+    u32 read_size = 0;
+    u32 size = 0;
+    char *last_buf;
+
+    do {
+        ret = httpcOpenContext(&context, HTTPC_METHOD_GET, url, 1);
+        if (ret != 0)
+        {
+            httpcCloseContext(&context);
+            if (new_url != NULL) free(new_url);
+            DEBUG("httpcOpenContext %.8lx\n", ret);
+            return 0;
+        }
+        ret = httpcSetSSLOpt(&context, SSLCOPT_DisableVerify); // should let us do https
+        ret = httpcSetKeepAlive(&context, HTTPC_KEEPALIVE_ENABLED);
+        ret = httpcAddRequestHeaderField(&context, "User-Agent", USER_AGENT);
+        ret = httpcAddRequestHeaderField(&context, "Connection", "Keep-Alive");
+
+        ret = httpcBeginRequest(&context);
+        if (ret != 0)
+        {
+            httpcCloseContext(&context);
+            if (new_url != NULL) free(new_url);
+            DEBUG("httpcBeginRequest %.8lx\n", ret);
+            return 0;
+        }
+
+        ret = httpcGetResponseStatusCode(&context, &status_code);
+        if(ret!=0){
+            httpcCloseContext(&context);
+            if(new_url!=NULL) free(new_url);
+            DEBUG("httpcGetResponseStatusCode\n");
+            return 0;
+        }
+
+        if ((status_code >= 301 && status_code <= 303) || (status_code >= 307 && status_code <= 308))
+        {
+            if (new_url == NULL) new_url = malloc(0x1000);
+            ret = httpcGetResponseHeader(&context, "Location", new_url, 0x1000);
+            url = new_url;
+            httpcCloseContext(&context);
+        }
+    } while ((status_code >= 301 && status_code <= 303) || (status_code >= 307 && status_code <= 308));
+
+    if (status_code != 200)
+    {
+        httpcCloseContext(&context);
+        if (new_url != NULL) free(new_url);
+        DEBUG("status_code, %lu\n", status_code);
+        return 0;
+    }
+
+    ret = httpcGetDownloadSizeState(&context, NULL, &content_size);
+    if (ret != 0)
+    {
+        httpcCloseContext(&context);
+        if (new_url != NULL) free(new_url);
+        DEBUG("httpcGetDownloadSizeState\n");
+        return 0;
+    }
+
+    *buf = malloc(0x1000);
+    if (*buf == NULL)
+    {
+        httpcCloseContext(&context);
+        free(new_url);
+        DEBUG("malloc\n");
+        return 0;
+    }
+
+    if(filename)
+    {
+        char *content_disposition = calloc(1024, sizeof(char));
+        ret = httpcGetResponseHeader(&context, "Content-Disposition", content_disposition, 1024);
+        if (ret != 0)
+        {
+            free(content_disposition);
+            free(new_url);
+            free(*buf);
+            DEBUG("httpcGetResponseHeader\n");
+            return 0;
+        }
+
+        char * tok = strtok(content_disposition, "\"");
+        tok = strtok(NULL, "\"");
+
+        if(!(tok))
+        {
+            free(content_disposition);
+            free(new_url);
+            free(*buf);
+            throw_error("Target is not valid!", ERROR_LEVEL_WARNING);
+            DEBUG("filename\n");
+            return 0;
+        }
+
+        char *illegal_characters = "\"?;:/\\+";
+        for (size_t i = 0; i < strlen(tok); i++)
+        {
+            for (size_t n = 0; n < strlen(illegal_characters); n++)
+            {
+                if ((tok)[i] == illegal_characters[n])
+                {
+                    (tok)[i] = '-';
+                }
+            }
+        }
+
+        *filename = calloc(1024, sizeof(char));
+        strcpy(*filename, tok);
+        free(content_disposition);
+    }
+
+    do {
+        ret = httpcDownloadData(&context, (*(u8**)buf) + size, 0x1000, &read_size);
+        size += read_size;
+
+        if (ret == (s32)HTTPC_RESULTCODE_DOWNLOADPENDING)
+        {
+            last_buf = *buf;
+            *buf = realloc(*buf, size + 0x1000);
+            if (*buf == NULL)
+            {
+                httpcCloseContext(&context);
+                free(new_url);
+                free(last_buf);
+                DEBUG("NULL\n");
+                return 0;
+            }
+        }
+    } while (ret == (s32)HTTPC_RESULTCODE_DOWNLOADPENDING);
+
+    last_buf = *buf;
+    *buf = realloc(*buf, size);
+    if (*buf == NULL)
+    {
+        httpcCloseContext(&context);
+        free(new_url);
+        free(last_buf);
+        DEBUG("realloc\n");
+        return 0;
+    }
+
+    httpcCloseContext(&context);
+    free(new_url);
+
+    DEBUG("size: %lu\n", size);
+    return size;
+}
--- a/source/splashes.c
+++ b/source/splashes.c
@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2017 Alex Taber ("astronautlevel"), Dawid Eckert ("daedreth")
+*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -41,15 +41,15 @@ void splash_install(Entry_s splash)
    u32 size = load_data("/splash.bin", splash, &screen_buf);
    if(size != 0)
    {
-        remake_file("/luma/splash.bin", ArchiveSD, size);
-        buf_to_file(size, "/luma/splash.bin", ArchiveSD, screen_buf);
+        remake_file(fsMakePath(PATH_ASCII, "/luma/splash.bin"), ArchiveSD, size);
+        buf_to_file(size, fsMakePath(PATH_ASCII, "/luma/splash.bin"), ArchiveSD, screen_buf);
    }

    u32 bottom_size = load_data("/splashbottom.bin", splash, &screen_buf);
    if(bottom_size != 0)
    {
-        remake_file("/luma/splashbottom.bin", ArchiveSD, bottom_size);
-        buf_to_file(bottom_size, "/luma/splashbottom.bin", ArchiveSD, screen_buf);
+        remake_file(fsMakePath(PATH_ASCII, "/luma/splashbottom.bin"), ArchiveSD, bottom_size);
+        buf_to_file(bottom_size, fsMakePath(PATH_ASCII, "/luma/splashbottom.bin"), ArchiveSD, screen_buf);
    }

    if(size == 0 && bottom_size == 0)
--- a/source/themes.c
+++ b/source/themes.c
@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2017 Alex Taber ("astronautlevel"), Dawid Eckert ("daedreth")
+*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -44,9 +44,9 @@ static Result install_theme_internal(Entry_List_s themes, int installmode)

    if(installmode & THEME_INSTALL_SHUFFLE)
    {
-        if(themes.shuffle_count == 0)
+        if(themes.shuffle_count < 2)
        {
-            DEBUG("no themes selected for shuffle\n");
+            DEBUG("not enough themes selected for shuffle\n");
            return MAKERESULT(RL_USAGE, RS_INVALIDARG, RM_COMMON, RD_INVALID_SELECTION);
        }

@@ -56,12 +56,14 @@ static Result install_theme_internal(Entry_List_s themes, int installmode)
            return MAKERESULT(RL_USAGE, RS_INVALIDARG, RM_COMMON, RD_INVALID_SELECTION);
        }

+        char * padded = NULL;
+
        int shuffle_count = 0;
        Handle body_cache_handle;

        if(installmode & THEME_INSTALL_BODY)
        {
-            remake_file("/BodyCache_rd.bin", ArchiveThemeExt, BODY_CACHE_SIZE * MAX_SHUFFLE_THEMES);
+            remake_file(fsMakePath(PATH_ASCII, "/BodyCache_rd.bin"), ArchiveThemeExt, BODY_CACHE_SIZE * MAX_SHUFFLE_THEMES);
            FSUSER_OpenFile(&body_cache_handle, ArchiveThemeExt, fsMakePath(PATH_ASCII, "/BodyCache_rd.bin"), FS_OPEN_WRITE, 0);
        }

@@ -83,8 +85,15 @@ static Result install_theme_internal(Entry_List_s themes, int installmode)
                    }

                    shuffle_body_sizes[shuffle_count] = body_size;
-                    FSFILE_Write(body_cache_handle, NULL, BODY_CACHE_SIZE * shuffle_count, body, body_size, FS_WRITE_FLUSH);
+
+                    padded = calloc(BODY_CACHE_SIZE, sizeof(char));
+                    memcpy(padded, body, body_size);
                    free(body);
+
+                    FSFILE_Write(body_cache_handle, NULL, BODY_CACHE_SIZE * shuffle_count, padded, BODY_CACHE_SIZE, FS_WRITE_FLUSH);
+
+                    free(padded);
+                    padded = NULL;
                }

                if(installmode & THEME_INSTALL_BGM)
@@ -101,9 +110,20 @@ static Result install_theme_internal(Entry_List_s themes, int installmode)
                    }

                    shuffle_music_sizes[shuffle_count] = music_size;
-                    remake_file(bgm_cache_path, ArchiveThemeExt, BGM_MAX_SIZE);
-                    buf_to_file(music_size, bgm_cache_path, ArchiveThemeExt, music);
+                    remake_file(fsMakePath(PATH_ASCII, bgm_cache_path), ArchiveThemeExt, BGM_MAX_SIZE);
+
+                    Handle bgm_cache_handle;
+                    FSUSER_OpenFile(&bgm_cache_handle, ArchiveThemeExt, fsMakePath(PATH_ASCII, bgm_cache_path), FS_OPEN_WRITE, 0);
+
+                    padded = calloc(BGM_MAX_SIZE, sizeof(char));
+                    memcpy(padded, music, music_size);
                    free(music);
+
+                    FSFILE_Write(bgm_cache_handle, NULL, 0, padded, BGM_MAX_SIZE, FS_WRITE_FLUSH);
+
+                    FSFILE_Close(bgm_cache_handle);
+                    free(padded);
+                    padded = NULL;
                }

                shuffle_count++;
@@ -112,12 +132,15 @@ static Result install_theme_internal(Entry_List_s themes, int installmode)

        if(installmode & THEME_INSTALL_BGM)
        {
+            char * blank = calloc(BGM_MAX_SIZE, sizeof(char));
            for(int i = shuffle_count; i < MAX_SHUFFLE_THEMES; i++)
            {
                char bgm_cache_path[26] = {0};
                sprintf(bgm_cache_path, "/BgmCache_%.2i.bin", i);
-                remake_file(bgm_cache_path, ArchiveThemeExt, BGM_MAX_SIZE);
+                remake_file(fsMakePath(PATH_ASCII, bgm_cache_path), ArchiveThemeExt, BGM_MAX_SIZE);
+                buf_to_file(BGM_MAX_SIZE, fsMakePath(PATH_ASCII, bgm_cache_path), ArchiveThemeExt, blank);
            }
+            free(blank);
        }

        if(installmode & THEME_INSTALL_BODY)
@@ -140,7 +163,7 @@ static Result install_theme_internal(Entry_List_s themes, int installmode)
                return MAKERESULT(RL_PERMANENT, RS_CANCELED, RM_APPLICATION, RD_NOT_FOUND);
            }

-            res = buf_to_file(body_size, "/BodyCache.bin", ArchiveThemeExt, body); // Write body data to file
+            res = buf_to_file(body_size, fsMakePath(PATH_ASCII, "/BodyCache.bin"), ArchiveThemeExt, body); // Write body data to file
            free(body);

            if(R_FAILED(res)) return res;
@@ -156,7 +179,7 @@ static Result install_theme_internal(Entry_List_s themes, int installmode)
                return MAKERESULT(RL_PERMANENT, RS_CANCELED, RM_APPLICATION, RD_TOO_LARGE);
            }

-            res = buf_to_file(music_size, "/BgmCache.bin", ArchiveThemeExt, music);
+            res = buf_to_file(music_size, fsMakePath(PATH_ASCII, "/BgmCache.bin"), ArchiveThemeExt, music);
            free(music);

            if(R_FAILED(res)) return res;
@@ -195,7 +218,7 @@ static Result install_theme_internal(Entry_List_s themes, int installmode)
    theme_manage->dlc_theme_content_index = 0xFF;
    theme_manage->use_theme_cache = 0x0200;

-    res = buf_to_file(0x800, "/ThemeManage.bin", ArchiveThemeExt, thememanage_buf);
+    res = buf_to_file(0x800, fsMakePath(PATH_ASCII, "/ThemeManage.bin"), ArchiveThemeExt, thememanage_buf);
    free(thememanage_buf);
    if(R_FAILED(res)) return res;
    //----------------------------------------
@@ -220,7 +243,7 @@ static Result install_theme_internal(Entry_List_s themes, int installmode)
        }
    }

-    res = buf_to_file(savedata_size, "/SaveData.dat", ArchiveHomeExt, savedata_buf);
+    res = buf_to_file(savedata_size, fsMakePath(PATH_ASCII, "/SaveData.dat"), ArchiveHomeExt, savedata_buf);
    free(savedata_buf);
    if(R_FAILED(res)) return res;
    //----------------------------------------
--- a/source/unicode.c
+++ b/source/unicode.c
@@ -1,6 +1,6 @@
 /*
 *   This file is part of Anemone3DS
-*   Copyright (C) 2016-2017 Alex Taber ("astronautlevel"), Dawid Eckert ("daedreth")
+*   Copyright (C) 2016-2018 Contributors in CONTRIBUTORS.md
 *
 *   This program is free software: you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
@@ -48,7 +48,9 @@ void printu(u16 *input)
    ssize_t buf_len = in_len + 1; // Plus 1 for proper null termination
    wchar_t *buf = calloc(buf_len, sizeof(wchar_t));
    utf16_to_utf32((u32*)buf, input, buf_len);
-    printf("%ls\n", buf);
+    char cbuf[0x106];
+    sprintf(cbuf, "%ls\n", buf);
+    DEBUG(cbuf);
    free(buf);
 }
Author	SHA1	Message	Date
LiquidFenrir	8022ed1682	add bgm preview to the themeplaza browser and prevent some errors	2018-05-10 13:53:51 +02:00
Alex Taber	5520ec2b2f	Move load_audio into loading.c for consistency	2018-05-10 07:40:28 -04:00
Alex Taber	f2aa7420df	Add support for zip BGM preview	2018-05-10 06:49:03 -04:00
Alex Taber	05b56b1aa1	Add BGM Preview Functionality Some code adapted from Themely. Thanks to ErmanSayin	2018-05-09 22:26:39 -04:00
LiquidFenrir	cac2450fde	fix copy-paste error	2018-05-09 00:22:34 +02:00
Alex Taber	1c24d08eef	restore shuffle install speed back to roughly 30 seconds (#156 )	2018-05-08 18:17:14 -04:00
Alex Taber	24b12023ca	always 0-pad stuff (#155 )	2018-05-08 16:39:22 -04:00
FrozenChen	9ccc705046	Make uncompressed logo smaller because of home menu bug (#150 ) Closes #146	2018-04-15 21:17:31 -04:00
Alex Taber	95d8808a73	Copyright Update * Replaced contributors section in README with CONTRIBUTORS.md * Updated copyright notice to include all contributors * Updated SMDH	2018-04-10 16:09:10 -04:00
LiquidFenrir	6c2f09147f	Themeplaza caching (#147 ) * change fs to use a FS_Path argument for remake_file and buf_to_file * more debug information when downloading * browser caching v1: poc, works and is fast but not ideal * add preview to cache * this wasnt meant to be added now	2018-04-10 15:12:37 -04:00
LiquidFenrir	7b1d6f9860	implement L and R as extra menus instead of extra keys for X (#148 ) L is now the sorting menu R is unused	2018-04-09 19:28:37 -04:00
LiquidFenrir	6f7c2489d5	Different sorting modes (#143 ) (#145 )	2018-04-04 22:04:45 +02:00
LiquidFenrir	38e70df17b	Forgot to update the bottom screen when there's no entry (fix #144 )	2018-04-04 11:40:38 +02:00
Helloman892	ad6117404f	updated readme to fit: dkP updates, buildtools updates, library changes, lexigraphical errors	2018-04-03 23:48:47 +01:00
LiquidFenrir	47de3eb171	use X for extra options, behaves like A for installing themes	2018-04-03 21:17:34 +02:00
LiquidFenrir	02c1aab3f3	add warning for people using *hax entrypoints	2018-04-02 13:42:00 +02:00
LiquidFenrir	cd69aa7ef7	Switch to libarchive and camera autodetect between splashes and themes (#142 ) * switch to libarchive and get rid of minizip, introduce zip_memory_to_buf * automatically detect whether the downloaded zip is a splash or a theme * slightly simpler way	2018-04-01 22:21:31 +02:00
LiquidFenrir	a2b5788fe8	Themeplaza browser (#140 ) * builds at least * meh, multithreading will come later. or never * movement added, and correct grid mode * switching splash/themes when in browser mode * closer to the actual themeplaza menu * bring back downloading from qr * show a download screen when downloading from browser * fix selecting with touchscreen in browser mode * update readme for jansson * fix quitting with start in browser mode * add jump menu for browser mode * rotate is broken, add working touchscreen page changing * allow quitting preview mode with B in browser mode * proper way to have portlibs * add searching * show error when search has no results * always free entries and icon ids	2018-03-31 20:31:46 -04:00
LiquidFenrir	5090da114f	fix shuffle brick (#134 )	2018-01-28 02:37:52 +01:00
Dylan G	f01e347b17	Merge pull request #129 from TurtleP/master add Flask meta	2018-01-13 21:36:19 +00:00
=	82f6e073ce	add Flask meta	2018-01-13 16:32:55 -05:00
LiquidFenrir	ed94610d0f	fix citra compatibility	2018-01-02 13:14:53 +01:00
LiquidFenrir	fbbb4f590d	fix jump menu scrolling bug leave everything to handle_scrolling	2018-01-01 23:37:14 +01:00