--- jsampler/trunk/src/org/jsampler/view/fantasia/ViewConfig.java	2007/11/19 22:10:18	1495
+++ jsampler/trunk/src/org/jsampler/view/fantasia/ViewConfig.java	2007/11/19 22:22:22	1496
@@ -50,8 +50,13 @@
 		try {
 			UIManager.setLookAndFeel(new SubstanceRavenGraphiteLookAndFeel());
 			UIManager.put(SubstanceLookAndFeel.WATERMARK_IGNORE, Boolean.TRUE);
-			javax.swing.JFrame.setDefaultLookAndFeelDecorated(true);
-			javax.swing.JDialog.setDefaultLookAndFeelDecorated(true);
+			
+			if(!preferences().getBoolProperty("TurnOffCustomWindowDecoration")) {
+				javax.swing.JFrame.setDefaultLookAndFeelDecorated(true);
+				javax.swing.JDialog.setDefaultLookAndFeelDecorated(true);
+			}
+			
+			Res.loadTheme(preferences().getStringProperty("Theme"));
 		} catch(Exception e) {
 			e.printStackTrace();
 		}