diff --git a/src/Game.c b/src/Game.c
index 3570696fa..c02e6c097 100644
--- a/src/Game.c
+++ b/src/Game.c
@@ -331,23 +331,24 @@ static void Game_WarnFunc(const cc_string* msg) {
 }
 
 static void LoadOptions(void) {
-	Game_ClassicMode       = Options_GetBool(OPT_CLASSIC_MODE, false);
-	Game_ClassicHacks      = Options_GetBool(OPT_CLASSIC_HACKS, false);
-	Game_AllowCustomBlocks = Options_GetBool(OPT_CUSTOM_BLOCKS, true);
-	Game_SimpleArmsAnim    = Options_GetBool(OPT_SIMPLE_ARMS_ANIM, false);
-	Game_ViewBobbing       = Options_GetBool(OPT_VIEW_BOBBING, true);
+	Game_ClassicMode  = Options_GetBool(OPT_CLASSIC_MODE,  false);
+	Game_ClassicHacks = Options_GetBool(OPT_CLASSIC_HACKS, false);
+	Game_Anaglyph3D   = Options_GetBool(OPT_ANAGLYPH3D,    false);
+	Game_ViewBobbing  = Options_GetBool(OPT_VIEW_BOBBING,  true);
+	
+	Game_AllowCustomBlocks   = !Game_ClassicMode && Options_GetBool(OPT_CUSTOM_BLOCKS,      true);
+	Game_SimpleArmsAnim      = !Game_ClassicMode && Options_GetBool(OPT_SIMPLE_ARMS_ANIM,   false);
+	Game_BreakableLiquids    = !Game_ClassicMode && Options_GetBool(OPT_MODIFIABLE_LIQUIDS, false);
+	Game_AllowServerTextures = !Game_ClassicMode && Options_GetBool(OPT_SERVER_TEXTURES,    true);
 
 	Game_ViewDistance     = Options_GetInt(OPT_VIEW_DISTANCE, 8, 4096, DEFAULT_VIEWDIST);
 	Game_UserViewDistance = Game_ViewDistance;
-	Game_BreakableLiquids = !Game_ClassicMode && Options_GetBool(OPT_MODIFIABLE_LIQUIDS, false);
-	Game_AllowServerTextures = Options_GetBool(OPT_SERVER_TEXTURES, true);
 	/* TODO: Do we need to support option to skip SSL */
 	/*cc_bool skipSsl = Options_GetBool("skip-ssl-check", false);
 	if (skipSsl) {
 		ServicePointManager.ServerCertificateValidationCallback = delegate { return true; };
 		Options.Set("skip-ssl-check", false);
 	}*/
-	Game_Anaglyph3D = Options_GetBool(OPT_ANAGLYPH3D, false);
 }
 
 #ifdef CC_BUILD_PLUGINS
diff --git a/src/Graphics_3DS.c b/src/Graphics_3DS.c
index eed03b692..2f31136c4 100644
--- a/src/Graphics_3DS.c
+++ b/src/Graphics_3DS.c
@@ -414,10 +414,6 @@ void Gfx_UpdateTexture(GfxResourceID texId, int x, int y, struct Bitmap* part, i
  	struct GPUTexture* tex = (struct GPUTexture*)texId;
 	ToMortonTexture(&tex->texture, x, y, part, rowWidth);
 }
-
-void Gfx_UpdateTexturePart(GfxResourceID texId, int x, int y, struct Bitmap* part, cc_bool mipmaps) {
-	Gfx_UpdateTexture(texId, x, y, part, part->width, mipmaps);
-}
 void Gfx_DeleteTexture(GfxResourceID* texId) {
 	GPUTexture_Unref(texId);
 }
diff --git a/src/Graphics_D3D11.c b/src/Graphics_D3D11.c
index 4954db3a6..f286c9c92 100644
--- a/src/Graphics_D3D11.c
+++ b/src/Graphics_D3D11.c
@@ -270,10 +270,6 @@ void Gfx_UpdateTexture(GfxResourceID texId, int x, int y, struct Bitmap* part, i
 	ID3D11Resource_Release(res);
 }
 
-void Gfx_UpdateTexturePart(GfxResourceID texId, int x, int y, struct Bitmap* part, cc_bool mipmaps) {
-	Gfx_UpdateTexture(texId, x, y, part, part->width, mipmaps);
-}
-
 void Gfx_DeleteTexture(GfxResourceID* texId) {
 	ID3D11ShaderResourceView* view = (ID3D11ShaderResourceView*)(*texId);
 	ID3D11Resource* res = NULL;
diff --git a/src/Graphics_D3D9.c b/src/Graphics_D3D9.c
index 8ec050be2..00526ecc5 100644
--- a/src/Graphics_D3D9.c
+++ b/src/Graphics_D3D9.c
@@ -373,10 +373,6 @@ void Gfx_UpdateTexture(GfxResourceID texId, int x, int y, struct Bitmap* part, i
 	if (mipmaps) D3D9_DoMipmaps(texture, x, y, part, rowWidth, true);
 }
 
-void Gfx_UpdateTexturePart(GfxResourceID texId, int x, int y, struct Bitmap* part, cc_bool mipmaps) {
-	Gfx_UpdateTexture(texId, x, y, part, part->width, mipmaps);
-}
-
 void Gfx_BindTexture(GfxResourceID texId) {
 	cc_result res = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9*)texId);
 	if (res) Logger_Abort2(res, "D3D9_BindTexture");
diff --git a/src/Graphics_Dreamcast.c b/src/Graphics_Dreamcast.c
index 1dceb9dd1..f6249ab48 100644
--- a/src/Graphics_Dreamcast.c
+++ b/src/Graphics_Dreamcast.c
@@ -324,10 +324,6 @@ void Gfx_UpdateTexture(GfxResourceID texId, int x, int y, struct Bitmap* part, i
 	// TODO: Do we need to flush VRAM?
 }
 
-void Gfx_UpdateTexturePart(GfxResourceID texId, int x, int y, struct Bitmap* part, cc_bool mipmaps) {
-	Gfx_UpdateTexture(texId, x, y, part, part->width, mipmaps);
-}
-
 
 /*########################################################################################################################*
 *-----------------------------------------------------State management----------------------------------------------------*
diff --git a/src/Graphics_GCWii.c b/src/Graphics_GCWii.c
index 90238376e..85e8fbfcd 100644
--- a/src/Graphics_GCWii.c
+++ b/src/Graphics_GCWii.c
@@ -161,10 +161,6 @@ void Gfx_UpdateTexture(GfxResourceID texId, int x, int y, struct Bitmap* part, i
 	GX_InvalidateTexAll();
 }
 
-void Gfx_UpdateTexturePart(GfxResourceID texId, int x, int y, struct Bitmap* part, cc_bool mipmaps) {
-	Gfx_UpdateTexture(texId, x, y, part, part->width, mipmaps);
-}
-
 void Gfx_DeleteTexture(GfxResourceID* texId) {
 	GfxResourceID data = *texId;
 	if (data) Mem_Free(data);
diff --git a/src/Graphics_N64.c b/src/Graphics_N64.c
index c94bccd7a..d02a81a4f 100644
--- a/src/Graphics_N64.c
+++ b/src/Graphics_N64.c
@@ -222,10 +222,6 @@ void Gfx_UpdateTexture(GfxResourceID texId, int x, int y, struct Bitmap* part, i
 	glSurfaceTexImageN64(GL_TEXTURE_2D, 0, fb, &params);
 }
 
-void Gfx_UpdateTexturePart(GfxResourceID texId, int x, int y, struct Bitmap* part, cc_bool mipmaps) {
-	Gfx_UpdateTexture(texId, x, y, part, part->width, mipmaps);
-}
-
 void Gfx_DeleteTexture(GfxResourceID* texId) {
 	CCTexture* tex = (CCTexture*)(*texId);
 	if (!tex) return;
diff --git a/src/Graphics_NDS.c b/src/Graphics_NDS.c
index 16186cbb2..43a5ea348 100644
--- a/src/Graphics_NDS.c
+++ b/src/Graphics_NDS.c
@@ -154,10 +154,6 @@ void Gfx_UpdateTexture(GfxResourceID texId, int x, int y, struct Bitmap* part, i
 	}
 }
 
-void Gfx_UpdateTexturePart(GfxResourceID texId, int x, int y, struct Bitmap* part, cc_bool mipmaps) {
-    Gfx_UpdateTexture(texId, x, y, part, part->width, mipmaps);
-}
-
 void Gfx_DeleteTexture(GfxResourceID* texId) {
     int texture = (int)(*texId);
     if (texture) glDeleteTextures(1, &texture);
diff --git a/src/Graphics_PS1.c b/src/Graphics_PS1.c
index 1c0f942ec..c5c228900 100644
--- a/src/Graphics_PS1.c
+++ b/src/Graphics_PS1.c
@@ -271,10 +271,6 @@ void Gfx_UpdateTexture(GfxResourceID texId, int x, int y, struct Bitmap* part, i
 	// TODO
 }
 
-void Gfx_UpdateTexturePart(GfxResourceID texId, int x, int y, struct Bitmap* part, cc_bool mipmaps) {
-	Gfx_UpdateTexture(texId, x, y, part, part->width, mipmaps);
-}
-
 void Gfx_EnableMipmaps(void)  { }
 void Gfx_DisableMipmaps(void) { }
 
diff --git a/src/Graphics_PS2.c b/src/Graphics_PS2.c
index cfcccb023..2ce8fe52f 100644
--- a/src/Graphics_PS2.c
+++ b/src/Graphics_PS2.c
@@ -235,10 +235,6 @@ void Gfx_UpdateTexture(GfxResourceID texId, int x, int y, struct Bitmap* part, i
 	// TODO
 }
 
-void Gfx_UpdateTexturePart(GfxResourceID texId, int x, int y, struct Bitmap* part, cc_bool mipmaps) {
-	// TODO
-}
-
 void Gfx_EnableMipmaps(void)  { }
 void Gfx_DisableMipmaps(void) { }
 
diff --git a/src/Graphics_PS3.c b/src/Graphics_PS3.c
index 8bcd00447..5baa80e2f 100644
--- a/src/Graphics_PS3.c
+++ b/src/Graphics_PS3.c
@@ -625,10 +625,6 @@ void Gfx_UpdateTexture(GfxResourceID texId, int x, int y, struct Bitmap* part, i
 	/* TODO */
 }
 
-void Gfx_UpdateTexturePart(GfxResourceID texId, int x, int y, struct Bitmap* part, cc_bool mipmaps) {
-	Gfx_UpdateTexture(texId, x, y, part, part->width, mipmaps);
-}
-
 void Gfx_EnableMipmaps(void)  { }
 void Gfx_DisableMipmaps(void) { }
 
diff --git a/src/Graphics_PSP.c b/src/Graphics_PSP.c
index b382f4f3b..e4a5ab890 100644
--- a/src/Graphics_PSP.c
+++ b/src/Graphics_PSP.c
@@ -140,10 +140,6 @@ void Gfx_UpdateTexture(GfxResourceID texId, int x, int y, struct Bitmap* part, i
 	}
 }*/
 
-void Gfx_UpdateTexturePart(GfxResourceID texId, int x, int y, struct Bitmap* part, cc_bool mipmaps) {
-	Gfx_UpdateTexture(texId, x, y, part, part->width, mipmaps);
-}
-
 void Gfx_DeleteTexture(GfxResourceID* texId) {
 	GfxResourceID data = *texId;
 	if (data) Mem_Free(data);
diff --git a/src/Graphics_PSVita.c b/src/Graphics_PSVita.c
index fbfc41d9d..6323b0f9c 100644
--- a/src/Graphics_PSVita.c
+++ b/src/Graphics_PSVita.c
@@ -694,10 +694,6 @@ void Gfx_UpdateTexture(GfxResourceID texId, int x, int y, struct Bitmap* part, i
 	//sceKernelDcacheWritebackInvalidateRange(dst, (tex->width * part->height) * 4);
 }
 
-void Gfx_UpdateTexturePart(GfxResourceID texId, int x, int y, struct Bitmap* part, cc_bool mipmaps) {
-	Gfx_UpdateTexture(texId, x, y, part, part->width, mipmaps);
-}
-
 void Gfx_DeleteTexture(GfxResourceID* texId) {
 	GPUTexture_Unref(texId);
 }
diff --git a/src/Graphics_Saturn.c b/src/Graphics_Saturn.c
index 2797656fb..9f9d1679f 100644
--- a/src/Graphics_Saturn.c
+++ b/src/Graphics_Saturn.c
@@ -126,10 +126,6 @@ void Gfx_UpdateTexture(GfxResourceID texId, int x, int y, struct Bitmap* part, i
 	// TODO
 }
 
-void Gfx_UpdateTexturePart(GfxResourceID texId, int x, int y, struct Bitmap* part, cc_bool mipmaps) {
-	Gfx_UpdateTexture(texId, x, y, part, part->width, mipmaps);
-}
-
 void Gfx_EnableMipmaps(void)  { }
 void Gfx_DisableMipmaps(void) { }
 
diff --git a/src/Graphics_SoftGPU.c b/src/Graphics_SoftGPU.c
index cabff02c1..de38ec2c0 100644
--- a/src/Graphics_SoftGPU.c
+++ b/src/Graphics_SoftGPU.c
@@ -99,10 +99,6 @@ void Gfx_UpdateTexture(GfxResourceID texId, int x, int y, struct Bitmap* part, i
 	CopyTextureData(dst, tex->width * 4, part, rowWidth << 2);
 }
 
-void Gfx_UpdateTexturePart(GfxResourceID texId, int x, int y, struct Bitmap* part, cc_bool mipmaps) {
-	Gfx_UpdateTexture(texId, x, y, part, part->width, mipmaps);
-}
-
 void Gfx_EnableMipmaps(void)  { }
 void Gfx_DisableMipmaps(void) { }
 
diff --git a/src/Graphics_WiiU.c b/src/Graphics_WiiU.c
index 53b442cb6..17c6b3bda 100644
--- a/src/Graphics_WiiU.c
+++ b/src/Graphics_WiiU.c
@@ -128,10 +128,6 @@ void Gfx_UpdateTexture(GfxResourceID texId, int x, int y, struct Bitmap* part, i
 	GX2Invalidate(GX2_INVALIDATE_MODE_CPU_TEXTURE, tex->surface.image, tex->surface.imageSize);
 }
 
-void Gfx_UpdateTexturePart(GfxResourceID texId, int x, int y, struct Bitmap* part, cc_bool mipmaps) {
-	Gfx_UpdateTexture(texId, x, y, part, part->width, mipmaps);
-}
-
 void Gfx_BindTexture(GfxResourceID texId) {
 	if (!texId) texId = white_square;
 	pendingTex = (GX2Texture*)texId;
diff --git a/src/Graphics_Xbox.c b/src/Graphics_Xbox.c
index 0ecfcc2da..6fa2c8d3e 100644
--- a/src/Graphics_Xbox.c
+++ b/src/Graphics_Xbox.c
@@ -231,10 +231,6 @@ void Gfx_UpdateTexture(GfxResourceID texId, int originX, int originY, struct Bit
 	}
 }
 
-void Gfx_UpdateTexturePart(GfxResourceID texId, int x, int y, struct Bitmap* part, cc_bool mipmaps) {
-	Gfx_UpdateTexture(texId, x, y, part, part->width, mipmaps);
-}
-
 void Gfx_DeleteTexture(GfxResourceID* texId) {
 	CCTexture* tex = (CCTexture*)(*texId);
 	if (!tex) return;
diff --git a/src/Graphics_Xbox360.c b/src/Graphics_Xbox360.c
index 9d9d2197b..a34799146 100644
--- a/src/Graphics_Xbox360.c
+++ b/src/Graphics_Xbox360.c
@@ -121,10 +121,6 @@ void Gfx_UpdateTexture(GfxResourceID texId, int x, int y, struct Bitmap* part, i
 	SetTexturePartData(xtex, x, y, part, rowWidth, 0);
 }
 
-void Gfx_UpdateTexturePart(GfxResourceID texId, int x, int y, struct Bitmap* part, cc_bool mipmaps) {
-	Gfx_UpdateTexture(texId, x, y, part, part->width, mipmaps);
-}
-
 void Gfx_BindTexture(GfxResourceID texId) {
 	struct XenosSurface* xtex = (struct XenosSurface*)texId;
 	Xe_SetTexture(xe, 0, xtex);
diff --git a/src/_GLShared.h b/src/_GLShared.h
index ca82a6ace..cd16ae774 100644
--- a/src/_GLShared.h
+++ b/src/_GLShared.h
@@ -152,10 +152,6 @@ void Gfx_UpdateTexture(GfxResourceID texId, int x, int y, struct Bitmap* part, i
 	if (mipmaps) Gfx_DoMipmaps(x, y, part, rowWidth, true);
 }
 
-void Gfx_UpdateTexturePart(GfxResourceID texId, int x, int y, struct Bitmap* part, cc_bool mipmaps) {
-	Gfx_UpdateTexture(texId, x, y, part, part->width, mipmaps);
-}
-
 void Gfx_DeleteTexture(GfxResourceID* texId) {
 	GLuint id = (GLuint)(*texId);
 	if (id) glDeleteTextures(1, &id);
diff --git a/src/_GraphicsBase.h b/src/_GraphicsBase.h
index 495d0f166..2ab51513f 100644
--- a/src/_GraphicsBase.h
+++ b/src/_GraphicsBase.h
@@ -324,6 +324,10 @@ void Gfx_RecreateTexture(GfxResourceID* tex, struct Bitmap* bmp, cc_uint8 flags,
 	*tex = Gfx_CreateTexture(bmp, flags, mipmaps);
 }
 
+void Gfx_UpdateTexturePart(GfxResourceID texId, int x, int y, struct Bitmap* part, cc_bool mipmaps) {
+	Gfx_UpdateTexture(texId, x, y, part, part->width, mipmaps);
+}
+
 static void CopyTextureData(void* dst, int dstStride, const struct Bitmap* src, int srcStride) {
 	/* We need to copy scanline by scanline, as generally srcStride != dstStride */
 	cc_uint8* src_ = (cc_uint8*)src->scan0;