diff -r 4e7d8438f660 core.startup/src/org/netbeans/core/startup/CLIOptions.java
--- a/core.startup/src/org/netbeans/core/startup/CLIOptions.java	Mon Apr 21 13:26:54 2008 +0200
+++ b/core.startup/src/org/netbeans/core/startup/CLIOptions.java	Tue Apr 22 17:40:26 2008 +0200
@@ -46,7 +46,6 @@ import java.util.Locale;
 import java.util.Locale;
 import java.util.MissingResourceException;
 import org.netbeans.CLIHandler;
-import org.netbeans.TopSecurityManager;
 import org.openide.filesystems.FileUtil;
 import org.openide.util.NbBundle;
 
@@ -138,6 +137,18 @@ public class CLIOptions extends CLIHandl
                 args[i] = null;
                 try {
                     String ui = args[++i];
+                    //Translate L&F ID into L&F class for known IDs
+                    if ("Metal".equals(ui)) {
+                        ui = "javax.swing.plaf.metal.MetalLookAndFeel";
+                    } else if ("GTK".equals(ui)) {
+                        ui = "com.sun.java.swing.plaf.gtk.GTKLookAndFeel";
+                    } else if ("Nimbus".equals(ui)) {
+                        ui = "com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel";
+                    } else if ("Windows".equals(ui)) {
+                        ui = "com.sun.java.swing.plaf.windows.WindowsLookAndFeel";
+                    } else if ("Aqua".equals(ui)) {
+                        ui = "apple.laf.AquaLookAndFeel";
+                    }
                     uiClass = Class.forName(ui);
                 } catch(ArrayIndexOutOfBoundsException e) {
                     System.err.println(getString("ERR_UIExpected"));
diff -r 4e7d8438f660 core.startup/test/unit/src/org/netbeans/core/startup/CLIOptionsTest.java
--- a/core.startup/test/unit/src/org/netbeans/core/startup/CLIOptionsTest.java	Mon Apr 21 13:26:54 2008 +0200
+++ b/core.startup/test/unit/src/org/netbeans/core/startup/CLIOptionsTest.java	Tue Apr 22 17:40:26 2008 +0200
@@ -41,6 +41,7 @@ package org.netbeans.core.startup;
 package org.netbeans.core.startup;
 
 import org.netbeans.junit.NbTestCase;
+import org.openide.util.Utilities;
 
 /**
  *
@@ -69,6 +70,31 @@ public class CLIOptionsTest extends NbTe
         assertTrue("Splash is explicitly disabled", CLIOptions.isNoSplash());
     }
     
+    /**
+     * Test translation from L&F ID to L&F class.
+     */
+    public void testLafId2LafClass () {
+        new CLIOptions().cli(new String[] { "--laf", "Metal" });
+        try {
+            assertEquals("Must be Metal", CLIOptions.uiClass, Class.forName("javax.swing.plaf.metal.MetalLookAndFeel"));
+        } catch (ClassNotFoundException exc) {
+        }
+        if (Utilities.isWindows()) {
+            new CLIOptions().cli(new String[] { "--laf", "Windows" });
+            try {
+                assertEquals("Must be Windows", CLIOptions.uiClass, Class.forName("com.sun.java.swing.plaf.windows.WindowsLookAndFeel"));
+            } catch (ClassNotFoundException exc) {
+            }
+        }
+        if (Utilities.isMac()) {
+            new CLIOptions().cli(new String[] { "--laf", "Aqua" });
+            try {
+                assertEquals("Must be MacOS", CLIOptions.uiClass, Class.forName("apple.laf.AquaLookAndFeel"));
+            } catch (ClassNotFoundException exc) {
+            }
+        }
+    }
+    
     public void testUserdir() {
         String orig = System.setProperty("netbeans.user", "before");
         new CLIOptions().cli(new String[] { "-userdir", "wrong" });
diff -r 4e7d8438f660 o.n.bootstrap/arch.xml
--- a/o.n.bootstrap/arch.xml	Mon Apr 21 13:26:54 2008 +0200
+++ b/o.n.bootstrap/arch.xml	Tue Apr 22 17:40:26 2008 +0200
@@ -629,7 +629,22 @@ made subject to such option by the copyr
             </li>
             <li>
                 <api type="export" group="cli" name="--ui" category="devel">
-                    Specify a look &amp; feel.
+                    Specify a look &amp; feel. The same as --laf.
+                    To make human life easier simple translation was added to convert L&amp;F ID to
+                    L&amp;F class name for known L&amp;Fs.
+                    <ul>
+                    <li>Metal is translated to javax.swing.plaf.metal.MetalLookAndFeel</li>
+                    <li>GTK is translated to com.sun.java.swing.plaf.gtk.GTKLookAndFeel</li>
+                    <li>Nimbus is translated to com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel</li>
+                    <li>Windows is translated to com.sun.java.swing.plaf.windows.WindowsLookAndFeel</li>
+                    <li>Aqua is translated to apple.laf.AquaLookAndFeel</li>
+                    </ul>
+                    
+                </api>
+            </li>
+            <li>
+                <api type="export" group="cli" name="--laf" category="devel">
+                    Specify a look &amp; feel. The same as --ui.
                 </api>
             </li>
             <li>
@@ -1358,4 +1373,49 @@ made subject to such option by the copyr
   </p>
  </answer>
 
+
+
+
+<!--
+        <question id="compat-deprecation" when="init">
+            How the introduction of your project influences functionality
+            provided by previous version of the product?
+            <hint>
+            If you are planning to deprecate/remove/change any existing APIs,
+            list them here accompanied with the reason explaining why you
+            are doing so.
+            </hint>
+        </question>
+-->
+ <answer id="compat-deprecation">
+  <p>
+   XXX no answer for compat-deprecation
+  </p>
+ </answer>
+
+
+
+<!--
+        <question id="resources-preferences" when="final">
+            Does your module uses preferences via Preferences API? Does your module use NbPreferences or
+            or regular JDK Preferences ? Does it read, write or both ? 
+            Does it share preferences with other modules ? If so, then why ?
+            <hint>
+                You may use
+                    &lt;api type="export" group="preferences"
+                    name="preference node name" category="private"&gt;
+                    description of individual keys, where it is used, what it
+                    influences, whether the module reads/write it, etc.
+                    &lt;/api&gt;
+                Due to XML ID restrictions, rather than /org/netbeans/modules/foo give the "name" as org.netbeans.modules.foo.
+                Note that if you use NbPreferences this name will then be the same as the code name base of the module.
+            </hint>
+        </question>
+-->
+ <answer id="resources-preferences">
+  <p>
+   XXX no answer for resources-preferences
+  </p>
+ </answer>
+
 </api-answers>