@@ -85,13 +85,13 @@
 		    [[OFApplication sharedApplication] delegate];
 		OFString *string = [OFString stringWithFormat:
 		    @"\nRuntime error: Unhandled exception:\n%@\n", e];
 
 		[delegate outputString: string
-			     withColor: RED];
+			       inColor: RED];
 		[delegate outputString: @"Press home button to exit!\n"
-			     withColor: NO_COLOR];
+			       inColor: NO_COLOR];
 		for (;;) {
 			WPAD_ScanPads();
 
 			if (WPAD_ButtonsDown(0) & WPAD_BUTTON_HOME)
 				[OFApplication terminateWithStatus: 1];
@@ -104,11 +104,11 @@
 #endif
 }
 
 @implementation TestsAppDelegate
 - (void)outputString: (OFString*)str
-	   withColor: (int)color
+	     inColor: (int)color
 {
 #if defined(_PSP)
 	char i, space = ' ';
 	int y = pspDebugScreenGetY();
 
@@ -160,36 +160,36 @@
 	     inModule: (OFString*)module
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
 	[self outputString: [OFString stringWithFormat: @"[%@] %@: testing...",
 							module, test]
-		 withColor: YELLOW];
+		   inColor: YELLOW];
 	[pool release];
 }
 
 - (void)outputSuccess: (OFString*)test
 	     inModule: (OFString*)module
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
 	[self outputString: [OFString stringWithFormat: @"[%@] %@: ok\n",
 							module, test]
-		 withColor: GREEN];
+		   inColor: GREEN];
 	[pool release];
 }
 
 - (void)outputFailure: (OFString*)test
 	     inModule: (OFString*)module
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
 	[self outputString: [OFString stringWithFormat: @"[%@] %@: failed\n",
 							module, test]
-		 withColor: RED];
+		   inColor: RED];
 	[pool release];
 
 #ifdef __wii__
 	[self outputString: @"Press A to continue!\n"
-		 withColor: NO_COLOR];
+		   inColor: NO_COLOR];
 	for (;;) {
 		WPAD_ScanPads();
 
 		if (WPAD_ButtonsDown(0) & WPAD_BUTTON_A)
 			return;
@@ -203,11 +203,11 @@
 {
 #ifdef _PSP
 	pspDebugScreenInit();
 #endif
 #ifdef __wii__
-	[OFFile changeToDirectoryAtPath: @"/objfw-tests"];
+	[OFFile changeToDirectoryAtPath: @"/apps/objfw-tests"];
 #endif
 
 	[self objectTests];
 #ifdef OF_HAVE_BLOCKS
 	[self blockTests];
@@ -246,11 +246,11 @@
 	[self propertiesTests];
 #endif
 
 #ifdef __wii__
 	[self outputString: @"Press home button to exit!\n"
-		 withColor: NO_COLOR];
+		   inColor: NO_COLOR];
 	for (;;) {
 		WPAD_ScanPads();
 
 		if (WPAD_ButtonsDown(0) & WPAD_BUTTON_HOME)
 			[OFApplication terminateWithStatus: _fails];