diff --git a/innernaut.py b/setup.py
similarity index 85%
rename from innernaut.py
rename to setup.py
index 9c11db7..ec9e897 100644
--- a/innernaut.py
+++ b/setup.py
@@ -120,9 +120,6 @@ with Screen('main', width=1920, height=1080) as screen:
                 with Path(tags='background'):
                     Ellipse(0, 0, radiusX=ThirdEyeXRadius, radiusY=ThirdEyeYRadius)
                     FillPath()
-                with Path(tags='inside'):
-                    Ellipse(0, 0, radiusX=ThirdEyeXRadius - EyeRimThickness, radiusY=ThirdEyeYRadius - EyeRimThickness)
-                    Text(font='120px NotoColorEmoji, NotoEmoji, emoji', textAlign='center', textBaseline='middle', color=HoleColor)
                 with Path(tags='liner', color=EyelinerColor, lineWidth=EyelinerThickness, lineDash=EyelinerThickness):
                     Ellipse(0, 0, radiusX=ThirdEyeXRadius - EyeRimThickness, radiusY=ThirdEyeYRadius - EyeRimThickness)
                     StrokePath()
@@ -146,6 +143,23 @@ with Screen('main', width=1920, height=1080) as screen:
                             Ellipse(x=0, y=0, radiusX=EyeXRadius, radiusY=EyeYRadius)
                             StrokePath()
             SplitTriangle(id='nose', width=NoseWidth, height=NoseHeight, bottom=NoseBottom)
+            with Group('helmet', fader=0):
+                with Path(color=TriangleColor * 0.5, fader=0.6):
+                    Ellipse(x=0, y=0, radiusX=MaskOuterRadius, radiusY=MaskOuterRadius)
+                    FillPath()
+                with Path(color='white', lineWidth=10):
+                    Ellipse(x=0, y=0, radiusX=MaskOuterRadius, radiusY=MaskOuterRadius)
+                    StrokePath()
+                with Group(color='white'):
+                    with Path():
+                        Ellipse(x=0, y=0, radiusX=MaskOuterRadius, radiusY=MaskOuterRadius, startAngle=0.15, endAngle=0.35)
+                        FillPath()
+                    with Path():
+                        Ellipse(x=0, y=0, radiusX=MaskOuterRadius, radiusY=MaskOuterRadius, startAngle=0.55, endAngle=0.95)
+                        FillPath()
+            with Path(id='symbol', x=0, y=-ThirdEyeOffset):
+                Ellipse(0, 0, radiusX=ThirdEyeXRadius - EyeRimThickness, radiusY=ThirdEyeYRadius - EyeRimThickness)
+                Text(font='120px NotoColorEmoji, NotoEmoji, emoji', textAlign='center', textBaseline='middle', color=HoleColor)
     with Group('stars', composite='lighter', fader=0):
         for j in range(100):
             with Group(x=screen.width / 2, y=screen.height / 2, tags='star', lineWidth=2):
@@ -199,19 +213,30 @@ with Cue('Q05', name='Talking'):
     height = uniform('Q05.height')[count] * (TongueHeight - MouthCornerRadius * 2)
     Match('.tongue > RoundedRect').height = TongueHeight - height * wag
 
-with Cue('Q06', name='Rainbow triangles', fadeIn=1, fadeOut=1):
+with Cue('Q06', name='Emoji'):
+    emoji = ['😳', '🎁', '🎉', '🤗', '💃', '🍰', '😉', '😸', '🐄', '🍆', '❤️', '⭐️', '😎',
+             '🛑', '✋', '‍🏃‍♀️', '✈️', '☹️', '🤕', '😢', '👺', '💵', '💰', '🤑']
+    period = 0.5
+    count = t / period
+    character = choose(uniform('Q06')[count], emoji)
+    Match('#symbol Text').text = character
+
+with Cue('Q07', name='Helmet', fadeIn=1, fadeOut=1):
+    Match('#helmet').fader = 1
+
+with Cue('Q11', name='Rainbow triangles', fadeIn=1, fadeOut=1):
     period = 5
     count = t / period
     color = hsv(count + i / n, 1, 1)
     Match('.triangle .left').color = color
     Match('.triangle .right').color = color * 0.9
 
-with Cue('Q07', name='Rotating triangles') as Q1:
+with Cue('Q12', name='Rotating triangles') as Q1:
     period = 9 / maximum(f, 1e-6)
     count = t / period
     Match('#triangles').rotate = count
 
-with Cue('Q08', name='Spinning triangles', fadeIn=1, fadeOut=1):
+with Cue('Q13', name='Spinning triangles', fadeIn=1, fadeOut=1):
     period = 5
     count = t / period
     scale = 2*sine((count + i / n) * 5)
@@ -219,18 +244,12 @@ with Cue('Q08', name='Spinning triangles', fadeIn=1, fadeOut=1):
     Match('.triangle').scale = 1 + scale
     Match('.triangle').y = -TriangleRadius - TriangleHeight * scale
 
-with Cue('Q09', name='Nightmare spots') as Q3:
+with Cue('Q14', name='Nightmare spots') as Q3:
     period = 1
     count = t / period
     Match('.bead.odd').scale = 2 * sine(count)
     Match('.bead.even').scale = 2 * (1 - sine(count))
 
-with Cue('Q10', name='Emoji'):
-    emoji = '😳🎁🎉🤗💃🍰😉'
-    period = 0.5
-    count = t / period
-    Match('#thirdeye Text').text = Expression.coerce(emoji)[count % len(emoji)]
-
 with Cue('Q21', name='Twinkling stars', fadeIn=1, fadeOut=1):
     period = 1
     phase = uniform('Q21.phase')[i]