diff --git a/hbas.elf b/hbas.elf
index 2e96a5b..642b129 100755
Binary files a/hbas.elf and b/hbas.elf differ
diff --git a/hbas_dbg.elf b/hbas_dbg.elf
index 7e214c4..718570d 100755
Binary files a/hbas_dbg.elf and b/hbas_dbg.elf differ
diff --git a/src/menu/MainWindow.cpp b/src/menu/MainWindow.cpp
index 878b263..590ae7d 100644
--- a/src/menu/MainWindow.cpp
+++ b/src/menu/MainWindow.cpp
@@ -73,7 +73,7 @@ MainWindow::MainWindow(int w, int h)
 void asyncRefreshHomebrewAppIcons(CThread* thread, void* args)
 {
     log_printf("NEW THREAD START: Icon async refresh");
-    homebrewWindow->populateIconCache();
+//    homebrewWindow->populateIconCache();
     log_printf("EXISTING THREAD END: Icon async refresh");
 }
 
diff --git a/web/gen.py b/web/gen.py
deleted file mode 100644
index 83e8a5a..0000000
--- a/web/gen.py
+++ /dev/null
@@ -1,134 +0,0 @@
-#! /usr/bin/python
-# Version 2
-# This script generates the directory of apps
-# which is parsed by the client app
-# and creates the web interface for wiiubru(by default)
-
-# in particiular, this script will generate homebrew zips,
-# icon zips, and a directory json
-
-import os, json, zipfile, datetime, time
-import xml.etree.ElementTree as ET
-
-# This function zips the incoming path into the file in ziph
-def zipdir(path, ziph):
-	for root, dirs, files in os.walk(path):
-		for file in files:
-			ziph.write(os.path.join(root, file))
-			
-# This function parses out several attributes from xml
-def xml_read(incoming):
-	outgoing = []
-	for key in incoming:
-		try:
-			outgoing.append(tree.find(key).text)
-		except:
-			outgoing.append("N/A")
-	return tuple(outgoing)
-
-# create the zips directory
-try:
-	os.mkdir("zips")
-except:
-	pass
-
-# the resulting json output
-out = {}
-out["apps"] = []
-
-# read lasts updated info from a "cache.txt" file
-cache = {}
-try:
-	contents = open("cache.txt", "r")
-	for line in contents:
-		line = line.replace("\n", "").split("\t")
-		name = line[1]
-		updated = line[0]
-		cache[name] = updated
-except:
-	pass
-
-apps = os.listdir("apps")
-
-for app in apps:
-	# ignore dotfiles
-	if app.startswith("."):
-		continue
-		
-	targdir = "apps"
-	
-	# get meta.xml file from HBL
-	xmlfile = targdir + "/%s/meta.xml" % app
-
-	# create some default fields
-	name = coder = desc = long_desc = version = source = updated = category = src_link = "N/A"
-	typee = "hbl"
-
-	# find a binary in this app folder
-	binary = None
-	for file in os.listdir(targdir + "/%s" % app):
-		if file.endswith(".elf"):
-			binary = file
-			updated = time.ctime(os.path.getmtime(targdir + "/%s" % app))
-
-	# if there's no binary found, continue
-	if not binary:
-		continue
-
-	# get fields out of xml
-	if os.path.isfile(xmlfile):
-		# parse the xml file
-		tree = ET.parse(xmlfile)
-
-		# pull out those attributes
-		name, coder, desc, source, long_desc, version, category = xml_read(["name", "coder", "short_description", "url", "long_description", "version", "category"])
-		
-	# sanitize long_desc for json output
-	long_desc = long_desc.replace("\n", "\\n").replace("\t", "\\t")
-	
-	# get icon path
-	icon = targdir + "/%s/icon.png" % app
-
-	# append to output json
-	out["apps"].append({"updated": updated, "directory": app, "name": name, "author": coder, "desc": desc, "url": source, "binary": binary, "long_desc": long_desc, "type": typee, "cat": category})
-	
-			
-	# if there's no update according to the cache
-	if app in cache and cache[app] == updated:
-		continue
-			
-	print "Compressing " + app + "..."
-
-	# zip up this app
-	zipf = zipfile.ZipFile("zips/%s.zip" % app, 'w', zipfile.ZIP_DEFLATED)
-	zipdir(targdir + "/%s" % app, zipf)
-	zipf.close()
-
-# last updated date
-out["updated"] = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-
-# json string formatting
-jsonstring = json.dumps(out, indent=4, separators=(',', ': '))
-
-# write it to file
-jsonout = open("directory.json", "w+")
-jsonout.write(jsonstring)
-jsonout.close()
-
-# compress the directory.json and app icons
-# to make downloading faster
-ziph = zipfile.ZipFile("directory.zip", 'w', zipfile.ZIP_DEFLATED)
-ziph.write("directory.json")
-for cur in out["apps"]:
-	ziph.write("apps/"+cur["directory"]+"/icon.png", cur["directory"]+".png")
-ziph.close()
-
-# write out the update times to a cache file
-cache_out = open("cache.txt", "w")
-for cur in out["apps"]:	cache_out.write(cur["updated"]+"\t"+cur["directory"]+"\n")
-cache_out.close()
-
-# print done and run legacy scripts
-print "Updated directory.json !!!"
-print "Running v1_gen.py for hbas 1.0..."
-os.system("python v1_gen.py")
\ No newline at end of file
diff --git a/web/v1/404.html b/web/v1/404.html
deleted file mode 100644
index f1b1cb3..0000000
--- a/web/v1/404.html
+++ /dev/null
@@ -1 +0,0 @@
-404
diff --git a/web/v1/hbas.png b/web/v1/hbas.png
deleted file mode 100644
index e8baab2..0000000
Binary files a/web/v1/hbas.png and /dev/null differ
diff --git a/web/v1/missing.png b/web/v1/missing.png
deleted file mode 100644
index feb52a4..0000000
Binary files a/web/v1/missing.png and /dev/null differ
diff --git a/webv1/.htaccess b/webv1/.htaccess
new file mode 100644
index 0000000..fa0bc68
--- /dev/null
+++ b/webv1/.htaccess
@@ -0,0 +1,8 @@
+Options +ExecCGI
+AddHandler cgi-script .py
+ErrorDocument 404 404
+<FilesMatch "\.(ttf|otf|eot|woff)$">
+  <IfModule mod_headers.c>
+    Header set Access-Control-Allow-Origin "*"
+  </IfModule>
+</FilesMatch>
diff --git a/web/v1/css/font-awesome.min.css b/webv1/css/font-awesome.min.css
similarity index 100%
rename from web/v1/css/font-awesome.min.css
rename to webv1/css/font-awesome.min.css
diff --git a/web/v1/css/tooltipster.bundle.min.css b/webv1/css/tooltipster.bundle.min.css
similarity index 100%
rename from web/v1/css/tooltipster.bundle.min.css
rename to webv1/css/tooltipster.bundle.min.css
diff --git a/web/v1/css/wiiubru.css b/webv1/css/wiiubru.css
similarity index 100%
rename from web/v1/css/wiiubru.css
rename to webv1/css/wiiubru.css
diff --git a/web/v1/gen.py b/webv1/gen.py
similarity index 100%
rename from web/v1/gen.py
rename to webv1/gen.py
diff --git a/web/v1/js/jquery-1.12.4.min.js b/webv1/js/jquery-1.12.4.min.js
similarity index 100%
rename from web/v1/js/jquery-1.12.4.min.js
rename to webv1/js/jquery-1.12.4.min.js
diff --git a/web/v1/js/sorttable.js b/webv1/js/sorttable.js
similarity index 100%
rename from web/v1/js/sorttable.js
rename to webv1/js/sorttable.js
diff --git a/web/v1/js/tooltipster.bundle.min.js b/webv1/js/tooltipster.bundle.min.js
similarity index 100%
rename from web/v1/js/tooltipster.bundle.min.js
rename to webv1/js/tooltipster.bundle.min.js
diff --git a/web/v1/refreshrepo.php b/webv1/refreshrepo.php
similarity index 100%
rename from web/v1/refreshrepo.php
rename to webv1/refreshrepo.php
diff --git a/web/v1/store-repo-conf.json b/webv1/store-repo-conf.json
similarity index 100%
rename from web/v1/store-repo-conf.json
rename to webv1/store-repo-conf.json
diff --git a/web/v1/store-repo-info.json b/webv1/store-repo-info.json
similarity index 100%
rename from web/v1/store-repo-info.json
rename to webv1/store-repo-info.json