diff --git a/Source/Menu-FN/entry.cpp b/Source/Menu-FN/entry.cpp
index 22e7920c..a1353f6b 100644
--- a/Source/Menu-FN/entry.cpp
+++ b/Source/Menu-FN/entry.cpp
@@ -24,6 +24,9 @@ void m_init(void)
 	localcmd("con_textsize -12\n");
 	localcmd("scr_conalpha 1\n");
 	localcmd("cl_idlefps 0\n");
+	localcmd("gl_font 0\n");
+	registercommand("menu_customgame");
+
 
 	shaderforname("logo_avi", "{\n{\nvideomap av:media/logo.avi\n}\n}");
 
@@ -160,6 +163,9 @@ float m_consolecommand(string cmd)
 {
 	tokenize(cmd);
 	switch (argv(0)) {
+		case "menu_customgame":
+			g_menupage = PAGE_CUSTOMGAME;
+			break;
 		case "togglemenu":
 			m_display();
 			break;
diff --git a/Source/Menu-FN/m_customgame.cpp b/Source/Menu-FN/m_customgame.cpp
index 59b92843..ab4f247f 100644
--- a/Source/Menu-FN/m_customgame.cpp
+++ b/Source/Menu-FN/m_customgame.cpp
@@ -72,7 +72,7 @@ void games_init(void)
 
 	for (gameidx = 0; (gamedirname = getgamedirinfo(gameidx, 0)); gameidx++) {
 		gamedescription = getgamedirinfo(gameidx, 1);
-		county = tokenize(gamedescription);
+		county = tokenize_console(gamedescription);
 		
 		/* Fill in the defaults */
 		games[gameidx].game = gamedirname;
@@ -174,12 +174,10 @@ CMainButton customgame_btnDone;
 void customgame_btnactivate_start(void)
 {
 	int nextgame = customgame_lbMods.GetSelected();
-	if (!nextgame) {
-		return;
-	}
-	
+
 	gameinfo_current = nextgame;
 	localcmd(sprintf("gamedir \"%s\"\n", games[nextgame].gamedir));
+	localcmd("snd_restart\nwait\nmenu_restart\nmenu_customgame\n");
 	// TODO: Re-init important menu bits and bobs.
 
 	//m_shutdown();
diff --git a/Source/Menu-FN/w_modlist.cpp b/Source/Menu-FN/w_modlist.cpp
new file mode 100644
index 00000000..34bec138
--- /dev/null
+++ b/Source/Menu-FN/w_modlist.cpp
@@ -0,0 +1,160 @@
+/***
+*
+*	Copyright (c) 2016-2019 Marco 'eukara' Hladik. All rights reserved.
+*
+*	See the file LICENSE attached with the sources for usage details.
+*
+****/
+
+/* Those seem to be hardcoded? None of the default colors match */
+#define ML_COL_1 [255,127,24] / 255 // Unselected Main
+#define ML_COL_2 [255,200,24] / 255 // Selected Main
+#define ML_COL_3 [240,180,20] / 255 // Other
+#define ML_COL_4 [200,200,200] / 255 // Grey Info
+
+#define GAME_DIR "valve" // THE game dir ignored in the mod menu.
+
+class CModList:CWidget
+{
+	int m_size[2];
+
+	int m_scroll;
+	int m_selected;
+	//virtual void(int val) m_execute = 0;
+
+	void() CModList;
+	virtual void() Draw;
+	virtual void(float type, float x, float y, float devid) Input;
+
+	virtual void(int w, int h) SetSize;
+	//virtual void(void(int val) func) SetChanged;
+	virtual void(int i) SetSelected;
+	virtual int() GetSelected;
+};
+
+void CModList::CModList(void)
+{
+	m_selected = -1;
+}
+
+void CModList::Draw(void)
+{
+	int visible;
+	int pos;
+	drawfill([g_menuofs[0] + m_x, g_menuofs[1] + m_y], [m_size[0], m_size[1]], 
+			 [0,0,0], 1.0f);
+
+	visible = floor(m_size[1] / 15);
+	visible = bound(0, visible, gameinfo_count);
+	pos = m_y;
+
+	for ( int i = m_scroll; i < (visible + m_scroll); i++) {
+		vector colo;
+		if (games[i].gamedir == GAME_DIR) {
+			continue;
+		}
+		if (m_selected == i) {
+			colo = ML_COL_2;
+			drawfill([g_menuofs[0] + m_x, pos], [m_size[0], 29], 
+			 [84/255,45/255,0], 1.0f);
+		} else {
+			colo = ML_COL_1;
+		}
+
+		if (games[i].type != "") {
+			WLabel_Static(m_x + 2, pos + 3, sprintf("%.8s...",games[i].type),
+						  11, 11, colo, 1.0f, 0, font_arial);
+		}
+		
+		/* Game */
+		WLabel_Static(m_x + 57, pos + 3, games[i].game, 11, 11, colo,
+					1.0f, 0, font_arial);
+		/* URL */
+		WLabel_Static(m_x + 2, pos + 18, sprintf("Info: %s", games[i].url_info), 11, 11, ML_COL_4,
+					1.0f, 0, font_arial);
+		/* Version */
+		WLabel_Static(m_x + 177, pos + 3, games[i].version, 11, 11, colo,
+					1.0f, 0, font_arial);
+		/* Size */
+		float size = games[i].size / 1024000;
+		WLabel_Static(m_x + 227, pos + 3, sprintf("%.1fmb", size), 11, 11, colo,
+					1.0f, 0, font_arial);
+		/* Rating */
+		WLabel_Static(m_x + 277, pos + 3, "0.0", 11, 11, colo,
+					1.0f, 0, font_arial);
+		/* Installed */
+		WLabel_Static(m_x + 327, pos + 3, "Yes", 11, 11, ML_COL_3,
+					1.0f, 0, font_arial);
+		/* Servers */
+		WLabel_Static(m_x + 377, pos + 3, "0", 11, 11, ML_COL_3,
+					1.0f, 0, font_arial);
+		/* Players */
+		WLabel_Static(m_x + 427, pos + 3, "0", 11, 11, ML_COL_3,
+					1.0f, 0, font_arial);
+		pos += 29;
+	}
+}
+
+void CModList::Input(float type, float x, float y, float devid)
+{
+	int visible;
+	int pos[2];
+
+	visible = floor(m_size[1] / 29);
+	visible = bound(0, visible, gameinfo_count);
+
+	pos[0] = m_x;
+	pos[1] = m_y;
+
+	for ( int i = m_scroll; i < (visible + m_scroll); i++) {
+		if (gameinfo_current == i) {
+			continue;
+		}
+		if (Util_CheckMouse(pos[0], pos[1], m_size[0], 29)) {
+			if (type == IE_KEYDOWN) {
+				if (x == K_MOUSE1) {
+					m_selected = i;
+					/*if (m_execute) {
+						m_execute(i);
+					}*/
+					break;
+				}
+			}
+		}
+		pos[1] += 29;
+	}
+}
+
+void CModList::SetSize(int w, int h)
+{
+	m_size[0] = w;
+	m_size[1] = h;
+}
+
+void CModList::SetScroll(int i)
+{
+	m_scroll = i;
+}
+
+/*void CModList::SetChanged(void(int val) func)
+{
+	m_execute = func;
+}*/
+
+void CModList::SetSelected(int i)
+{
+	m_selected = i;
+}
+
+int CModList::GetSelected(void)
+{
+	return m_selected;
+}
+
+/*string CModList::GetSelectedItem(void)
+{
+	if (m_selected == -1) {
+		return __NULL__;
+	}
+	return m_entries[m_selected];
+}*/
diff --git a/Source/Server/Server.kdev4 b/Source/Server/Server.kdev4
deleted file mode 100755
index 09b2ecc0..00000000
--- a/Source/Server/Server.kdev4
+++ /dev/null
@@ -1,4 +0,0 @@
-[Project]
-CreatedFrom=Makefile
-Manager=KDevCustomMakeManager
-Name=Server