diff --git a/src/chats/serenity.yaml b/src/chats/serenity.yaml
index 7c21206..ae98258 100644
--- a/src/chats/serenity.yaml
+++ b/src/chats/serenity.yaml
@@ -8,6 +8,7 @@
 #       +                  +                +             ███
 #  +   ▀████████████████████████████████████████████████████▀
 
+# Icarus {{{1
 - chat: Icarus
 - if $met:
   - Oh hey, you're back!
@@ -162,8 +163,7 @@
 
 ---
 
-
-# Pizzeria main chat
+# Pizzeria {{{1
 - chat: PizzaChef
 - Welcome to Old Earth Pizza!
 - Time to loosen up! Find yourself a cozy place to drift.
@@ -393,6 +393,7 @@
 ---
 
 
+# Rynyk {{{1
 - chat: Rynyk
 - Hey there!
 - label: entrypoint
@@ -551,6 +552,7 @@
 ---
 
 
+# Luna {{{1
 - chat: Luna
 - if $$backupinstalled:
   - set: begged
@@ -865,7 +867,7 @@
 
 ---
 
-
+# Ash {{{1
 - chat: Ash
 - Oh, hello!
 - Look, I'm very busy right now constructing this place.
@@ -890,6 +892,7 @@
 ---
 
 
+# River {{{1
 - chat: River
 - Welcome to our little oasis!
 - This will be great once it's finished.
@@ -914,6 +917,7 @@
 ---
 
 
+# Generic {{{1
 - chat: generic_questions_serenity
 - Where are we?:
   - Inside Jupiter's rings, obviously.
@@ -1009,7 +1013,15 @@
 
 ---
 
+- chat: OxygenTank
+- script: refilloxygen 1
+- system: Oxygen refilled
 
+
+---
+
+
+# Dead Drifter {{{1
 - chat: Drifter
 - system: "Error: No response"
 - system: No life signs detected
@@ -1021,6 +1033,7 @@
 ---
 
 
+# Pizzeria Clippy {{{1
 - chat: SubduedClippy
 - At your service!
 
@@ -1028,6 +1041,7 @@
 ---
 
 
+# Mudley {{{1
 - chat: pig
 - if $helmet:
   - Come on, cave monkey, I can't give you the snack if you don't take off your helmet. [press ESC]
@@ -1182,10 +1196,3 @@
   - Phew, that was close.  Take care of yourself!
 - Anything else?
 - goto: entrypoint
-
-
----
-
-- chat: OxygenTank
-- script: refilloxygen 1
-- system: Oxygen refilled