diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index b1d09ff..10cfbf8 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -23,5 +23,7 @@ jobs:
       run: dotnet clean ${{env.solutionFile}} --configuration Release && dotnet nuget locals all --clear
     - name: Build
       run: dotnet build ${{env.solutionFile}} --configuration Release
+    - name: Format
+      run: dotnet format ${{env.solutionFile}} --verify-no-changes --verbosity diagnostic
     - name: Test
       run: dotnet test ${{env.solutionFile}} --no-restore --verbosity normal
diff --git a/src/.editorconfig b/src/.editorconfig
new file mode 100644
index 0000000..e0f389a
--- /dev/null
+++ b/src/.editorconfig
@@ -0,0 +1,243 @@
+# Remove the line below if you want to inherit .editorconfig settings from higher directories
+root = true
+
+# C# files
+[*.cs]
+
+#### Core EditorConfig Options ####
+
+# Indentation and spacing
+indent_size = 4
+indent_style = space
+tab_width = 4
+
+# New line preferences
+end_of_line = crlf
+insert_final_newline = false
+
+#### .NET Coding Conventions ####
+
+# Organize usings
+dotnet_separate_import_directive_groups = false
+dotnet_sort_system_directives_first = true
+file_header_template = unset
+
+# this. and Me. preferences
+dotnet_style_qualification_for_event = true:warning
+dotnet_style_qualification_for_field = true
+dotnet_style_qualification_for_method = true:warning
+dotnet_style_qualification_for_property = true:warning
+
+# Language keywords vs BCL types preferences
+dotnet_style_predefined_type_for_locals_parameters_members = true:warning
+dotnet_style_predefined_type_for_member_access = true:warning
+
+# Parentheses preferences
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity
+dotnet_style_parentheses_in_other_operators = never_if_unnecessary
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity
+
+# Modifier preferences
+dotnet_style_require_accessibility_modifiers = for_non_interface_members
+
+# Expression-level preferences
+dotnet_style_coalesce_expression = true
+dotnet_style_collection_initializer = true
+dotnet_style_explicit_tuple_names = true
+dotnet_style_namespace_match_folder = true
+dotnet_style_null_propagation = true
+dotnet_style_object_initializer = true
+dotnet_style_operator_placement_when_wrapping = beginning_of_line
+dotnet_style_prefer_auto_properties = true
+dotnet_style_prefer_collection_expression = when_types_loosely_match
+dotnet_style_prefer_compound_assignment = true
+dotnet_style_prefer_conditional_expression_over_assignment = true
+dotnet_style_prefer_conditional_expression_over_return = true
+dotnet_style_prefer_foreach_explicit_cast_in_source = when_strongly_typed
+dotnet_style_prefer_inferred_anonymous_type_member_names = true
+dotnet_style_prefer_inferred_tuple_names = true
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true
+dotnet_style_prefer_simplified_boolean_expressions = true
+dotnet_style_prefer_simplified_interpolation = true
+
+# Field preferences
+dotnet_style_readonly_field = true
+
+# Parameter preferences
+dotnet_code_quality_unused_parameters = all
+
+# Suppression preferences
+dotnet_remove_unnecessary_suppression_exclusions = none
+
+# New line preferences
+dotnet_style_allow_multiple_blank_lines_experimental = true
+dotnet_style_allow_statement_immediately_after_block_experimental = false
+
+#### C# Coding Conventions ####
+
+# var preferences
+csharp_style_var_elsewhere = true
+csharp_style_var_for_built_in_types = true
+csharp_style_var_when_type_is_apparent = true
+
+# Expression-bodied members
+csharp_style_expression_bodied_accessors = true:silent
+csharp_style_expression_bodied_constructors = false:silent
+csharp_style_expression_bodied_indexers = true:silent
+csharp_style_expression_bodied_lambdas = true:silent
+csharp_style_expression_bodied_local_functions = false:silent
+csharp_style_expression_bodied_methods = false:silent
+csharp_style_expression_bodied_operators = false:silent
+csharp_style_expression_bodied_properties = true:silent
+
+# Pattern matching preferences
+csharp_style_pattern_matching_over_as_with_null_check = true
+csharp_style_pattern_matching_over_is_with_cast_check = true
+csharp_style_prefer_extended_property_pattern = true
+csharp_style_prefer_not_pattern = true
+csharp_style_prefer_pattern_matching = true
+csharp_style_prefer_switch_expression = false
+
+# Null-checking preferences
+csharp_style_conditional_delegate_call = true
+
+# Modifier preferences
+csharp_prefer_static_local_function = true
+csharp_preferred_modifier_order = public,private,protected,internal,file,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,required,volatile,async
+csharp_style_prefer_readonly_struct = true
+csharp_style_prefer_readonly_struct_member = true
+
+# Code-block preferences
+csharp_prefer_braces = true:silent
+csharp_prefer_simple_using_statement = false:suggestion
+csharp_style_namespace_declarations = file_scoped:silent
+csharp_style_prefer_method_group_conversion = true:silent
+csharp_style_prefer_primary_constructors = true:suggestion
+csharp_style_prefer_top_level_statements = true:silent
+
+# Expression-level preferences
+csharp_prefer_simple_default_expression = true
+csharp_style_deconstructed_variable_declaration = true
+csharp_style_implicit_object_creation_when_type_is_apparent = true
+csharp_style_inlined_variable_declaration = true
+csharp_style_prefer_index_operator = true
+csharp_style_prefer_local_over_anonymous_function = true
+csharp_style_prefer_null_check_over_type_check = true
+csharp_style_prefer_range_operator = true
+csharp_style_prefer_tuple_swap = true
+csharp_style_prefer_utf8_string_literals = true
+csharp_style_throw_expression = true
+csharp_style_unused_value_assignment_preference = discard_variable
+csharp_style_unused_value_expression_statement_preference = discard_variable
+
+# 'using' directive preferences
+csharp_using_directive_placement = inside_namespace:warning
+
+# New line preferences
+csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = false
+csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true
+csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = true
+csharp_style_allow_blank_lines_between_consecutive_braces_experimental = true
+csharp_style_allow_embedded_statements_on_same_line_experimental = false
+
+#### C# Formatting Rules ####
+
+# New line preferences
+csharp_new_line_before_catch = true
+csharp_new_line_before_else = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_members_in_anonymous_types = true
+csharp_new_line_before_members_in_object_initializers = true
+csharp_new_line_before_open_brace = all
+csharp_new_line_between_query_expression_clauses = true
+
+# Indentation preferences
+csharp_indent_block_contents = true
+csharp_indent_braces = false
+csharp_indent_case_contents = true
+csharp_indent_case_contents_when_block = true
+csharp_indent_labels = one_less_than_current
+csharp_indent_switch_labels = true
+
+# Space preferences
+csharp_space_after_cast = false
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_after_comma = true
+csharp_space_after_dot = false
+csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_after_semicolon_in_for_statement = true
+csharp_space_around_binary_operators = before_and_after
+csharp_space_around_declaration_statements = false
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_before_comma = false
+csharp_space_before_dot = false
+csharp_space_before_open_square_brackets = false
+csharp_space_before_semicolon_in_for_statement = false
+csharp_space_between_empty_square_brackets = false
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_declaration_name_and_open_parenthesis = false
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+csharp_space_between_parentheses = false
+csharp_space_between_square_brackets = false
+
+# Wrapping preferences
+csharp_preserve_single_line_blocks = true
+csharp_preserve_single_line_statements = true
+
+#### Naming styles ####
+
+# Naming rules
+
+dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion
+dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
+dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i
+
+dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.types_should_be_pascal_case.symbols = types
+dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case
+
+dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
+dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
+
+# Symbol specifications
+
+dotnet_naming_symbols.interface.applicable_kinds = interface
+dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.interface.required_modifiers = 
+
+dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
+dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.types.required_modifiers = 
+
+dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
+dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.non_field_members.required_modifiers = 
+
+# Naming styles
+
+dotnet_naming_style.pascal_case.required_prefix = 
+dotnet_naming_style.pascal_case.required_suffix = 
+dotnet_naming_style.pascal_case.word_separator = 
+dotnet_naming_style.pascal_case.capitalization = pascal_case
+
+dotnet_naming_style.begins_with_i.required_prefix = I
+dotnet_naming_style.begins_with_i.required_suffix = 
+dotnet_naming_style.begins_with_i.word_separator = 
+dotnet_naming_style.begins_with_i.capitalization = pascal_case
+
+[*.{cs,vb}]
+dotnet_style_operator_placement_when_wrapping = beginning_of_line
+tab_width = 4
+indent_size = 4
+end_of_line = crlf
+dotnet_style_coalesce_expression = true:suggestion
+dotnet_style_null_propagation = true:suggestion
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
+dotnet_style_prefer_auto_properties = true:silent
+dotnet_style_object_initializer = true:suggestion
+insert_final_newline = true
\ No newline at end of file
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 4481d61..3d3ac48 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -5,6 +5,7 @@
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors Condition="'$(TreatWarningsAsErrors)' == ''">true</TreatWarningsAsErrors>
     <NoWarn>CS1591;SA1600;SA0001;IDE0290</NoWarn>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/AgiInterpreter.cs b/src/Woohoo.Agi.Interpreter/Interpreter/AgiInterpreter.cs
index 8c99742..01c5cbb 100644
--- a/src/Woohoo.Agi.Interpreter/Interpreter/AgiInterpreter.cs
+++ b/src/Woohoo.Agi.Interpreter/Interpreter/AgiInterpreter.cs
@@ -533,9 +533,9 @@ private void ExecuteAgi()
             int oldScore = this.State.Variables[Variables.Score];
             bool soundEnabled = this.State.Flags[Flags.SoundOn];
 
-            // Save the current state of interpreter here, in case of AgiExecutionException
-            // (not currently supported)
-            ErrorResume:
+        // Save the current state of interpreter here, in case of AgiExecutionException
+        // (not currently supported)
+        ErrorResume:
             try
             {
                 while (this.CallLogic(0))
diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverCga.cs b/src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverCga.cs
index c143569..35e8cd4 100644
--- a/src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverCga.cs
+++ b/src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverCga.cs
@@ -11,7 +11,21 @@ public abstract class GraphicsRendererDriverCga : GraphicsRendererDriver
 {
     private readonly byte[] cgaTextConversion =
     [
-        0, 1, 1, 1, 2, 2, 2, 3, 3, 1, 1, 1, 2, 2, 2,
+        0,
+        1,
+        1,
+        1,
+        2,
+        2,
+        2,
+        3,
+        3,
+        1,
+        1,
+        1,
+        2,
+        2,
+        2,
     ];
 
     protected GraphicsRendererDriverCga()
diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverCga0.cs b/src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverCga0.cs
index dda25c5..3a52c0e 100644
--- a/src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverCga0.cs
+++ b/src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverCga0.cs
@@ -9,18 +9,74 @@ public sealed class GraphicsRendererDriverCga0 : GraphicsRendererDriverCga
 {
     private readonly byte[] cgaColorPalette =
     [
-        0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x01, 0x04,
-        0x05, 0x03, 0x01, 0x00, 0x04, 0x0A, 0x0A, 0x06,
-        0x03, 0x0C, 0x08, 0x0B, 0x0E, 0x05, 0x03, 0x04,
-        0x0A, 0x04, 0x03, 0x07, 0x0D, 0x00, 0x09, 0x01,
-        0x04, 0x0B, 0x05, 0x05, 0x0E, 0x0E, 0x0E, 0x0C,
-        0x02, 0x08, 0x0D, 0x0D, 0x07, 0x0F, 0x0F, 0x0F,
+        0x00,
+        0x00,
+        0x00,
+        0x02,
+        0x00,
+        0x00,
+        0x01,
+        0x04,
+        0x05,
+        0x03,
+        0x01,
+        0x00,
+        0x04,
+        0x0A,
+        0x0A,
+        0x06,
+        0x03,
+        0x0C,
+        0x08,
+        0x0B,
+        0x0E,
+        0x05,
+        0x03,
+        0x04,
+        0x0A,
+        0x04,
+        0x03,
+        0x07,
+        0x0D,
+        0x00,
+        0x09,
+        0x01,
+        0x04,
+        0x0B,
+        0x05,
+        0x05,
+        0x0E,
+        0x0E,
+        0x0E,
+        0x0C,
+        0x02,
+        0x08,
+        0x0D,
+        0x0D,
+        0x07,
+        0x0F,
+        0x0F,
+        0x0F,
     ];
 
     private readonly byte[] cga0ViewPalette =
     [
-        0x00, 0x22, 0x11, 0x33, 0x44, 0x66, 0x88, 0x55,
-        0xAA, 0x77, 0x99, 0xBB, 0xEE, 0xCC, 0xDD, 0xFF,
+        0x00,
+        0x22,
+        0x11,
+        0x33,
+        0x44,
+        0x66,
+        0x88,
+        0x55,
+        0xAA,
+        0x77,
+        0x99,
+        0xBB,
+        0xEE,
+        0xCC,
+        0xDD,
+        0xFF,
     ];
 
     public GraphicsRendererDriverCga0()
diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverCga1.cs b/src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverCga1.cs
index bf21025..81f6032 100644
--- a/src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverCga1.cs
+++ b/src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverCga1.cs
@@ -9,18 +9,74 @@ public sealed class GraphicsRendererDriverCga1 : GraphicsRendererDriverCga
 {
     private readonly byte[] cgaColorPalette =
     [
-        0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x01, 0x04,
-        0x05, 0x03, 0x01, 0x00, 0x04, 0x0A, 0x0A, 0x06,
-        0x03, 0x0C, 0x08, 0x0B, 0x0E, 0x05, 0x03, 0x04,
-        0x0A, 0x04, 0x03, 0x07, 0x0D, 0x00, 0x09, 0x01,
-        0x04, 0x0B, 0x05, 0x05, 0x0E, 0x0E, 0x0E, 0x0C,
-        0x02, 0x08, 0x0D, 0x0D, 0x07, 0x0F, 0x0F, 0x0F,
+        0x00,
+        0x00,
+        0x00,
+        0x02,
+        0x00,
+        0x00,
+        0x01,
+        0x04,
+        0x05,
+        0x03,
+        0x01,
+        0x00,
+        0x04,
+        0x0A,
+        0x0A,
+        0x06,
+        0x03,
+        0x0C,
+        0x08,
+        0x0B,
+        0x0E,
+        0x05,
+        0x03,
+        0x04,
+        0x0A,
+        0x04,
+        0x03,
+        0x07,
+        0x0D,
+        0x00,
+        0x09,
+        0x01,
+        0x04,
+        0x0B,
+        0x05,
+        0x05,
+        0x0E,
+        0x0E,
+        0x0E,
+        0x0C,
+        0x02,
+        0x08,
+        0x0D,
+        0x0D,
+        0x07,
+        0x0F,
+        0x0F,
+        0x0F,
     ];
 
     private readonly byte[] cga1ViewPalette =
     [
-        0x00, 0x00, 0xCC, 0x11, 0xAA, 0x22, 0x99, 0xDD,
-        0x00, 0x33, 0x55, 0x77, 0xEE, 0xEE, 0xFF, 0xFF,
+        0x00,
+        0x00,
+        0xCC,
+        0x11,
+        0xAA,
+        0x22,
+        0x99,
+        0xDD,
+        0x00,
+        0x33,
+        0x55,
+        0x77,
+        0xEE,
+        0xEE,
+        0xFF,
+        0xFF,
     ];
 
     public GraphicsRendererDriverCga1()
diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverHercules.cs b/src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverHercules.cs
index d140c9d..80edaca 100644
--- a/src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverHercules.cs
+++ b/src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverHercules.cs
@@ -11,50 +11,162 @@ public sealed class GraphicsRendererDriverHercules : GraphicsRendererDriver
 {
     private readonly byte[] line0Column0 =
     [
-        0x00, 0x20, 0x40, 0xA0, 0x28, 0x80, 0x12, 0xA5,
-        0x80, 0x7f, 0xAD, 0xFF, 0xFA, 0x7B, 0xDF, 0xFF,
+        0x00,
+        0x20,
+        0x40,
+        0xA0,
+        0x28,
+        0x80,
+        0x12,
+        0xA5,
+        0x80,
+        0x7f,
+        0xAD,
+        0xFF,
+        0xFA,
+        0x7B,
+        0xDF,
+        0xFF,
     ];
 
     private readonly byte[] line0Column1 =
     [
-        0x00, 0x20, 0x08, 0xA0, 0x28, 0x80, 0x12, 0xA5,
-        0x80, 0xdf, 0xAD, 0x7E, 0xFA, 0x7B, 0xDF, 0xFF,
+        0x00,
+        0x20,
+        0x08,
+        0xA0,
+        0x28,
+        0x80,
+        0x12,
+        0xA5,
+        0x80,
+        0xdf,
+        0xAD,
+        0x7E,
+        0xFA,
+        0x7B,
+        0xDF,
+        0xFF,
     ];
 
     private readonly byte[] line1Column0 =
     [
-        0x00, 0x00, 0x80, 0xA0, 0x28, 0x80, 0x48, 0xA5,
-        0x20, 0xdf, 0x57, 0xDF, 0xFA, 0xDE, 0xFF, 0xFF,
+        0x00,
+        0x00,
+        0x80,
+        0xA0,
+        0x28,
+        0x80,
+        0x48,
+        0xA5,
+        0x20,
+        0xdf,
+        0x57,
+        0xDF,
+        0xFA,
+        0xDE,
+        0xFF,
+        0xFF,
     ];
 
     private readonly byte[] line1Column1 =
     [
-        0x00, 0x00, 0x04, 0xA0, 0x28, 0x80, 0x48, 0xA5,
-        0x20, 0x7f, 0x57, 0xFD, 0xFA, 0xDE, 0xFF, 0xFF,
+        0x00,
+        0x00,
+        0x04,
+        0xA0,
+        0x28,
+        0x80,
+        0x48,
+        0xA5,
+        0x20,
+        0x7f,
+        0x57,
+        0xFD,
+        0xFA,
+        0xDE,
+        0xFF,
+        0xFF,
     ];
 
     private readonly byte[] line2Column0 =
     [
-        0x00, 0x80, 0x20, 0xA0, 0x28, 0x80, 0x12, 0xA5,
-        0x80, 0x7f, 0xAD, 0xE7, 0xFA, 0x7B, 0x7F, 0xFF,
+        0x00,
+        0x80,
+        0x20,
+        0xA0,
+        0x28,
+        0x80,
+        0x12,
+        0xA5,
+        0x80,
+        0x7f,
+        0xAD,
+        0xE7,
+        0xFA,
+        0x7B,
+        0x7F,
+        0xFF,
     ];
 
     private readonly byte[] line2Column1 =
     [
-        0x00, 0x80, 0x01, 0xA0, 0x28, 0x80, 0x12, 0xA5,
-        0x80, 0xdf, 0xAD, 0xFF, 0xFA, 0x7B, 0x7F, 0xFF,
+        0x00,
+        0x80,
+        0x01,
+        0xA0,
+        0x28,
+        0x80,
+        0x12,
+        0xA5,
+        0x80,
+        0xdf,
+        0xAD,
+        0xFF,
+        0xFA,
+        0x7B,
+        0x7F,
+        0xFF,
     ];
 
     private readonly byte[] line3Column0 =
     [
-        0x00, 0x00, 0x10, 0xA0, 0x28, 0x80, 0x48, 0xA5,
-        0x20, 0xdf, 0x57, 0xFB, 0xFA, 0xDE, 0xFF, 0xFF,
+        0x00,
+        0x00,
+        0x10,
+        0xA0,
+        0x28,
+        0x80,
+        0x48,
+        0xA5,
+        0x20,
+        0xdf,
+        0x57,
+        0xFB,
+        0xFA,
+        0xDE,
+        0xFF,
+        0xFF,
     ];
 
     private readonly byte[] line3Column1 =
     [
-        0x00, 0x00, 0x02, 0xA0, 0x28, 0x80, 0x48, 0xA5,
-        0x20, 0x7f, 0x57, 0xBF, 0xFA, 0xDE, 0xFF, 0xFF,
+        0x00,
+        0x00,
+        0x02,
+        0xA0,
+        0x28,
+        0x80,
+        0x48,
+        0xA5,
+        0x20,
+        0x7f,
+        0x57,
+        0xBF,
+        0xFA,
+        0xDE,
+        0xFF,
+        0xFF,
     ];
 
     private readonly GraphicsColor whiteColor;
diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/LogicPatches.cs b/src/Woohoo.Agi.Interpreter/Interpreter/LogicPatches.cs
index 75a50fc..f308797 100644
--- a/src/Woohoo.Agi.Interpreter/Interpreter/LogicPatches.cs
+++ b/src/Woohoo.Agi.Interpreter/Interpreter/LogicPatches.cs
@@ -14,14 +14,50 @@ public static class LogicPatches
         ["GR"],
         125,
         [
-            0x0C, 0x04, 0xFF, 0x07, 0x05, 0xFF, 0x16, 0x00,
-            0x0C, 0x96, 0x03, 0x0A, 0x00, 0x77, 0x83, 0x71,
-            0x0D, 0xD9, 0x03, 0xDC, 0xBF, 0x18, 0xDC, 0x19,
-            0xDC, 0x1B, 0xDC, 0x0C, 0x95, 0x1A,
+            0x0C,
+            0x04,
+            0xFF,
+            0x07,
+            0x05,
+            0xFF,
+            0x16,
+            0x00,
+            0x0C,
+            0x96,
+            0x03,
+            0x0A,
+            0x00,
+            0x77,
+            0x83,
+            0x71,
+            0x0D,
+            0xD9,
+            0x03,
+            0xDC,
+            0xBF,
+            0x18,
+            0xDC,
+            0x19,
+            0xDC,
+            0x1B,
+            0xDC,
+            0x0C,
+            0x95,
+            0x1A,
         ],
         [
-            0x0D, 0xE3, 0x03, 0x13, 0x00, 0x03, 0xF6, 0x01,
-            0x0C, 0x0F, 0x12, 0x49,
+            0x0D,
+            0xE3,
+            0x03,
+            0x13,
+            0x00,
+            0x03,
+            0xF6,
+            0x01,
+            0x0C,
+            0x0F,
+            0x12,
+            0x49,
         ]);
 
     /// <summary>
@@ -31,13 +67,43 @@ public static class LogicPatches
         ["KQ4"],
         140,
         [
-            0x0C, 0x04, 0xFF, 0x07, 0x05, 0xFF, 0x15, 0x00,
-            0x03, 0x0A, 0x00, 0x77, 0x83, 0x71, 0x0D, 0x97,
-            0x03, 0x98, 0xCE, 0x18, 0x98, 0x19, 0x98, 0x1B,
-            0x98, 0x0C, 0x5A, 0x1A, 0x00,
+            0x0C,
+            0x04,
+            0xFF,
+            0x07,
+            0x05,
+            0xFF,
+            0x15,
+            0x00,
+            0x03,
+            0x0A,
+            0x00,
+            0x77,
+            0x83,
+            0x71,
+            0x0D,
+            0x97,
+            0x03,
+            0x98,
+            0xCE,
+            0x18,
+            0x98,
+            0x19,
+            0x98,
+            0x1B,
+            0x98,
+            0x0C,
+            0x5A,
+            0x1A,
+            0x00,
         ],
         [
-            0x03, 0x13, 0x0, 0x12, 0x60, 0x00,
+            0x03,
+            0x13,
+            0x0,
+            0x12,
+            0x60,
+            0x00,
         ]);
 
     /// <summary>
@@ -47,13 +113,46 @@ public static class LogicPatches
         ["LLLLL"],
         6,
         [
-            0xFF, 0xFD, 0x07, 0x1E, 0xFC, 0x07, 0x6D, 0x01,
-            0x5F, 0x03, 0xFC, 0xFF, 0x12, 0x00, 0x0C, 0x6D,
-            0x78, 0x8A, 0x77, 0x69, 0x16, 0x18, 0x00, 0x0D,
-            0x30, 0x0D, 0x55, 0x78, 0x65, 0x0A,
+            0xFF,
+            0xFD,
+            0x07,
+            0x1E,
+            0xFC,
+            0x07,
+            0x6D,
+            0x01,
+            0x5F,
+            0x03,
+            0xFC,
+            0xFF,
+            0x12,
+            0x00,
+            0x0C,
+            0x6D,
+            0x78,
+            0x8A,
+            0x77,
+            0x69,
+            0x16,
+            0x18,
+            0x00,
+            0x0D,
+            0x30,
+            0x0D,
+            0x55,
+            0x78,
+            0x65,
+            0x0A,
         ],
         [
-            0x0C, 0x6D, 0x0D, 0x30, 0x0D, 0x55, 0x78, 0x12,
+            0x0C,
+            0x6D,
+            0x0D,
+            0x30,
+            0x0D,
+            0x55,
+            0x78,
+            0x12,
             0x0B,
         ]);
 
@@ -67,14 +166,44 @@ public static class LogicPatches
         ["MH", string.Empty],
         159,
         [
-            0xFF, 0x07, 0x05, 0xFF, 0xE6, 0x00,
-            0x03, 0x0A, 0x02, 0x77, 0x83, 0x71,
-            0x6F, 0x01, 0x17, 0x00, 0x03, 0x00,
-            0x9F, 0x03, 0x37, 0x00, 0x03, 0x32,
-            0x03, 0x03, 0x3B, 0x00, 0x6C, 0x03,
+            0xFF,
+            0x07,
+            0x05,
+            0xFF,
+            0xE6,
+            0x00,
+            0x03,
+            0x0A,
+            0x02,
+            0x77,
+            0x83,
+            0x71,
+            0x6F,
+            0x01,
+            0x17,
+            0x00,
+            0x03,
+            0x00,
+            0x9F,
+            0x03,
+            0x37,
+            0x00,
+            0x03,
+            0x32,
+            0x03,
+            0x03,
+            0x3B,
+            0x00,
+            0x6C,
+            0x03,
         ],
         [
-            0x0C, 0x05, 0x16, 0x5A, 0x12, 0x99,
+            0x0C,
+            0x05,
+            0x16,
+            0x5A,
+            0x12,
+            0x99,
         ]);
 
     /// <summary>
diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/PictureBuffer.cs b/src/Woohoo.Agi.Interpreter/Interpreter/PictureBuffer.cs
index 8a4e550..7f8f7dd 100644
--- a/src/Woohoo.Agi.Interpreter/Interpreter/PictureBuffer.cs
+++ b/src/Woohoo.Agi.Interpreter/Interpreter/PictureBuffer.cs
@@ -26,29 +26,162 @@ public class PictureBuffer
 
     private static readonly byte[] SplatterBrushMap =
     [
-        0x20, 0x94, 0x02, 0x24, 0x90, 0x82, 0xa4, 0xa2,
-        0x82, 0x09, 0x0a, 0x22, 0x12, 0x10, 0x42, 0x14,
-        0x91, 0x4a, 0x91, 0x11, 0x08, 0x12, 0x25, 0x10,
-        0x22, 0xa8, 0x14, 0x24, 0x00, 0x50, 0x24, 0x04,
+        0x20,
+        0x94,
+        0x02,
+        0x24,
+        0x90,
+        0x82,
+        0xa4,
+        0xa2,
+        0x82,
+        0x09,
+        0x0a,
+        0x22,
+        0x12,
+        0x10,
+        0x42,
+        0x14,
+        0x91,
+        0x4a,
+        0x91,
+        0x11,
+        0x08,
+        0x12,
+        0x25,
+        0x10,
+        0x22,
+        0xa8,
+        0x14,
+        0x24,
+        0x00,
+        0x50,
+        0x24,
+        0x04,
     ];
 
     private static readonly byte[] SplatterBrushStart =
     [
-        0x00, 0x18, 0x30, 0xc4, 0xdc, 0x65, 0xeb, 0x48,
-        0x60, 0xbd, 0x89, 0x05, 0x0a, 0xf4, 0x7d, 0x7d,
-        0x85, 0xb0, 0x8e, 0x95, 0x1f, 0x22, 0x0d, 0xdf,
-        0x2a, 0x78, 0xd5, 0x73, 0x1c, 0xb4, 0x40, 0xa1,
-        0xb9, 0x3c, 0xca, 0x58, 0x92, 0x34, 0xcc, 0xce,
-        0xd7, 0x42, 0x90, 0x0f, 0x8b, 0x7f, 0x32, 0xed,
-        0x5c, 0x9d, 0xc8, 0x99, 0xad, 0x4e, 0x56, 0xa6,
-        0xf7, 0x68, 0xb7, 0x25, 0x82, 0x37, 0x3a, 0x51,
-        0x69, 0x26, 0x38, 0x52, 0x9e, 0x9a, 0x4f, 0xa7,
-        0x43, 0x10, 0x80, 0xee, 0x3d, 0x59, 0x35, 0xcf,
-        0x79, 0x74, 0xb5, 0xa2, 0xb1, 0x96, 0x23, 0xe0,
-        0xbe, 0x05, 0xf5, 0x6e, 0x19, 0xc5, 0x66, 0x49,
-        0xf0, 0xd1, 0x54, 0xa9, 0x70, 0x4b, 0xa4, 0xe2,
-        0xe6, 0xe5, 0xab, 0xe4, 0xd2, 0xaa, 0x4c, 0xe3,
-        0x06, 0x6f, 0xc6, 0x4a, 0xa4, 0x75, 0x97, 0xe1,
+        0x00,
+        0x18,
+        0x30,
+        0xc4,
+        0xdc,
+        0x65,
+        0xeb,
+        0x48,
+        0x60,
+        0xbd,
+        0x89,
+        0x05,
+        0x0a,
+        0xf4,
+        0x7d,
+        0x7d,
+        0x85,
+        0xb0,
+        0x8e,
+        0x95,
+        0x1f,
+        0x22,
+        0x0d,
+        0xdf,
+        0x2a,
+        0x78,
+        0xd5,
+        0x73,
+        0x1c,
+        0xb4,
+        0x40,
+        0xa1,
+        0xb9,
+        0x3c,
+        0xca,
+        0x58,
+        0x92,
+        0x34,
+        0xcc,
+        0xce,
+        0xd7,
+        0x42,
+        0x90,
+        0x0f,
+        0x8b,
+        0x7f,
+        0x32,
+        0xed,
+        0x5c,
+        0x9d,
+        0xc8,
+        0x99,
+        0xad,
+        0x4e,
+        0x56,
+        0xa6,
+        0xf7,
+        0x68,
+        0xb7,
+        0x25,
+        0x82,
+        0x37,
+        0x3a,
+        0x51,
+        0x69,
+        0x26,
+        0x38,
+        0x52,
+        0x9e,
+        0x9a,
+        0x4f,
+        0xa7,
+        0x43,
+        0x10,
+        0x80,
+        0xee,
+        0x3d,
+        0x59,
+        0x35,
+        0xcf,
+        0x79,
+        0x74,
+        0xb5,
+        0xa2,
+        0xb1,
+        0x96,
+        0x23,
+        0xe0,
+        0xbe,
+        0x05,
+        0xf5,
+        0x6e,
+        0x19,
+        0xc5,
+        0x66,
+        0x49,
+        0xf0,
+        0xd1,
+        0x54,
+        0xa9,
+        0x70,
+        0x4b,
+        0xa4,
+        0xe2,
+        0xe6,
+        0xe5,
+        0xab,
+        0xe4,
+        0xd2,
+        0xaa,
+        0x4c,
+        0xe3,
+        0x06,
+        0x6f,
+        0xc6,
+        0x4a,
+        0xa4,
+        0x75,
+        0x97,
+        0xe1,
     ];
 
     public PictureBuffer()
diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/SoundManager.cs b/src/Woohoo.Agi.Interpreter/Interpreter/SoundManager.cs
index c7f9da1..102083c 100644
--- a/src/Woohoo.Agi.Interpreter/Interpreter/SoundManager.cs
+++ b/src/Woohoo.Agi.Interpreter/Interpreter/SoundManager.cs
@@ -11,33 +11,154 @@ public class SoundManager
 {
     private readonly short[] dissolveDataV2 =
     [
-        -2, -3, -2, -1, 0x00, 0x00, 0x01, 0x01, 0x01,
-        0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
-        0x02, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
-        0x04, 0x04, 0x04, 0x04, 0x05, 0x05, 0x05, 0x05,
-        0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 0x07,
-        0x07, 0x08, 0x08, 0x08, 0x08, 0x09, 0x09, 0x09,
-        0x09, 0x0A, 0x0A, 0x0A, 0x0A, 0x0B, 0x0B, 0x0B,
-        0x0B, 0x0B, 0x0B, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C,
-        0x0C, 0x0D, -100,
+        -2,
+        -3,
+        -2,
+        -1,
+        0x00,
+        0x00,
+        0x01,
+        0x01,
+        0x01,
+        0x01,
+        0x02,
+        0x02,
+        0x02,
+        0x02,
+        0x02,
+        0x02,
+        0x02,
+        0x02,
+        0x03,
+        0x03,
+        0x03,
+        0x03,
+        0x03,
+        0x03,
+        0x03,
+        0x04,
+        0x04,
+        0x04,
+        0x04,
+        0x05,
+        0x05,
+        0x05,
+        0x05,
+        0x06,
+        0x06,
+        0x06,
+        0x06,
+        0x06,
+        0x07,
+        0x07,
+        0x07,
+        0x07,
+        0x08,
+        0x08,
+        0x08,
+        0x08,
+        0x09,
+        0x09,
+        0x09,
+        0x09,
+        0x0A,
+        0x0A,
+        0x0A,
+        0x0A,
+        0x0B,
+        0x0B,
+        0x0B,
+        0x0B,
+        0x0B,
+        0x0B,
+        0x0C,
+        0x0C,
+        0x0C,
+        0x0C,
+        0x0C,
+        0x0C,
+        0x0D,
+        -100,
     ];
 
     private readonly short[] dissolveDataV3 =
     [
-        -2, -3, -2, -1,
-        0, 0, 0, 0, 0,
-        1, 1, 1, 1, 1, 1,
-        2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-        3, 3, 3, 3, 3, 3, 3, 3,
-        4, 4, 4, 4, 4,
-        5, 5, 5, 5, 5,
-        6, 6, 6, 6, 6,
-        7, 7, 7, 7,
-        8, 8, 8, 8,
-        9, 9, 9, 9,
-        0xA, 0x0A, 0x0A, 0xA,
-        0x0B, 0x0B, 0x0B, 0x0B, 0x0B, 0x0B,
-        0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C,
+        -2,
+        -3,
+        -2,
+        -1,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        2,
+        2,
+        2,
+        2,
+        2,
+        2,
+        2,
+        2,
+        2,
+        2,
+        3,
+        3,
+        3,
+        3,
+        3,
+        3,
+        3,
+        3,
+        4,
+        4,
+        4,
+        4,
+        4,
+        5,
+        5,
+        5,
+        5,
+        5,
+        6,
+        6,
+        6,
+        6,
+        6,
+        7,
+        7,
+        7,
+        7,
+        8,
+        8,
+        8,
+        8,
+        9,
+        9,
+        9,
+        9,
+        0xA,
+        0x0A,
+        0x0A,
+        0xA,
+        0x0B,
+        0x0B,
+        0x0B,
+        0x0B,
+        0x0B,
+        0x0B,
+        0x0C,
+        0x0C,
+        0x0C,
+        0x0C,
+        0x0C,
+        0x0C,
         0x0D,
         -100,
     ];
diff --git a/src/Woohoo.Agi.Player/Backend/Sdl/SdlInputDriver.cs b/src/Woohoo.Agi.Player/Backend/Sdl/SdlInputDriver.cs
index 4094e02..eb22aaf 100644
--- a/src/Woohoo.Agi.Player/Backend/Sdl/SdlInputDriver.cs
+++ b/src/Woohoo.Agi.Player/Backend/Sdl/SdlInputDriver.cs
@@ -16,8 +16,32 @@ internal class SdlInputDriver : IInputDriver
 
     private static readonly int[] SystemAltAtoZMap =
     [
-        30, 48, 46, 32, 18, 33, 34, 35, 23, 36, 37, 38, 50,
-        49, 24, 25, 16, 19, 31, 20, 22, 47, 17, 45, 21, 44,
+        30,
+        48,
+        46,
+        32,
+        18,
+        33,
+        34,
+        35,
+        23,
+        36,
+        37,
+        38,
+        50,
+        49,
+        24,
+        25,
+        16,
+        19,
+        31,
+        20,
+        22,
+        47,
+        17,
+        45,
+        21,
+        44,
     ];
 
     private static readonly SdlKey[] DirMap =
@@ -804,4 +828,3 @@ private InputEvent EventWait(bool includeJoystickAxis)
     }
 }
 #endif
-
diff --git a/src/Woohoo.Agi.Player/Backend/Sdl2/NativeMethods2.cs b/src/Woohoo.Agi.Player/Backend/Sdl2/NativeMethods2.cs
index 9c993c8..4c4bd69 100644
--- a/src/Woohoo.Agi.Player/Backend/Sdl2/NativeMethods2.cs
+++ b/src/Woohoo.Agi.Player/Backend/Sdl2/NativeMethods2.cs
@@ -39,4 +39,3 @@ public static partial class NativeMethods
     public static extern void SDL_WaitThread(IntPtr thread, out int status);
 }
 #endif
-
diff --git a/src/Woohoo.Agi.Player/Backend/Sdl2/Sdl2Player.cs b/src/Woohoo.Agi.Player/Backend/Sdl2/Sdl2Player.cs
index bac665c..73abb0e 100644
--- a/src/Woohoo.Agi.Player/Backend/Sdl2/Sdl2Player.cs
+++ b/src/Woohoo.Agi.Player/Backend/Sdl2/Sdl2Player.cs
@@ -31,4 +31,3 @@ protected override void Quit()
     }
 }
 #endif
-
diff --git a/src/Woohoo.Agi.Player/GameZipArchive.cs b/src/Woohoo.Agi.Player/GameZipArchive.cs
index ae40b28..a5bc922 100644
--- a/src/Woohoo.Agi.Player/GameZipArchive.cs
+++ b/src/Woohoo.Agi.Player/GameZipArchive.cs
@@ -128,4 +128,3 @@ public string[] GetFilesByExtension(string ext)
     }
 }
 #endif
-