diff --git a/images/Decrease-Indent-32 (3).png b/images/Decrease-Indent-32 (3).png
new file mode 100644
index 00000000..8697e9d0
Binary files /dev/null and b/images/Decrease-Indent-32 (3).png differ
diff --git a/images/Increase-Indent-32.png b/images/Increase-Indent-32.png
new file mode 100644
index 00000000..3be843cd
Binary files /dev/null and b/images/Increase-Indent-32.png differ
diff --git a/openscad.pro.user b/openscad.pro.user
new file mode 100644
index 00000000..53b4bd75
--- /dev/null
+++ b/openscad.pro.user
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE QtCreatorProject>
+<!-- Written by QtCreator 3.0.1, 2014-12-25T22:16:35. -->
+<qtcreator>
+ <data>
+  <variable>ProjectExplorer.Project.ActiveTarget</variable>
+  <value type="int">0</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.EditorSettings</variable>
+  <valuemap type="QVariantMap">
+   <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
+   <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
+   <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
+   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
+    <value type="QString" key="language">Cpp</value>
+    <valuemap type="QVariantMap" key="value">
+     <value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
+    </valuemap>
+   </valuemap>
+   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
+    <value type="QString" key="language">QmlJS</value>
+    <valuemap type="QVariantMap" key="value">
+     <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
+    </valuemap>
+   </valuemap>
+   <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
+   <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
+   <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
+   <value type="int" key="EditorConfiguration.IndentSize">4</value>
+   <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
+   <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
+   <value type="int" key="EditorConfiguration.PaddingMode">1</value>
+   <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
+   <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
+   <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
+   <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
+   <value type="int" key="EditorConfiguration.TabSize">8</value>
+   <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
+   <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
+   <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
+   <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
+   <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
+   <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.PluginSettings</variable>
+  <valuemap type="QVariantMap"/>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.Target.0</variable>
+  <valuemap type="QVariantMap">
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 4.8.6 (qt4)</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Qt 4.8.6 (qt4)</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{90222843-28c9-4a66-ac82-99bd31ae7263}</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory"></value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value>
+      <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments">CONFIG+=experimental</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
+       <value type="QString">-w</value>
+       <value type="QString">-r</value>
+      </valuelist>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
+       <value type="QString">-w</value>
+       <value type="QString">-r</value>
+      </valuelist>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
+    <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">1</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy locally</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
+    <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
+    <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
+    <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
+    <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
+    <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
+    <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
+    <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
+    <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
+     <value type="int">0</value>
+     <value type="int">1</value>
+     <value type="int">2</value>
+     <value type="int">3</value>
+     <value type="int">4</value>
+     <value type="int">5</value>
+     <value type="int">6</value>
+     <value type="int">7</value>
+     <value type="int">8</value>
+     <value type="int">9</value>
+     <value type="int">10</value>
+     <value type="int">11</value>
+     <value type="int">12</value>
+     <value type="int">13</value>
+     <value type="int">14</value>
+    </valuelist>
+    <value type="int" key="PE.EnvironmentAspect.Base">2</value>
+    <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">openscad</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/shaina/letsstartopenscad/openscad/openscad.pro</value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">openscad.pro</value>
+    <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
+    <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">false</value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
+    <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
+    <value type="bool" key="RunConfiguration.UseCppDebugger">true</value>
+    <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">false</value>
+    <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.TargetCount</variable>
+  <value type="int">1</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable>
+  <value type="QByteArray">{56f57d1a-fe9b-42b2-a96b-3ac76cf7565f}</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
+  <value type="int">15</value>
+ </data>
+</qtcreator>
diff --git a/openscad.qrc b/openscad.qrc
index f202c2d4..34be07fc 100644
--- a/openscad.qrc
+++ b/openscad.qrc
@@ -1,63 +1,65 @@
 <RCC>
-  <qresource prefix="/">
-    <file>icons/openscad.png</file>
-    <file>icons/button.png</file>
-    <file>icons/background-welcome-screen.svg</file>
-    <file>icons/prefsFeatures.png</file>
-    <file>icons/stopbutton.png</file>
-    <file>icons/prefsAdvanced.png</file>
-    <file>icons/prefs3DView.png</file>
-    <file>icons/prefsEditor.png</file>
-    <file>icons/prefsUpdate.png</file>
-    <file>icons/flattr.png</file>
-    <file>src/AboutDialog.html</file>
-    <file>images/Arrowhead-Right-32.png</file>
-    <file>images/export.png</file>
-    <file>images/axes.png</file>
-    <file>images/export-white.png</file>
-    <file>images/back.png</file>
-    <file>images/Document-New-128.png</file>
-    <file>images/front.png</file>
-    <file>images/grid.png</file>
-    <file>images/Open-128.png</file>
-    <file>images/openscad.png</file>
-    <file>images/right.png</file>
-    <file>images/Save-128.png</file>
-    <file>images/up.png</file>
-    <file>images/bottom.png</file>
-    <file>images/left.png</file>
-    <file>images/blackUp.png</file>
-    <file>images/blackNew.png</file>
-    <file>images/blackRender.png</file>
-    <file>images/Rotation-32.png</file>
-    <file>images/Shape-Cube-32.png</file>
-    <file>images/Open-32.png</file>
-    <file>images/Save-32.png</file>
-    <file>images/blackbottom.png</file>
-    <file>images/blackleft (copy).png</file>
-    <file>images/rightright.png</file>
-    <file>images/blackfront.png</file>
-    <file>images/blackback.png</file>
-    <file>images/blackaxes.png</file>
-    <file>images/zoomin.png</file>
-    <file>images/zoomout.png</file>
-    <file>images/wireframe1.png</file>
-    <file>images/surface.png</file>
-    <file>images/Zoom-In-32.png</file>
-    <file>images/Zoom-Out-32.png</file>
-    <file>images/zoom-all.png</file>
-    <file>images/zoom-all-white.png</file>
-    <file>images/surfaceWhite.png</file>
-    <file>images/wireframeWhite.png</file>
-    <file>images/orthogonal.png</file>
-    <file>images/cross.png</file>
-    <file>images/perspective1.png</file>
-    <file>images/Preview-32.png</file>
-    <file>images/animate.png</file>
-    <file>images/Preview-32 (1).png</file>
-    <file>images/orthogonalwhite.png</file>
-    <file>images/perspective1white.png</file>
-    <file>images/crosswhite.png</file>
-    <file>icons/background.png</file>
-  </qresource>
+    <qresource prefix="/">
+        <file>icons/openscad.png</file>
+        <file>icons/button.png</file>
+        <file>icons/background-welcome-screen.svg</file>
+        <file>icons/prefsFeatures.png</file>
+        <file>icons/stopbutton.png</file>
+        <file>icons/prefsAdvanced.png</file>
+        <file>icons/prefs3DView.png</file>
+        <file>icons/prefsEditor.png</file>
+        <file>icons/prefsUpdate.png</file>
+        <file>icons/flattr.png</file>
+        <file>src/AboutDialog.html</file>
+        <file>images/Arrowhead-Right-32.png</file>
+        <file>images/export.png</file>
+        <file>images/axes.png</file>
+        <file>images/export-white.png</file>
+        <file>images/back.png</file>
+        <file>images/Document-New-128.png</file>
+        <file>images/front.png</file>
+        <file>images/grid.png</file>
+        <file>images/Open-128.png</file>
+        <file>images/openscad.png</file>
+        <file>images/right.png</file>
+        <file>images/Save-128.png</file>
+        <file>images/up.png</file>
+        <file>images/bottom.png</file>
+        <file>images/left.png</file>
+        <file>images/blackUp.png</file>
+        <file>images/blackNew.png</file>
+        <file>images/blackRender.png</file>
+        <file>images/Rotation-32.png</file>
+        <file>images/Shape-Cube-32.png</file>
+        <file>images/Open-32.png</file>
+        <file>images/Save-32.png</file>
+        <file>images/blackbottom.png</file>
+        <file>images/blackleft (copy).png</file>
+        <file>images/rightright.png</file>
+        <file>images/blackfront.png</file>
+        <file>images/blackback.png</file>
+        <file>images/blackaxes.png</file>
+        <file>images/zoomin.png</file>
+        <file>images/zoomout.png</file>
+        <file>images/wireframe1.png</file>
+        <file>images/surface.png</file>
+        <file>images/Zoom-In-32.png</file>
+        <file>images/Zoom-Out-32.png</file>
+        <file>images/zoom-all.png</file>
+        <file>images/zoom-all-white.png</file>
+        <file>images/surfaceWhite.png</file>
+        <file>images/wireframeWhite.png</file>
+        <file>images/orthogonal.png</file>
+        <file>images/cross.png</file>
+        <file>images/perspective1.png</file>
+        <file>images/Preview-32.png</file>
+        <file>images/animate.png</file>
+        <file>images/Preview-32 (1).png</file>
+        <file>images/orthogonalwhite.png</file>
+        <file>images/perspective1white.png</file>
+        <file>images/crosswhite.png</file>
+        <file>icons/background.png</file>
+        <file>images/Decrease-Indent-32 (3).png</file>
+        <file>images/Increase-Indent-32.png</file>
+    </qresource>
 </RCC>
diff --git a/src/MainWindow.ui b/src/MainWindow.ui
index 74365644..97ddb8ce 100644
--- a/src/MainWindow.ui
+++ b/src/MainWindow.ui
@@ -170,7 +170,7 @@
      <x>0</x>
      <y>0</y>
      <width>1397</width>
-     <height>22</height>
+     <height>25</height>
     </rect>
    </property>
    <widget class="QMenu" name="menu_File">
@@ -346,6 +346,8 @@
        <addaction name="designActionRender"/>
        <addaction name="separator"/>
        <addaction name="designActionExportSTL"/>
+       <addaction name="editActionIndent"/>
+       <addaction name="editActionUnindent"/>
       </widget>
      </item>
      <item>
@@ -603,6 +605,10 @@
    </property>
   </action>
   <action name="editActionIndent">
+   <property name="icon">
+    <iconset resource="../openscad.qrc">
+     <normaloff>:/images/Increase-Indent-32.png</normaloff>:/images/Increase-Indent-32.png</iconset>
+   </property>
    <property name="text">
     <string>&amp;Indent</string>
    </property>
@@ -610,14 +616,6 @@
     <string>Ctrl+I</string>
    </property>
   </action>
-  <action name="editActionUnindent">
-   <property name="text">
-    <string>U&amp;nindent</string>
-   </property>
-   <property name="shortcut">
-    <string>Ctrl+Shift+I</string>
-   </property>
-  </action>
   <action name="editActionComment">
    <property name="text">
     <string>C&amp;omment</string>
@@ -1137,6 +1135,27 @@
     <string>Hide toolbars</string>
    </property>
   </action>
+  <action name="actionUnindent">
+   <property name="icon">
+    <iconset resource="../openscad.qrc">
+     <normaloff>:/images/Decrease-Indent-32 (1).png</normaloff>:/images/Decrease-Indent-32 (1).png</iconset>
+   </property>
+   <property name="text">
+    <string>Unindent</string>
+   </property>
+  </action>
+  <action name="editActionUnindent">
+   <property name="icon">
+    <iconset resource="../openscad.qrc">
+     <normaloff>:/images/Decrease-Indent-32 (3).png</normaloff>:/images/Decrease-Indent-32 (3).png</iconset>
+   </property>
+   <property name="text">
+    <string>U&amp;nindent</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+Shift+I</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>