                                        {:key "fade-time" :name "Fade" :min 1 :max 2000 :start 50 :type :integer}]))
 
     ;; Dimmer oscillator cues: Sawtooth
-    (make-sawtooth-dimmer-cue nil 0 3 :yellow)
-    (doall (map-indexed (fn [i group] (make-sawtooth-dimmer-cue group (inc i) 3 :orange)) light-groups))
+    (make-sawtooth-dimmer-cue nil (+ x-base 0) (+ y-base 3) :yellow)
+    (doall (map-indexed (fn [i group]
+                          (make-sawtooth-dimmer-cue group (+ x-base (inc i)) (+ y-base 3) :orange)) light-groups))
 
     ;; Dimmer oscillator cues: Triangle
-    (make-triangle-dimmer-cue nil 0 4 :orange)
-    (doall (map-indexed (fn [i group] (make-triangle-dimmer-cue group (inc i) 4 :red)) light-groups))
+    (make-triangle-dimmer-cue nil (+ x-base 0) (+ y-base 4) :orange)
+    (doall (map-indexed (fn [i group]
+                          (make-triangle-dimmer-cue group (+ x-base (inc i)) (+ y-base 4) :red)) light-groups))
 
     ;; Dimmer oscillator cues: Sine
-    (make-sine-dimmer-cue nil 0 5 :cyan)
-    (doall (map-indexed (fn [i group] (make-sine-dimmer-cue group (inc i) 5 :blue)) light-groups))
+    (make-sine-dimmer-cue nil (+ x-base 0) (+ y-base 5) :cyan)
+    (doall (map-indexed (fn [i group]
+                          (make-sine-dimmer-cue group (+ x-base (inc i)) (+ y-base 5) :blue)) light-groups))
 
     ;; Dimmer oscillator cues: Square
-    (make-square-dimmer-cue nil 0 6 :cyan)
-    (doall (map-indexed (fn [i group] (make-square-dimmer-cue group (inc i) 6 :green)) light-groups))
+    (make-square-dimmer-cue nil (+ x-base 0) (+ y-base 6) :cyan)
+    (doall (map-indexed (fn [i group]
+                          (make-square-dimmer-cue group (+ x-base (inc i)) (+ y-base 6) :green)) light-groups))
 
     ;; Strobe cues
-    (make-strobe-cue-2 "All" (show/all-fixtures) 0 7)
-    (make-strobe-cue-2 "Torrents" (show/fixtures-named "torrent") 1 7)
-    (make-strobe-cue-2 "Blades" (show/fixtures-named "blade") 2 7)
-    (make-strobe-cue-2 "Weather Systems" (show/fixtures-named "ws") 3 7)
-    (make-strobe-cue-2 "Hexes" (show/fixtures-named "hex") 4 7)
-    (make-strobe-cue-2 "Pucks" (show/fixtures-named "puck") 5 7)
-    (make-strobe-cue-2 "Snowball" (show/fixtures-named "snowball") 6 7)
+    (make-strobe-cue-2 "All" (show/all-fixtures) (+ x-base 0) (+ y-base 7))
+    (make-strobe-cue-2 "Torrents" (show/fixtures-named "torrent") (+ x-base 1) (+ y-base 7))
+    (make-strobe-cue-2 "Blades" (show/fixtures-named "blade") (+ x-base 2) (+ y-base 7))
+    (make-strobe-cue-2 "Weather Systems" (show/fixtures-named "ws") (+ x-base 3) (+ y-base 7))
+    (make-strobe-cue-2 "Hexes" (show/fixtures-named "hex") (+ x-base 4) (+ y-base 7))
+    (make-strobe-cue-2 "Pucks" (show/fixtures-named "puck") (+ x-base 5) (+ y-base 7))
+    (make-strobe-cue-2 "Snowball" (show/fixtures-named "snowball") (+ x-base 6) (+ y-base 7))
 
     (let [color-var {:key :strobe-color :type :color :name "Strobe Color"}]
-      (ct/set-cue! (:cue-grid *show*) 7 7
+      (ct/set-cue! (:cue-grid *show*) (+ x-base 7) (+ y-base 7)
                    (cues/cue :strobe-color (fn [_] (fx/blank "Strobe Color"))
                              :color :purple
                              :color-fn (cues/color-fn-from-cue-var color-var)


(defn- make-torrent-gobo-cues
  "Create cues for the fixed and moving gobo options, stationary and
  shaking. Takes up half a page on the Push, with the top left at the
  coordinates specified."
  [prefix fixtures top left]
  ;; Make cues for the stationary and shaking versions of all fixed gobos
  (doseq [_ (map-indexed (fn [i v]

                             :color-fn (cues/color-fn-from-param color-param)
                             :short-name "Rainbow Blades")))

    #_(ct/set-cue! (:cue-grid *show*) (+ x-base 7) (+ y-base 7)
                 (cues/function-cue :strobe-all :strobe (show/all-fixtures) :effect-name "Raw Strobe"))


    ;; Dimmer cues to turn on and set brightness of groups of lights
    (make-dimmer-cue nil (+ x-base 0) (+ y-base 2) :yellow)
    (doall (map-indexed (fn [i group] (make-dimmer-cue group (+ x-base (inc i)) (+ y-base 2) :yellow)) light-groups))

    ;; TODO: Write a macro to make it easier to bind cue variables?
    (ct/set-cue! (:cue-grid *show*) (+ x-base 7) (+ y-base 2)
                 (cues/cue :sparkle (fn [var-map] (fun/sparkle (show/all-fixtures)
                                                               :chance (:chance var-map 0.05)
                                                               :fade-time (:fade-time var-map 50)))
