diff --git a/diylc/catalog_full.json b/diylc/catalog_full.json
index d8057935..f6aaf364 100644
--- a/diylc/catalog_full.json
+++ b/diylc/catalog_full.json
@@ -7837,7 +7837,7 @@
     "className" : "electromechanical.MiniRelay",
     "category" : "Electro-Mechanical",
     "namePrefix" : "RY",
-    "description" : "Miniature PCB mount relay, like Omron G5V-1 or G5V-2",
+    "description" : "Miniature PCB mount relay, like Omron G5V-1/G5V-2 or Fujitsu FTR-B3",
     "creationMethod" : "SINGLE_CLICK",
     "notes" : [ "The first control point is the anchor; with 'Orientation' DEFAULT the first column of pins runs down from it, the second column sits to the right and the indent is at the anchor's end. The other orientations rotate this around the anchor", "Pin offsets down each column from the anchor: Miniature DPDT 0, 0.3, 0.5 and 0.7in, SPDT 0, 0.5 and 0.7in, columns 0.3in apart; Ultra_miniature DPDT 0, 0.2, 0.3 and 0.4in, SPDT 0, 0.3 and 0.4in, columns 0.2in apart" ],
     "properties" : [ {
@@ -7994,7 +7994,7 @@
     }, {
       "name" : "Type",
       "type" : "ToggleSwitchType",
-      "possibleValues" : [ "SPST", "SPDT", "SPDT_off", "DPDT", "DPDT_off", "DPDT_ononon_1", "DPDT_ononon_2", "_3PDT", "_3PDT_off", "_4PDT", "_4PDT_off", "_4PDT_ononon_1", "_4PDT_ononon_2", "_5PDT", "_5PDT_off" ],
+      "possibleValues" : [ "SPST", "SPDT", "SPDT_off", "DPDT", "DPDT_off", "DPDT_ononon_1", "DPDT_ononon_2", "_3PDT", "_3PDT_off", "_4PDT", "_4PDT_off", "_4PDT_ononon_1", "_4PDT_ononon_2", "_5PDT", "_5PDT_off", "_6PDT", "_6PDT_off" ],
       "defaultValue" : "DPDT"
     } ],
     "pinout" : {
@@ -8266,6 +8266,41 @@
             "connected" : [ [ 1, 2 ], [ 4, 5 ], [ 7, 8 ], [ 10, 11 ], [ 13, 14 ] ]
           } ]
         }
+      }, {
+        "when" : {
+          "Type" : "_6PDT"
+        },
+        "pinCount" : 18,
+        "labels" : "sequential",
+        "switching" : {
+          "positionCount" : 2,
+          "positions" : [ {
+            "name" : "ON1",
+            "connected" : [ [ 0, 1 ], [ 3, 4 ], [ 6, 7 ], [ 9, 10 ], [ 12, 13 ], [ 15, 16 ] ]
+          }, {
+            "name" : "ON2",
+            "connected" : [ [ 1, 2 ], [ 4, 5 ], [ 7, 8 ], [ 10, 11 ], [ 13, 14 ], [ 16, 17 ] ]
+          } ]
+        }
+      }, {
+        "when" : {
+          "Type" : "_6PDT_off"
+        },
+        "pinCount" : 18,
+        "labels" : "sequential",
+        "switching" : {
+          "positionCount" : 3,
+          "positions" : [ {
+            "name" : "ON1",
+            "connected" : [ [ 0, 1 ], [ 3, 4 ], [ 6, 7 ], [ 9, 10 ], [ 12, 13 ], [ 15, 16 ] ]
+          }, {
+            "name" : "OFF",
+            "connected" : [ ]
+          }, {
+            "name" : "ON2",
+            "connected" : [ [ 1, 2 ], [ 4, 5 ], [ 7, 8 ], [ 10, 11 ], [ 13, 14 ], [ 16, 17 ] ]
+          } ]
+        }
       } ]
     }
   }, {
@@ -13969,6 +14004,58 @@
         "label" : "-"
       } ]
     }
+  }, {
+    "name" : "Box (Schematic)",
+    "className" : "schematic.SchematicBox",
+    "category" : "Schematic Symbols",
+    "namePrefix" : "U",
+    "description" : "Generic schematic box with configurable terminals",
+    "creationMethod" : "SINGLE_CLICK",
+    "properties" : [ {
+      "name" : "Alpha",
+      "type" : "Percentage",
+      "format" : "number without the % sign, e.g. 100",
+      "defaultValue" : "100"
+    }, {
+      "name" : "Body",
+      "type" : "Color",
+      "format" : "hex",
+      "defaultValue" : "#FFFFFF"
+    }, {
+      "name" : "Border",
+      "type" : "Color",
+      "format" : "hex",
+      "defaultValue" : "#000000"
+    }, {
+      "name" : "Bottom Nodes",
+      "type" : "String"
+    }, {
+      "name" : "Display",
+      "type" : "Display",
+      "possibleValues" : [ "NAME", "VALUE", "NONE", "BOTH" ],
+      "defaultValue" : "BOTH"
+    }, {
+      "name" : "Left Nodes",
+      "type" : "String",
+      "defaultValue" : "1,2"
+    }, {
+      "name" : "Name",
+      "type" : "String"
+    }, {
+      "name" : "Right Nodes",
+      "type" : "String",
+      "defaultValue" : "3,4"
+    }, {
+      "name" : "Top Nodes",
+      "type" : "String"
+    }, {
+      "name" : "Value",
+      "type" : "String"
+    } ],
+    "pinout" : {
+      "pinCount" : 4,
+      "labels" : "sequential"
+    }
   }, {
     "name" : "Bulb (Schematic)",
     "className" : "misc.BulbSchematicSymbol",
diff --git a/diylc/catalog_index.json b/diylc/catalog_index.json
index 51b0f28c..62df47e5 100644
--- a/diylc/catalog_index.json
+++ b/diylc/catalog_index.json
@@ -389,6 +389,9 @@
     }, {
       "name" : "Battery (Schematic)",
       "className" : "misc.BatterySymbol"
+    }, {
+      "name" : "Box (Schematic)",
+      "className" : "schematic.SchematicBox"
     }, {
       "name" : "Bulb (Schematic)",
       "className" : "misc.BulbSchematicSymbol"
diff --git a/diylc/diylc-library/src/test/java/org/diylc/schematic/SchematicLayoutReportTest.java b/diylc/diylc-library/src/test/java/org/diylc/schematic/SchematicLayoutReportTest.java
index e2380d59..6038ca8e 100644
--- a/diylc/diylc-library/src/test/java/org/diylc/schematic/SchematicLayoutReportTest.java
+++ b/diylc/diylc-library/src/test/java/org/diylc/schematic/SchematicLayoutReportTest.java
@@ -233,7 +233,7 @@ public class SchematicLayoutReportTest {
           new DrawingManager(null, InMemoryConfigurationManager.getInstance());
       manager.drawProject(g2d, project, DRAW_OPTIONS, null, null,
           new HashSet<IDIYComponent<?>>(), new HashSet<IDIYComponent<?>>(),
-          new HashSet<IDIYComponent<?>>(), null, null, false, null, null, null);
+          new HashSet<IDIYComponent<?>>(), null, null, false, null, null, null, null);
       return manager.getContinuityAreas();
     } finally {
       g2d.dispose();
diff --git a/diylc/diylc-library/src/test/resources/pinout-drivers.txt b/diylc/diylc-library/src/test/resources/pinout-drivers.txt
index b6568ec1..ecd9944b 100644
--- a/diylc/diylc-library/src/test/resources/pinout-drivers.txt
+++ b/diylc/diylc-library/src/test/resources/pinout-drivers.txt
@@ -133,6 +133,7 @@ passive.ToroidalInductor = fixed
 passive.TransformerCoil = fixed
 passive.TransformerCore = none
 passive.TrimmerPotentiometer = fixed
+schematic.SchematicBox = fixed
 semiconductors.BJTSymbol = fixed
 semiconductors.BridgeRectifier = fixed
 semiconductors.DIL_IC = Display Pin #s, Pins