diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/FirstPanel.java b/Tools/Source/MigrationTools/org/tianocore/migration/FirstPanel.java
index 342c01c443..18c02996ea 100644
--- a/Tools/Source/MigrationTools/org/tianocore/migration/FirstPanel.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/FirstPanel.java
@@ -124,8 +124,15 @@ public class FirstPanel extends JPanel implements ActionListener, UI {
     //---------------------------------------------------------------------------------------//
     
     public static void init() throws Exception {
-		JFrame.setDefaultLookAndFeelDecorated(true);
-		JFrame frame = new JFrame("FrameDemo");
+    	
+    	//UIManager.setLookAndFeel(UIManager.getCrossPlatformLookAndFeelClassName());
+    	UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+    	//UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel");
+    	//UIManager.setLookAndFeel("com.sun.java.swing.plaf.windows.WindowsLookAndFeel");
+    	//UIManager.setLookAndFeel("com.sun.java.swing.plaf.gtk.GTKLookAndFeel");
+    	//UIManager.setLookAndFeel("com.sun.java.swing.plaf.motif.MotifLookAndFeel");
+    	
+		JFrame frame = new JFrame("MigrationTools");
 		frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 
         FirstPanel fp = new FirstPanel();