diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/config.properties b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/config.properties
index 614427b5..024146a0 100644
--- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/config.properties	
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/config.properties	
@@ -1,3 +1,4 @@
 # Uncomment lines you want to edit and change the part after the "=" sign.
 #org.diylc.presenter.InstantiationManager.MAX_RECENT_COMPONENTS=20
-#org.diylc.swing.plugins.canvas.CanvasPanel.USE_HARDWARE_ACCELLERATION=true
\ No newline at end of file
+#org.diylc.swing.plugins.canvas.CanvasPanel.USE_HARDWARE_ACCELLERATION=true
+#org.diylc.swing.gui.editor.PropertyEditorDialog.SHOW_DEFAULT_BOXES=true
\ No newline at end of file
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/lib/swing-framework.jar b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/lib/swing-framework.jar
new file mode 100644
index 00000000..02a4de6f
Binary files /dev/null and b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/lib/swing-framework.jar differ
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/gui/editor/PropertyEditorDialog.java b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/gui/editor/PropertyEditorDialog.java
index 6717280a..a1a4efc3 100644
--- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/gui/editor/PropertyEditorDialog.java	
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/src/org/diylc/swing/gui/editor/PropertyEditorDialog.java	
@@ -33,6 +33,7 @@ public class PropertyEditorDialog extends ButtonDialog {
 
 	private static final long serialVersionUID = 1L;
 
+	public static boolean SHOW_DEFAULT_BOXES = false;
 	private static final String DEFAULT_BOX_TOOLTIP = "<html>If this box is checked application will use the current value as a<br>default when creating new components of the same type</html>";
 
 	private List<PropertyWrapper> properties;
@@ -128,7 +129,9 @@ public class PropertyEditorDialog extends ButtonDialog {
 				gbc.fill = GridBagConstraints.NONE;
 				gbc.weightx = 0;
 
-				editorPanel.add(createDefaultCheckBox(property), gbc);
+				if (SHOW_DEFAULT_BOXES) {
+					editorPanel.add(createDefaultCheckBox(property), gbc);
+				}
 			}
 
 			// Make value field focused
diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/update.xml b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/update.xml
index 96f44ae9..d754b9b1 100644
--- a/ diy-layout-creator --username bancika@gmail.com/diylc-swing/update.xml	
+++ b/ diy-layout-creator --username bancika@gmail.com/diylc-swing/update.xml	
@@ -857,6 +857,10 @@
 				<org.diylc.appframework.update.Change>
 					<changeType>NEW_FEATURE</changeType>
 					<description>Added support for component templates</description>
+				</org.diylc.appframework.update.Change>		
+				<org.diylc.appframework.update.Change>
+					<changeType>IMPROVEMENT</changeType>
+					<description>Hidden "default" checkboxes from the editor because templates cover that functionality. If you need them back however, uncomment org.diylc.swing.gui.editor.PropertyEditorDialog.SHOW_DEFAULT_BOXES=true in the config.properties file</description>
 				</org.diylc.appframework.update.Change>					
 			</changes>
 			<url>http://code.google.com/p/diy-layout-creator/downloads/list</url>