diff --git a/desmume/src/cocoa/cocoa_GPU.h b/desmume/src/cocoa/cocoa_GPU.h
index 791eb53cb..c28d740a5 100644
--- a/desmume/src/cocoa/cocoa_GPU.h
+++ b/desmume/src/cocoa/cocoa_GPU.h
@@ -37,6 +37,7 @@ class GPUEventHandlerOSX;
 @property (assign) UInt32 gpuStateFlags;
 @property (assign) NSSize gpuDimensions;
 @property (assign) NSUInteger gpuScale;
+@property (assign) UInt32 gpuColorFormat;
 @property (readonly) pthread_rwlock_t *gpuFrameRWLock;
 
 @property (assign) BOOL layerMainGPU;
diff --git a/desmume/src/cocoa/cocoa_GPU.mm b/desmume/src/cocoa/cocoa_GPU.mm
index 3a314e4c3..fc6ea4b7b 100644
--- a/desmume/src/cocoa/cocoa_GPU.mm
+++ b/desmume/src/cocoa/cocoa_GPU.mm
@@ -79,6 +79,7 @@ public:
 @dynamic gpuStateFlags;
 @dynamic gpuDimensions;
 @dynamic gpuScale;
+@dynamic gpuColorFormat;
 @dynamic gpuFrameRWLock;
 
 @dynamic layerMainGPU;
@@ -222,6 +223,30 @@ public:
 	return (NSUInteger)_gpuScale;
 }
 
+- (void) setGpuColorFormat:(UInt32)colorFormat
+{
+	gpuEvent->FrameFinish();
+	gpuEvent->Render3DLock();
+	gpuEvent->FramebufferLockWrite();
+	
+	GPU->SetColorFormat((NDSColorFormat)colorFormat);
+	
+	gpuEvent->SetVideoBuffers();
+	gpuEvent->FramebufferUnlock();
+	gpuEvent->Render3DUnlock();
+}
+
+- (UInt32) gpuColorFormat
+{
+	gpuEvent->Render3DLock();
+	gpuEvent->FramebufferLockRead();
+	const UInt32 colorFormat = (UInt32)GPU->GetDisplayInfo().colorFormat;
+	gpuEvent->FramebufferUnlock();
+	gpuEvent->Render3DUnlock();
+	
+	return colorFormat;
+}
+
 - (pthread_rwlock_t *) gpuFrameRWLock
 {
 	return gpuEvent->GetFrameRWLock();
diff --git a/desmume/src/cocoa/cocoa_output.mm b/desmume/src/cocoa/cocoa_output.mm
index 1c742f606..6f9c9425a 100644
--- a/desmume/src/cocoa/cocoa_output.mm
+++ b/desmume/src/cocoa/cocoa_output.mm
@@ -1016,43 +1016,27 @@
 
 - (void) resetVideoBuffers
 {
-	size_t pixelBytes = sizeof(uint16_t);
 	const NDSDisplayInfo &dispInfo = GPU->GetDisplayInfo();
 	
-	switch (dispInfo.colorFormat)
-	{
-		case NDSColorFormat_BGR555_Rev:
-			pixelBytes = sizeof(uint16_t);
-			break;
-			
-		case NDSColorFormat_BGR666_Rev:
-		case NDSColorFormat_BGR888_Rev:
-			pixelBytes = sizeof(uint32_t);
-			break;
-			
-		default:
-			break;
-	}
-	
 	void *oldVideoBuffer = _videoBuffer;
-	uint8_t *newVideoBuffer = (uint8_t *)malloc_alignedCacheLine( ((GPU_FRAMEBUFFER_NATIVE_WIDTH * GPU_FRAMEBUFFER_NATIVE_HEIGHT) + (dispInfo.customWidth * dispInfo.customHeight)) * 2 * pixelBytes );
+	uint8_t *newVideoBuffer = (uint8_t *)malloc_alignedCacheLine( ((GPU_FRAMEBUFFER_NATIVE_WIDTH * GPU_FRAMEBUFFER_NATIVE_HEIGHT) + (dispInfo.customWidth * dispInfo.customHeight)) * 2 * dispInfo.pixelBytes );
 	
 	[(id<CocoaDSDisplayVideoDelegate>)delegate doSetVideoBuffersUsingFormat:dispInfo.colorFormat
 																 bufferHead:newVideoBuffer
 															  nativeBuffer0:newVideoBuffer
-															  nativeBuffer1:newVideoBuffer + (GPU_FRAMEBUFFER_NATIVE_WIDTH * GPU_FRAMEBUFFER_NATIVE_HEIGHT * pixelBytes)
-															  customBuffer0:newVideoBuffer + (GPU_FRAMEBUFFER_NATIVE_WIDTH * GPU_FRAMEBUFFER_NATIVE_HEIGHT * 2 * pixelBytes)
+															  nativeBuffer1:newVideoBuffer + (GPU_FRAMEBUFFER_NATIVE_WIDTH * GPU_FRAMEBUFFER_NATIVE_HEIGHT * dispInfo.pixelBytes)
+															  customBuffer0:newVideoBuffer + (GPU_FRAMEBUFFER_NATIVE_WIDTH * GPU_FRAMEBUFFER_NATIVE_HEIGHT * 2 * dispInfo.pixelBytes)
 															   customWidth0:dispInfo.customWidth
 															  customHeight0:dispInfo.customHeight
-															  customBuffer1:newVideoBuffer + (GPU_FRAMEBUFFER_NATIVE_WIDTH * GPU_FRAMEBUFFER_NATIVE_HEIGHT * 2 * pixelBytes) + (dispInfo.customWidth * dispInfo.customHeight * pixelBytes)
+															  customBuffer1:newVideoBuffer + (GPU_FRAMEBUFFER_NATIVE_WIDTH * GPU_FRAMEBUFFER_NATIVE_HEIGHT * 2 * dispInfo.pixelBytes) + (dispInfo.customWidth * dispInfo.customHeight * dispInfo.pixelBytes)
 															   customWidth1:dispInfo.customWidth
 															  customHeight1:dispInfo.customHeight];
 	
 	_videoBuffer = newVideoBuffer;
 	_nativeBuffer[NDSDisplayID_Main]  = newVideoBuffer;
-	_nativeBuffer[NDSDisplayID_Touch] = newVideoBuffer + (GPU_FRAMEBUFFER_NATIVE_WIDTH * GPU_FRAMEBUFFER_NATIVE_HEIGHT * pixelBytes);
-	_customBuffer[NDSDisplayID_Main]  = newVideoBuffer + (GPU_FRAMEBUFFER_NATIVE_WIDTH * GPU_FRAMEBUFFER_NATIVE_HEIGHT * 2 * pixelBytes);
-	_customBuffer[NDSDisplayID_Touch] = newVideoBuffer + (GPU_FRAMEBUFFER_NATIVE_WIDTH * GPU_FRAMEBUFFER_NATIVE_HEIGHT * 2 * pixelBytes) + (dispInfo.customWidth * dispInfo.customHeight * pixelBytes);
+	_nativeBuffer[NDSDisplayID_Touch] = newVideoBuffer + (GPU_FRAMEBUFFER_NATIVE_WIDTH * GPU_FRAMEBUFFER_NATIVE_HEIGHT * dispInfo.pixelBytes);
+	_customBuffer[NDSDisplayID_Main]  = newVideoBuffer + (GPU_FRAMEBUFFER_NATIVE_WIDTH * GPU_FRAMEBUFFER_NATIVE_HEIGHT * 2 * dispInfo.pixelBytes);
+	_customBuffer[NDSDisplayID_Touch] = newVideoBuffer + (GPU_FRAMEBUFFER_NATIVE_WIDTH * GPU_FRAMEBUFFER_NATIVE_HEIGHT * 2 * dispInfo.pixelBytes) + (dispInfo.customWidth * dispInfo.customHeight * dispInfo.pixelBytes);
 	
 	free_aligned(oldVideoBuffer);
 }