diff --git a/light8/patchdata.py b/light8/patchdata.py
--- a/light8/patchdata.py
+++ b/light8/patchdata.py
@@ -3,54 +3,55 @@ patch = {
     ('side l','sidepost1') : 45, # posts
     ('side r','sidepost2') : 46,
     
-    ('god',) : 6,
+    'sidefill1' : 13,
+    'sidefill2' : 14,
+
+    ('patio1','main 1',) : 1,
+    ('main 2',) : 2,
+    ('main 3',) : 3,
+    ('main 4',) : 4,
+    ('main 5',) : 5,
+    ('god','main 6') : 6,
+    ('main 7',) : 7,
+    ('main 8',) : 8,
+    ('main 9',) : 9,
+    ('main 10',) : 10,
+    ('main 11',):11,
+    ('patio2','main 12',):12,
+    'hotback':19,
+
+    'cycleft' : 43,
+    'cycright' : 42,
     
-    'house': 68,
-    ('ramp1','dolly-ramp-l','b11',): 54, # left bank over house
-    ('main-l-blue', 'b12',): 53,
-    ('ramp2', 'b13',): 52,
-    ('main-lc-fill', 'b14',): 51,
-    ('main-c1', 'b15',): 50,
-    ('main-r-red','b16',): 49,
-    ('ramp6','b21',): 55, # mid bank
-    ('ramp5','b22',): 56,
-    ('ramp0-stairs','b23',): 57,
-    ('main-c2', 'b24',): 58,
-    ('ramp9-stairs', 'stairs-r', 'b25',): 59,
-    ('ramp3', 'b26',): 60,
-    ('ramp4', 'b31',): 61, # right bank
-    ('main-l-red', 'b32',): 62,
-    ('main-c3', 'b33',): 63,
-    ('main-r-blue', 'b34',): 64,
-    ('ramp8', 'dolly-ramp-r', 'b35',) : 65,
-    ('ramp7', 'b36',): 66,
-
+    'house':68,
+    ('desk1' ,'b11'):54, # left bank over house
+    ('marry1' ,'b12'):53,
+    ('b13',):52,
+    ('hotbox1' ,'b14'):51,
+    ('edge' ,'b15'):50,
+    ('phone','b16'):49,
+    ('cuba1'   ,'b21'):55, # mid bank
+    ('b22',):56,
+    ('b23',):57,
+    ('b24'):58,
+    ('b25'):59,
+    ('desk2'   ,'b26'):60,
+    ('rock','b31'):61, # right bank
+    ('b32',):62,
+    ('hotbox2' ,'b33'):63,
+    ('b34',):64,
+    ('marry2' ,'b35'):65,
+    ('cuba2' ,'b36'):66,
     'oran1':21,    'oran2':25,    'oran3':29,    'oran4':33,
     'gree1':22,    'gree2':26,    'gree3':30,    'gree4':34,
     'blue1':23,    'blue2':27,    'blue3':31,    'blue4':35,
     'red1' :24,    'red2' :28,    'red3' :32,    'red4' :36,
-
-    # hello dolly
-    'f1' : 1,
-    'f1.5' : 3,
-    'f2' : 4,
-    'f3' : 5,
-    'f4' : 7,
-    'f5' : 8,
-    'diag' : 9,
-    'f6' : 10,
-    'diag-back' : 11,
-    'f7' : 12,
-
-    'downfill-left' : 13,
-    'downfill-right' : 14,
-    'l-scp' : 40,
-    'r-scp' : 37,
-    'upstairs above' : 39,
-    'upstairs front' : 15,
-    'storefill' : 17,
-    'dayback' : 41,
-    'judge' : 19,
-    ('c-scp', 'c-scoop') : 38,
-    'candles' : 42,
+    'upfill1' : 40,
+    'upfill2' : 38,
+    'upfill3' : 37,
+    'upfill4' : 39,
+    'cafe1': 15,
+    'cafe2': 16,
+    'dream':17,
+    'xmas':41,
 }