diff --git a/graphics/printing/hello-world/source/main.c b/graphics/printing/hello-world/source/main.c
index a0c8a7d..efbf3b6 100644
--- a/graphics/printing/hello-world/source/main.c
+++ b/graphics/printing/hello-world/source/main.c
@@ -15,15 +15,12 @@ int main(int argc, char **argv)
 	//the row and column where you want your cursor to move
 	printf("\x1b[16;20HHello World!");
 
-	//"Safe default, single Joy-Con have buttons/sticks rotated for orientation"
-	hidSetControllerLayout(CONTROLLER_PLAYER_1, LAYOUT_DEFAULT);
-
 	while(appletMainLoop())
 	{
 		//Scan all the inputs. This should be done once for each frame
 		hidScanInput();
 
-		if ((hidKeysDown(CONTROLLER_PLAYER_1) | hidKeysDown(CONTROLLER_HANDHELD)) & KEY_PLUS) break;
+		if (hidKeysDown(CONTROLLER_P1_AUTO) & KEY_PLUS) break;
 
 		gfxFlushBuffers();
 		gfxSwapBuffers();
diff --git a/graphics/simplegfx/source/main.c b/graphics/simplegfx/source/main.c
index 1bc8a98..17abb8d 100644
--- a/graphics/simplegfx/source/main.c
+++ b/graphics/simplegfx/source/main.c
@@ -25,15 +25,12 @@ int main(int argc, char **argv)
 	//gfxConfigureAutoResolutionDefault(true);//Set current resolution automatically depending on current/changed OperationMode. Only use this when using gfxInitResolution*().
 	//Note that while the above commented code enables 1080p for docked-mode, this example only draws a 720p image, with the rest of the screen being left at white.
 
-	//"Safe default, single Joy-Con have buttons/sticks rotated for orientation"
-	hidSetControllerLayout(CONTROLLER_PLAYER_1, LAYOUT_DEFAULT);
-
 	while(appletMainLoop())
 	{
 		//Scan all the inputs. This should be done once for each frame
 		hidScanInput();
 
-		if ((hidKeysDown(CONTROLLER_PLAYER_1) | hidKeysDown(CONTROLLER_HANDHELD)) & KEY_PLUS) break;
+		if (hidKeysDown(CONTROLLER_P1_AUTO) & KEY_PLUS) break;
 
 		framebuf = gfxGetFramebuffer((u32*)&width, (u32*)&height);
 		framebuf32 = (u32*)framebuf;