diff --git a/entities/weapons/weapon_jb_base/server.lua b/entities/weapons/weapon_jb_base/server.lua
index 1a99df8..c2456fe 100644
--- a/entities/weapons/weapon_jb_base/server.lua
+++ b/entities/weapons/weapon_jb_base/server.lua
@@ -30,8 +30,8 @@
 -- ##                                                                                ##
 -- ####################################################################################
 
-resource.AddFile("materials/jailbreak_excl/crosshair.png");
+resource.AddSingleFile("materials/jailbreak_excl/crosshair.png");
 
 SWEP.Weight				= 5;
 SWEP.AutoSwitchTo		= false;
-SWEP.AutoSwitchFrom		= false;
\ No newline at end of file
+SWEP.AutoSwitchFrom		= false;
diff --git a/gamemode.txt b/gamemode.txt
new file mode 100644
index 0000000..e58cbf7
--- /dev/null
+++ b/gamemode.txt
@@ -0,0 +1,7 @@
+"Jail Break"
+{
+	"base"		"base"
+	"title"		"Jail Break"
+	"maps"		"^jb_"
+	"menusystem"	"1"
+}
diff --git a/gamemode/core/cl_logs.lua b/gamemode/core/cl_logs.lua
index 6633279..4499df3 100644
--- a/gamemode/core/cl_logs.lua
+++ b/gamemode/core/cl_logs.lua
@@ -32,7 +32,7 @@
 
 net.Receive("JB.GetLogs",function()
 	local DamageLog = net.ReadTable();
-	local printLog=tobool(net.ReadBit());
+	local printLog = net.ReadBool();
 
 	if printLog then
 		MsgC(JB.Color.white,[[
diff --git a/gamemode/core/sh_state.lua b/gamemode/core/sh_state.lua
index 9a17008..8578735 100644
--- a/gamemode/core/sh_state.lua
+++ b/gamemode/core/sh_state.lua
@@ -332,7 +332,7 @@ function JB:EndRound(winner)
 
 		net.Start("JB.GetLogs");
 		net.WriteTable(JB.ThisRound and JB.ThisRound.Logs or {});
-		net.WriteBit(true);
+		net.WriteBool(true);
 		net.Broadcast(p);
 
 		net.Start("JB.SendRoundUpdate"); net.WriteInt(STATE_ENDED,8); net.WriteInt(winner or 0, 8); net.Broadcast();
diff --git a/gamemode/core/sv_content.lua b/gamemode/core/sv_content.lua
index aa96b84..ce4c8f7 100644
--- a/gamemode/core/sv_content.lua
+++ b/gamemode/core/sv_content.lua
@@ -35,37 +35,37 @@
 resource.AddWorkshop("389805614");
 
 --[[ If the workshop fails, the files below will be downloaded from the server :)
-resource.AddFile("materials/jailbreak_excl/notify_bracket.png");
-resource.AddFile("materials/jailbreak_excl/hud_restricted.png");
-resource.AddFile("materials/jailbreak_excl/hud_health.png");
-resource.AddFile("materials/jailbreak_excl/hud_health_bottom.png");
-resource.AddFile("materials/jailbreak_excl/hud_warden_bar.png");
-resource.AddFile("materials/jailbreak_excl/hud_time.png");
-resource.AddFile("materials/jailbreak_excl/scoreboard_edge.png");
-resource.AddFile("materials/jailbreak_excl/scoreboard_middle.png");
-resource.AddFile("materials/jailbreak_excl/scoreboard_avatar.png");
-resource.AddFile("materials/jailbreak_excl/weapon_selection_tile.png");
-resource.AddFile("materials/jailbreak_excl/button_edge.png");
-resource.AddFile("materials/jailbreak_excl/button_middle.png");
-resource.AddFile("materials/jailbreak_excl/crosshair.png");
-resource.AddFile("materials/jailbreak_excl/gradient.png");
-resource.AddFile("materials/jailbreak_excl/lastrequest.png");
-resource.AddFile("materials/jailbreak_excl/logo_guard.png")
-resource.AddFile("materials/jailbreak_excl/logo_prisoner.png");
-resource.AddFile("materials/jailbreak_excl/scope.png");
-resource.AddFile("materials/jailbreak_excl/notify_quick_edge.png");
-resource.AddFile("materials/jailbreak_excl/notify_quick_middle.png");
-resource.AddFile("materials/jailbreak_excl/vgui_close.png");
-resource.AddFile("materials/jailbreak_excl/vgui_close_hover.png");
+resource.AddSingleFile("materials/jailbreak_excl/notify_bracket.png");
+resource.AddSingleFile("materials/jailbreak_excl/hud_restricted.png");
+resource.AddSingleFile("materials/jailbreak_excl/hud_health.png");
+resource.AddSingleFile("materials/jailbreak_excl/hud_health_bottom.png");
+resource.AddSingleFile("materials/jailbreak_excl/hud_warden_bar.png");
+resource.AddSingleFile("materials/jailbreak_excl/hud_time.png");
+resource.AddSingleFile("materials/jailbreak_excl/scoreboard_edge.png");
+resource.AddSingleFile("materials/jailbreak_excl/scoreboard_middle.png");
+resource.AddSingleFile("materials/jailbreak_excl/scoreboard_avatar.png");
+resource.AddSingleFile("materials/jailbreak_excl/weapon_selection_tile.png");
+resource.AddSingleFile("materials/jailbreak_excl/button_edge.png");
+resource.AddSingleFile("materials/jailbreak_excl/button_middle.png");
+resource.AddSingleFile("materials/jailbreak_excl/crosshair.png");
+resource.AddSingleFile("materials/jailbreak_excl/gradient.png");
+resource.AddSingleFile("materials/jailbreak_excl/lastrequest.png");
+resource.AddSingleFile("materials/jailbreak_excl/logo_guard.png")
+resource.AddSingleFile("materials/jailbreak_excl/logo_prisoner.png");
+resource.AddSingleFile("materials/jailbreak_excl/scope.png");
+resource.AddSingleFile("materials/jailbreak_excl/notify_quick_edge.png");
+resource.AddSingleFile("materials/jailbreak_excl/notify_quick_middle.png");
+resource.AddSingleFile("materials/jailbreak_excl/vgui_close.png");
+resource.AddSingleFile("materials/jailbreak_excl/vgui_close_hover.png");
 
-resource.AddFile("materials/jailbreak_excl/guide/slide_1.png");
-resource.AddFile("materials/jailbreak_excl/guide/slide_2.png");
-resource.AddFile("materials/jailbreak_excl/guide/slide_3.png");
-resource.AddFile("materials/jailbreak_excl/guide/slide_4.png");
+resource.AddSingleFile("materials/jailbreak_excl/guide/slide_1.png");
+resource.AddSingleFile("materials/jailbreak_excl/guide/slide_2.png");
+resource.AddSingleFile("materials/jailbreak_excl/guide/slide_3.png");
+resource.AddSingleFile("materials/jailbreak_excl/guide/slide_4.png");
 
-resource.AddFile("materials/jailbreak_excl/pointers/pointer_background.png");
-resource.AddFile("materials/jailbreak_excl/pointers/generic.png")
-resource.AddFile("materials/jailbreak_excl/pointers/exclamation.png")
-resource.AddFile("materials/jailbreak_excl/pointers/question.png")
-resource.AddFile("materials/jailbreak_excl/pointers/line.png")
-resource.AddFile("materials/jailbreak_excl/pointers/cross.png")]]
+resource.AddSingleFile("materials/jailbreak_excl/pointers/pointer_background.png");
+resource.AddSingleFile("materials/jailbreak_excl/pointers/generic.png")
+resource.AddSingleFile("materials/jailbreak_excl/pointers/exclamation.png")
+resource.AddSingleFile("materials/jailbreak_excl/pointers/question.png")
+resource.AddSingleFile("materials/jailbreak_excl/pointers/line.png")
+resource.AddSingleFile("materials/jailbreak_excl/pointers/cross.png")]]
diff --git a/gamemode/core/sv_logs.lua b/gamemode/core/sv_logs.lua
index 9fe1993..a6553bb 100644
--- a/gamemode/core/sv_logs.lua
+++ b/gamemode/core/sv_logs.lua
@@ -238,7 +238,7 @@ local getLogs=function(p,cmd,a)
 
 	net.Start("JB.GetLogs");
 	net.WriteTable(logs or {});
-	net.WriteBit(true);
+	net.WriteBool(true);
 	net.Send(p);
 end
 concommand.Add("jb_logs_get",getLogs);
diff --git a/gamemode/sh_init.lua b/gamemode/sh_init.lua
index 0fa3e5e..c20e3ae 100644
--- a/gamemode/sh_init.lua
+++ b/gamemode/sh_init.lua
@@ -146,8 +146,22 @@ JB.Gamemode.TeamBased = true;
 JB.Gamemode.Name = "Jail Break";
 
 -- utility functions
+local function getGamemodeFolder()
+	local gm = GM or GAMEMODE
+	if gm and gm.FolderName and gm.FolderName ~= "" then
+		return gm.FolderName
+	end
+	if engine and engine.ActiveGamemode then
+		local active = engine.ActiveGamemode()
+		if active and active ~= "" then
+			return active
+		end
+	end
+	return "jailbreak"
+end
+
 local loadFolder = function(folder,shared)
-	local path = "jailbreak/gamemode/"..folder.."/";
+	local path = getGamemodeFolder().."/gamemode/"..folder.."/";
 
 	for _,name in pairs(file.Find(path.."*.lua","LUA")) do
 		local runtype = shared or "sh";
@@ -180,4 +194,4 @@ end
 
 JB.Util = {};
 
-assert(loadFolder("util") and loadFolder("core") and loadFolder("classes","sh") and loadFolder("lastrequests","sh") and loadFolder("vgui","cl"),"Failed to load Jail Break 7! Contact a developer!") 
\ No newline at end of file
+assert(loadFolder("util") and loadFolder("core") and loadFolder("classes","sh") and loadFolder("lastrequests","sh") and loadFolder("vgui","cl"),"Failed to load Jail Break 7! Contact a developer!")