diff --git a/js/menus/LatticeMenuView.js b/js/menus/LatticeMenuView.js
index dc62922099e5127b42515b554cad2c06373a0678..44ae8f2bb2b45465205e1688f540000d6b996c70 100644
--- a/js/menus/LatticeMenuView.js
+++ b/js/menus/LatticeMenuView.js
@@ -81,29 +81,14 @@ LatticeMenuView = Backbone.View.extend({
     },
 
     _setAppStateToDefaultsSilently: function(newCellType, newConnectionType){
-        if (newCellType == "cube") {
-            if (!newConnectionType){
-                newConnectionType = "face";
-                this.lattice.set("connectionType", newConnectionType, {silent:true});
-            }
-            this.model.set("connectionType", newConnectionType, {silent:true});
-            if (newConnectionType == "face"){
-                this.lattice.set("partType", null, {silent:true});
-            }
-        }
-        else if (newCellType == "octa") {
-            if (!newConnectionType){
-                newConnectionType = "face";
-                this.lattice.set("connectionType", newConnectionType, {silent:true});
-            }
-            if (newConnectionType == "face"){
-                this.lattice.set("partType", "triangle", {silent:true});
-            } else if (newConnectionType == "edge"){
-                this.lattice.set("partType", "triangle", {silent:true});
-            } else if (newConnectionType == "vertex"){
-                this.lattice.set("partType", "square", {silent:true});
-            }
+        if (!newConnectionType){
+            newConnectionType = "face";
+            this.lattice.set("connectionType", newConnectionType, {silent:true});
         }
+        this.model.set("connectionType", newConnectionType, {silent:true});
+
+        var partType = _.keys(dmaGlobals.appState.get("allPartTypes")[newCellType][newConnectionType])[0];
+        this.lattice.set("partType", partType, {silent:true});
     },
 
     _changePreserveCells: function(e){
diff --git a/js/models/AppState.js b/js/models/AppState.js
index 4af6c7771f64ce05edc6e63bda01ecb3de1b70e8..73a48e52add0b7273b6735ac1a1c98b1b350c15b 100644
--- a/js/models/AppState.js
+++ b/js/models/AppState.js
@@ -27,12 +27,12 @@ AppState = Backbone.Model.extend({
             octa:{
                 face: {triangle:"Triangle", beam:"Beam"},
                 freeformFace: {triangle:"Triangle", beam:"Beam"},
-                edge: {triangle:"Triangle", beam:"Beam"},
-                edgeRot: {beam:"DmaBeam"},
-                vertex: {square:"Square", xShape:"X", beam:"Beam"}
+                edge: {beam:"Beam", triangle:"Triangle"},
+                edgeRot: {beam:"Beam"},
+                vertex: {beam:"Beam", square:"Square", xShape:"X"}
             },
             cube:{
-                face: null
+                face: {beam:"Beam"}
             }
         },