diff --git a/flatlaf-core/src/test/java/com/formdev/flatlaf/FlatTestFrame.java b/flatlaf-core/src/test/java/com/formdev/flatlaf/FlatTestFrame.java
index 26264e71..67e23fbf 100644
--- a/flatlaf-core/src/test/java/com/formdev/flatlaf/FlatTestFrame.java
+++ b/flatlaf-core/src/test/java/com/formdev/flatlaf/FlatTestFrame.java
@@ -83,12 +83,13 @@ public class FlatTestFrame
 				className.equals( "com.sun.java.swing.plaf.motif.MotifLookAndFeel" ) )
 			  continue;
 
-			if( className.equals( NimbusLookAndFeel.class.getName() ) )
-				name += " (F10)";
+			if( (SystemInfo.IS_WINDOWS && className.equals( "com.sun.java.swing.plaf.windows.WindowsLookAndFeel" )) ||
+				(SystemInfo.IS_MAC && className.equals( "com.apple.laf.AquaLookAndFeel") ) )
+				name += " (F9)";
 			else if( className.equals( MetalLookAndFeel.class.getName() ) )
+				name += " (F10)";
+			else if( className.equals( NimbusLookAndFeel.class.getName() ) )
 				name += " (F11)";
-			else if( className.equals( "com.sun.java.swing.plaf.windows.WindowsLookAndFeel" ) )
-				name += " (F12)";
 
 			lafModel.addElement( new LafInfo( name, className ) );
 		}
@@ -111,10 +112,12 @@ public class FlatTestFrame
 		registerSwitchToLookAndFeel( KeyEvent.VK_F4, FlatIntelliJLaf.class.getName() );
 		registerSwitchToLookAndFeel( KeyEvent.VK_F5, FlatDarculaLaf.class.getName() );
 
-		registerSwitchToLookAndFeel( KeyEvent.VK_F10, NimbusLookAndFeel.class.getName() );
-		registerSwitchToLookAndFeel( KeyEvent.VK_F11, MetalLookAndFeel.class.getName() );
 		if( SystemInfo.IS_WINDOWS )
-			registerSwitchToLookAndFeel( KeyEvent.VK_F12, "com.sun.java.swing.plaf.windows.WindowsLookAndFeel" );
+			registerSwitchToLookAndFeel( KeyEvent.VK_F9, "com.sun.java.swing.plaf.windows.WindowsLookAndFeel" );
+		else if( SystemInfo.IS_MAC )
+			registerSwitchToLookAndFeel( KeyEvent.VK_F9, "com.apple.laf.AquaLookAndFeel" );
+		registerSwitchToLookAndFeel( KeyEvent.VK_F10, MetalLookAndFeel.class.getName() );
+		registerSwitchToLookAndFeel( KeyEvent.VK_F11, NimbusLookAndFeel.class.getName() );
 
 		// register ESC key to close frame
 		((JComponent)getContentPane()).registerKeyboardAction(
diff --git a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/ControlBar.java b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/ControlBar.java
index 6504402a..4526b699 100644
--- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/ControlBar.java
+++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/ControlBar.java
@@ -55,12 +55,13 @@ class ControlBar
 				className.equals( "com.sun.java.swing.plaf.motif.MotifLookAndFeel" ) )
 			  continue;
 
-			if( className.equals( NimbusLookAndFeel.class.getName() ) )
-				name += " (F10)";
+			if( (SystemInfo.IS_WINDOWS && className.equals( "com.sun.java.swing.plaf.windows.WindowsLookAndFeel" )) ||
+				(SystemInfo.IS_MAC && className.equals( "com.apple.laf.AquaLookAndFeel") ) )
+				name += " (F9)";
 			else if( className.equals( MetalLookAndFeel.class.getName() ) )
+				name += " (F10)";
+			else if( className.equals( NimbusLookAndFeel.class.getName() ) )
 				name += " (F11)";
-			else if( className.equals( "com.sun.java.swing.plaf.windows.WindowsLookAndFeel" ) )
-				name += " (F12)";
 
 			lafModel.addElement( new LafInfo( name, className ) );
 		}
@@ -87,10 +88,12 @@ class ControlBar
 		registerSwitchToLookAndFeel( KeyEvent.VK_F3, FlatIntelliJLaf.class.getName() );
 		registerSwitchToLookAndFeel( KeyEvent.VK_F4, FlatDarculaLaf.class.getName() );
 
-		registerSwitchToLookAndFeel( KeyEvent.VK_F10, NimbusLookAndFeel.class.getName() );
-		registerSwitchToLookAndFeel( KeyEvent.VK_F11, MetalLookAndFeel.class.getName() );
 		if( SystemInfo.IS_WINDOWS )
-			registerSwitchToLookAndFeel( KeyEvent.VK_F12, "com.sun.java.swing.plaf.windows.WindowsLookAndFeel" );
+			registerSwitchToLookAndFeel( KeyEvent.VK_F9, "com.sun.java.swing.plaf.windows.WindowsLookAndFeel" );
+		else if( SystemInfo.IS_MAC )
+			registerSwitchToLookAndFeel( KeyEvent.VK_F9, "com.apple.laf.AquaLookAndFeel" );
+		registerSwitchToLookAndFeel( KeyEvent.VK_F10, MetalLookAndFeel.class.getName() );
+		registerSwitchToLookAndFeel( KeyEvent.VK_F11, NimbusLookAndFeel.class.getName() );
 
 		// register ESC key to close frame
 		((JComponent)frame.getContentPane()).registerKeyboardAction(