diff --git a/resources/create_ram_symbols.py b/resources/create_ram_symbols.py
index 280c1ae6..ce1858cc 100644
--- a/resources/create_ram_symbols.py
+++ b/resources/create_ram_symbols.py
@@ -42,6 +42,18 @@
          symbols_file.write(" ;")
          symbols_file.write(parts[1])
          last_line_was_new_line = False
+   elif line.startswith("if"):
+      symbols_file.write(line)
+      last_line_was_new_line = False
+   elif line.startswith("else"):
+      symbols_file.write(line)
+      last_line_was_new_line = False
+   elif line.startswith("elseif"):
+      symbols_file.write(line)
+      last_line_was_new_line = False
+   elif line.startswith("endif"):
+      symbols_file.write(line)
+      last_line_was_new_line = False
 
 symbols_file.close()
 
diff --git a/src/defines.asm b/src/defines.asm
index 79d09a48..ded325b7 100644
--- a/src/defines.asm
+++ b/src/defines.asm
@@ -636,17 +636,19 @@
 
 ; ^ FREE SPACE ^ up to +$B8E (normal) / +$DFE (tinystates)
 
-!sram_read_only_locks_tinystates = !SRAM_START+$B8A ; $6 bytes
-!sram_streamer_name_normal = !SRAM_START+$B90 ; $18 bytes
-!sram_custom_header_normal = !SRAM_START+$BA8 ; $18 bytes
-!sram_custom_preset_safewords_normal = !SRAM_START+$BC0 ; $50 bytes
-!sram_custom_preset_names_normal = !SRAM_START+$C10 ; $3C0 bytes
-
-!sram_read_only_locks_normal = !SRAM_START+$DFA ; $6 bytes
-!sram_streamer_name_tinystates = !SRAM_START+$E00 ; $18 bytes
-!sram_custom_header_tinystates = !SRAM_START+$E18 ; $18 bytes
-!sram_custom_preset_safewords_tinystates = !SRAM_START+$E30 ; $20 bytes
-!sram_custom_preset_names_tinystates = !SRAM_START+$E50 ; $180 bytes
+if !FEATURE_TINYSTATES
+!sram_read_only_locks = !SRAM_START+$B8A ; $6 bytes
+!sram_streamer_name = !SRAM_START+$B90 ; $18 bytes
+!sram_custom_header = !SRAM_START+$BA8 ; $18 bytes
+!sram_custom_preset_safewords = !SRAM_START+$BC0 ; $50 bytes
+!sram_custom_preset_names = !SRAM_START+$C10 ; $3C0 bytes
+else
+!sram_read_only_locks = !SRAM_START+$DFA ; $6 bytes
+!sram_streamer_name = !SRAM_START+$E00 ; $18 bytes
+!sram_custom_header = !SRAM_START+$E18 ; $18 bytes
+!sram_custom_preset_safewords = !SRAM_START+$E30 ; $20 bytes
+!sram_custom_preset_names = !SRAM_START+$E50 ; $180 bytes
+endif
 
 ; ^ FREE SPACE ^ up to +$FFE
 
@@ -1291,21 +1293,6 @@ endif
 ; Aliases and Bitmasks
 ; --------------------
 
-; this is moved here to prevent symbols.asm from having duplicate labels
-if !FEATURE_TINYSTATES
-!sram_read_only_locks = !sram_read_only_locks_tinystates
-!sram_streamer_name = !sram_streamer_name_normal
-!sram_custom_header = !sram_custom_header_tinystates
-!sram_custom_preset_safewords = !sram_custom_preset_safewords_tinystates
-!sram_custom_preset_names = !sram_custom_preset_names_tinystates
-else
-!sram_read_only_locks = !sram_read_only_locks_normal
-!sram_streamer_name = !sram_streamer_name_tinystates
-!sram_custom_header = !sram_custom_header_normal
-!sram_custom_preset_safewords = !sram_custom_preset_safewords_normal
-!sram_custom_preset_names = !sram_custom_preset_names_normal
-endif
-
 !DP_MenuIndices = $00 ; 0x4
 !DP_CurrentMenu = $04 ; 0x4
 !DP_Address = $08 ; 0x4
diff --git a/src/symbols.asm b/src/symbols.asm
index 660e8f73..a0ed0fea 100644
--- a/src/symbols.asm
+++ b/src/symbols.asm
@@ -599,17 +599,19 @@ sram_ctrl_2_shortcut_inputs = !sram_ctrl_2_shortcut_inputs ; !SRAM_START+$1A0 ;
 
 ; ^ FREE SPACE ^ up to +$B8E (normal) / +$DFE (tinystates)
 
-sram_read_only_locks_tinystates = !sram_read_only_locks_tinystates ; !SRAM_START+$B8A ; $6 bytes
-sram_streamer_name_normal = !sram_streamer_name_normal ; !SRAM_START+$B90 ; $18 bytes
-sram_custom_header_normal = !sram_custom_header_normal ; !SRAM_START+$BA8 ; $18 bytes
-sram_custom_preset_safewords_normal = !sram_custom_preset_safewords_normal ; !SRAM_START+$BC0 ; $50 bytes
-sram_custom_preset_names_normal = !sram_custom_preset_names_normal ; !SRAM_START+$C10 ; $3C0 bytes
-
-sram_read_only_locks_normal = !sram_read_only_locks_normal ; !SRAM_START+$DFA ; $6 bytes
-sram_streamer_name_tinystates = !sram_streamer_name_tinystates ; !SRAM_START+$E00 ; $18 bytes
-sram_custom_header_tinystates = !sram_custom_header_tinystates ; !SRAM_START+$E18 ; $18 bytes
-sram_custom_preset_safewords_tinystates = !sram_custom_preset_safewords_tinystates ; !SRAM_START+$E30 ; $20 bytes
-sram_custom_preset_names_tinystates = !sram_custom_preset_names_tinystates ; !SRAM_START+$E50 ; $180 bytes
+if !FEATURE_TINYSTATES
+sram_read_only_locks = !sram_read_only_locks ; !SRAM_START+$B8A ; $6 bytes
+sram_streamer_name = !sram_streamer_name ; !SRAM_START+$B90 ; $18 bytes
+sram_custom_header = !sram_custom_header ; !SRAM_START+$BA8 ; $18 bytes
+sram_custom_preset_safewords = !sram_custom_preset_safewords ; !SRAM_START+$BC0 ; $50 bytes
+sram_custom_preset_names = !sram_custom_preset_names ; !SRAM_START+$C10 ; $3C0 bytes
+else
+sram_read_only_locks = !sram_read_only_locks ; !SRAM_START+$DFA ; $6 bytes
+sram_streamer_name = !sram_streamer_name ; !SRAM_START+$E00 ; $18 bytes
+sram_custom_header = !sram_custom_header ; !SRAM_START+$E18 ; $18 bytes
+sram_custom_preset_safewords = !sram_custom_preset_safewords ; !SRAM_START+$E30 ; $20 bytes
+sram_custom_preset_names = !sram_custom_preset_names ; !SRAM_START+$E50 ; $180 bytes
+endif
 
 ; ^ FREE SPACE ^ up to +$FFE