diff --git a/new-additions/takeoff/lighting-controls.md b/new-additions/takeoff/lighting-controls.md
index 2ac5c89..2f141e5 100644
--- a/new-additions/takeoff/lighting-controls.md
+++ b/new-additions/takeoff/lighting-controls.md
@@ -12,6 +12,22 @@ All control methods are likely to appear in drawings.
 > [!info] "Local Control"
 > The term "local control only" is sometimes used to indicate no condiseration
 > for *any* lighting control beyond standard devices,
-> (with dimmers being the triac type)
+> (with $Ds being the triac type)
 > however, this phrasing is ambiguous and non-universal.
 > Confirm with the bid team on what must be included.
+
+## Custom Switch Boxes
+
+For switch combinations not in `COMMON ASSEMBLIES`,
+create heating designations based on the most similar.
+
+### Naming
+
+#### Format
+
+```regex
+<phase-abbr> - <assembly>(\: <subtype>)?( - <fixture-labor>)? \(<wiring-method>\)( <wm-descriptor>)* <branch-length>ft
+```
+
+> [!example]
+> `A - Surface: Pendant - 2.0hrs (MC) LV 20ft`
diff --git a/new-additions/takeoff/lighting.md b/new-additions/takeoff/lighting.md
index 1953a1e..abd2f07 100644
--- a/new-additions/takeoff/lighting.md
+++ b/new-additions/takeoff/lighting.md
@@ -1,8 +1,34 @@
-# Lighting Takeoff
+# Lighting Takeoff (Fixtures)
 
-## Fixtures
+## Naming
 
-### Fixture Labor
+### Format
+
+```regex
+<phase-abbr> - <assembly>(\: <subtype>)?( - <fixture-labor>)? \(<wiring-method>\)( <wm-descriptor>)* <branch-length>ft
+```
+
+> [!example]
+> `A - Surface: Pendant - 2.0hrs (MC) LV 20ft`
+
+### Order
+
+Use empty designations to separate phases.
+
+> [!example]
+> ```
+> *** Hotel Units ***
+> HU - Surface (MC) LV 20ft
+> HU - Surface - 1.5hrs (MC) LV 20ft
+> HU - Surface: Pendant - 2.0hrs (MC) LV 20ft
+> HU - Surface: J-Box For Future Fixture (MC) LV 20ft
+> HU - Recessed (MC) LV 20ft
+> *** Condo Units ***
+> CU - Surface: Tape - 1.0hrs (MC) LV 25ft
+> CU - Surface: Wall (MC) LV 25ft
+> ```
+
+## Fixture Labor
 
 > | Fixture Type | Labor          |
 > | ------------ | -------------- |
@@ -15,7 +41,7 @@
 >
 > [^1]: Determine exact labor from fixture and size.
 
-### Fixture Branch Length
+## Fixture Branch Length
 
 > | Case             | Standard Length |
 > | -------------    | --------------- |
@@ -32,7 +58,7 @@
 >
 > [^2]: See fixture types below for special cases.
 
-### Fixture Branch Wire size
+## Fixture Branch Wire size
 
 > | Case           | Wire Size |
 > | -------------- | --------- |
@@ -45,9 +71,9 @@
 >
 > [^2]: Kitchen and bathroom fixtures shall be #12 (NOT #14) on wood frame (NM) projects.
 
-### Garage
+## Garage
 
-#### Fixtures
+### Fixtures
 
 Use ENT Assembly unless spec requires otherwise.
 
@@ -61,7 +87,7 @@ If PVC, use following assemblies:
 | Ceiling | `PVC/ENT ASSEMBLIES`/`... - SLAB BOX / 45 DEG STUBBY`                      |
 | Wall    | `PVC/ENT ASSEMBLIES`/`... - STL BOX & TILE RING / 45 DEG STUBBY/ ENT DROP` |
 
-#### Homeruns
+### Homeruns
 
 > `System` = "EL - Electrical"
 
@@ -69,7 +95,7 @@ Use 1 Homerun for every 3 circuits in Garage
 
 Use assembly `Common Assemblies`/`Device Homeruns in Slab/Deck`
 
-### Surface Mount
+## Surface Mount
 
 * Wall Mount (Sconce)
 * Pendant
@@ -88,7 +114,7 @@ Use assembly `Common Assemblies`/`Device Homeruns in Slab/Deck`
 > [!note]
 > Use lighting control cable assemblies in Amenity areas
 
-#### Tape Lighting
+### Tape Lighting
 
 Also called "cove" or "strip",
 however those terms are less specific
@@ -128,7 +154,7 @@ A - Tape 9.5hr (109-114ft) - MC #12 40ft
 A - Tape 10.0hr (115-120ft) - MC #12 40ft
 ```
 
-### Recessed
+## Recessed
 
 * recessed downlight
 * recessed linear
@@ -147,7 +173,7 @@ round up to the nearest 5ft
 > [!note]
 > "HI HAT" refers to a recessed can fixture.
 
-### Undercabinet Fixtures
+## Undercabinet Fixtures
 
 | Wiring Method | Assembly Path                         |
 | ------------- | ------------------------------------- |
@@ -159,7 +185,7 @@ round up to the nearest 5ft
 
 Use 10ft #12/2 for MC & NM
 
-### Paddle Fans
+## Paddle Fans
 
 | Wiring Method | Assembly Path                                         |
 | ------------- | ----------------------------------------------------- |
@@ -167,11 +193,11 @@ Use 10ft #12/2 for MC & NM
 | MC Cable      | `MC ASSEMBLIES`/`FAN RATED OCT BOX W/ BAR HNGR - ...` |
 | PVC           | `PVC/ENT ASSEMBLIES`/`... - SLAB BOX / 45 DEG STUBBY` |
 
-### Stairwells & Elevators
+## Stairwells & Elevators
 
 `PVC/ENT ASSEMBLIES`/`... - SLAB BOX / 45 DEG STUBBY`
 
-### Facade
+## Facade
 
 > `Phase` = "Facade"
 
@@ -185,24 +211,24 @@ Length and Labor will be more than a normal fixture in BOH/Amenity
 > 1. `3/4" PVC W/ 3#10 - STL BOX & TILE RING / 45 DEG STUBBY/ ENT DROP`
 >   * `Length per Unit` = Distance to panel
 
-### Porte Cochere (Drive up Area)
+## Porte Cochere (Drive up Area)
 
 Create its own breakout in WBS, and phase in Accubid
 
 This is not technically exposed or drop ceiling, but still use PVC
 
-### FAA Lighting
+## FAA Lighting
 
 > 1. `FIXTURE LABOR`/`FIXTURE LABOR 1HR`
 > 2. `FESTOON & ROOF ASSEMBLIES`/`Aircraft Warning, 3/4" Conduit GRC/PVC 2#10, 1#10G`
 
-## Site & Courtyard
+# Site & Courtyard
 
-### Breakdowns
+## Breakdowns
 
 > `System` = "FML - Site Fixtures Material & Labor"
 
-### Fixture Assemblies
+## Fixture Assemblies
 
 > | Fixture Type                         | Assembly Path                                                                    |
 > | ------------------------------------ | -------------------------------------------------------------------------------- |
@@ -217,7 +243,7 @@ This is not technically exposed or drop ceiling, but still use PVC
 >
 > [^2]: Per Corwin: Hand rail lights should have a rigid 90 stub up and some flex
 
-#### Festoon Lighting
+### Festoon Lighting
 
 AKA "string" or "market" lights