diff --git a/.ci/notify.sh b/.ci/notify.sh
index a9edf69..0b8353e 100755
--- a/.ci/notify.sh
+++ b/.ci/notify.sh
@@ -19,7 +19,7 @@ fi
 if [[ -n "${GITHUB_HEAD_REF}" ]]; then
   # this is a PR
 
-  COMMITS_INVOLVED=$(git log --oneline ^"${GITHUB_BASE_REF}" HEAD)
+  COMMITS_INVOLVED=$(git log --oneline ^"origin/${GITHUB_BASE_REF}" HEAD)
   PR_LINK_TEXT=$(cat <<EOF
 [Pull Request](${GITHUB_URL}/pull/${TRAVIS_PULL_REQUEST})
 EOF
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..0eb2079
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,925 @@
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = false
+max_line_length = 120
+tab_width = 4
+ij_continuation_indent_size = 4
+ij_formatter_off_tag = @formatter:off
+ij_formatter_on_tag = @formatter:on
+ij_formatter_tags_enabled = false
+ij_smart_tabs = false
+ij_visual_guides = none
+ij_wrap_on_typing = false
+
+[*.java]
+ij_java_align_consecutive_assignments = false
+ij_java_align_consecutive_variable_declarations = false
+ij_java_align_group_field_declarations = false
+ij_java_align_multiline_annotation_parameters = false
+ij_java_align_multiline_array_initializer_expression = false
+ij_java_align_multiline_assignment = false
+ij_java_align_multiline_binary_operation = false
+ij_java_align_multiline_chained_methods = false
+ij_java_align_multiline_extends_list = false
+ij_java_align_multiline_for = true
+ij_java_align_multiline_method_parentheses = false
+ij_java_align_multiline_parameters = true
+ij_java_align_multiline_parameters_in_calls = false
+ij_java_align_multiline_parenthesized_expression = false
+ij_java_align_multiline_records = true
+ij_java_align_multiline_resources = true
+ij_java_align_multiline_ternary_operation = false
+ij_java_align_multiline_text_blocks = false
+ij_java_align_multiline_throws_list = false
+ij_java_align_subsequent_simple_methods = false
+ij_java_align_throws_keyword = false
+ij_java_annotation_parameter_wrap = off
+ij_java_array_initializer_new_line_after_left_brace = false
+ij_java_array_initializer_right_brace_on_new_line = false
+ij_java_array_initializer_wrap = off
+ij_java_assert_statement_colon_on_next_line = false
+ij_java_assert_statement_wrap = off
+ij_java_assignment_wrap = off
+ij_java_binary_operation_sign_on_next_line = false
+ij_java_binary_operation_wrap = off
+ij_java_blank_lines_after_anonymous_class_header = 0
+ij_java_blank_lines_after_class_header = 0
+ij_java_blank_lines_after_imports = 1
+ij_java_blank_lines_after_package = 1
+ij_java_blank_lines_around_class = 1
+ij_java_blank_lines_around_field = 0
+ij_java_blank_lines_around_field_in_interface = 0
+ij_java_blank_lines_around_initializer = 1
+ij_java_blank_lines_around_method = 1
+ij_java_blank_lines_around_method_in_interface = 1
+ij_java_blank_lines_before_class_end = 0
+ij_java_blank_lines_before_imports = 1
+ij_java_blank_lines_before_method_body = 0
+ij_java_blank_lines_before_package = 0
+ij_java_block_brace_style = end_of_line
+ij_java_block_comment_add_space = false
+ij_java_block_comment_at_first_column = true
+ij_java_builder_methods = none
+ij_java_call_parameters_new_line_after_left_paren = false
+ij_java_call_parameters_right_paren_on_new_line = false
+ij_java_call_parameters_wrap = off
+ij_java_case_statement_on_separate_line = true
+ij_java_catch_on_new_line = false
+ij_java_class_annotation_wrap = split_into_lines
+ij_java_class_brace_style = end_of_line
+ij_java_class_count_to_use_import_on_demand = 99
+ij_java_class_names_in_javadoc = 1
+ij_java_do_not_indent_top_level_class_members = false
+ij_java_do_not_wrap_after_single_annotation = false
+ij_java_do_while_brace_force = never
+ij_java_doc_add_blank_line_after_description = true
+ij_java_doc_add_blank_line_after_param_comments = false
+ij_java_doc_add_blank_line_after_return = false
+ij_java_doc_add_p_tag_on_empty_lines = true
+ij_java_doc_align_exception_comments = true
+ij_java_doc_align_param_comments = true
+ij_java_doc_do_not_wrap_if_one_line = false
+ij_java_doc_enable_formatting = true
+ij_java_doc_enable_leading_asterisks = true
+ij_java_doc_indent_on_continuation = false
+ij_java_doc_keep_empty_lines = true
+ij_java_doc_keep_empty_parameter_tag = true
+ij_java_doc_keep_empty_return_tag = true
+ij_java_doc_keep_empty_throws_tag = true
+ij_java_doc_keep_invalid_tags = true
+ij_java_doc_param_description_on_new_line = false
+ij_java_doc_preserve_line_breaks = false
+ij_java_doc_use_throws_not_exception_tag = true
+ij_java_else_on_new_line = false
+ij_java_enum_constants_wrap = off
+ij_java_extends_keyword_wrap = off
+ij_java_extends_list_wrap = off
+ij_java_field_annotation_wrap = split_into_lines
+ij_java_finally_on_new_line = false
+ij_java_for_brace_force = never
+ij_java_for_statement_new_line_after_left_paren = false
+ij_java_for_statement_right_paren_on_new_line = false
+ij_java_for_statement_wrap = off
+ij_java_generate_final_locals = false
+ij_java_generate_final_parameters = false
+ij_java_if_brace_force = never
+ij_java_imports_layout = $android.**, $androidx.**, $com.**, $junit.**, $net.**, $org.**, $java.**, $javax.**, $*, |, android.**, |, androidx.**, |, com.**, |, junit.**, |, net.**, |, org.**, |, java.**, |, javax.**, |, *, |
+ij_java_indent_case_from_switch = true
+ij_java_insert_inner_class_imports = false
+ij_java_insert_override_annotation = true
+ij_java_keep_blank_lines_before_right_brace = 2
+ij_java_keep_blank_lines_between_package_declaration_and_header = 2
+ij_java_keep_blank_lines_in_code = 2
+ij_java_keep_blank_lines_in_declarations = 2
+ij_java_keep_builder_methods_indents = false
+ij_java_keep_control_statement_in_one_line = true
+ij_java_keep_first_column_comment = true
+ij_java_keep_indents_on_empty_lines = false
+ij_java_keep_line_breaks = true
+ij_java_keep_multiple_expressions_in_one_line = false
+ij_java_keep_simple_blocks_in_one_line = false
+ij_java_keep_simple_classes_in_one_line = false
+ij_java_keep_simple_lambdas_in_one_line = false
+ij_java_keep_simple_methods_in_one_line = false
+ij_java_label_indent_absolute = false
+ij_java_label_indent_size = 0
+ij_java_lambda_brace_style = end_of_line
+ij_java_layout_static_imports_separately = true
+ij_java_line_comment_add_space = false
+ij_java_line_comment_at_first_column = true
+ij_java_method_annotation_wrap = split_into_lines
+ij_java_method_brace_style = end_of_line
+ij_java_method_call_chain_wrap = off
+ij_java_method_parameters_new_line_after_left_paren = false
+ij_java_method_parameters_right_paren_on_new_line = false
+ij_java_method_parameters_wrap = off
+ij_java_modifier_list_wrap = false
+ij_java_names_count_to_use_import_on_demand = 99
+ij_java_new_line_after_lparen_in_record_header = false
+ij_java_parameter_annotation_wrap = off
+ij_java_parentheses_expression_new_line_after_left_paren = false
+ij_java_parentheses_expression_right_paren_on_new_line = false
+ij_java_place_assignment_sign_on_next_line = false
+ij_java_prefer_longer_names = true
+ij_java_prefer_parameters_wrap = false
+ij_java_record_components_wrap = normal
+ij_java_repeat_synchronized = true
+ij_java_replace_instanceof_and_cast = false
+ij_java_replace_null_check = true
+ij_java_replace_sum_lambda_with_method_ref = true
+ij_java_resource_list_new_line_after_left_paren = false
+ij_java_resource_list_right_paren_on_new_line = false
+ij_java_resource_list_wrap = off
+ij_java_rparen_on_new_line_in_record_header = false
+ij_java_space_after_closing_angle_bracket_in_type_argument = false
+ij_java_space_after_colon = true
+ij_java_space_after_comma = true
+ij_java_space_after_comma_in_type_arguments = true
+ij_java_space_after_for_semicolon = true
+ij_java_space_after_quest = true
+ij_java_space_after_type_cast = true
+ij_java_space_before_annotation_array_initializer_left_brace = false
+ij_java_space_before_annotation_parameter_list = false
+ij_java_space_before_array_initializer_left_brace = false
+ij_java_space_before_catch_keyword = true
+ij_java_space_before_catch_left_brace = true
+ij_java_space_before_catch_parentheses = true
+ij_java_space_before_class_left_brace = true
+ij_java_space_before_colon = true
+ij_java_space_before_colon_in_foreach = true
+ij_java_space_before_comma = false
+ij_java_space_before_do_left_brace = true
+ij_java_space_before_else_keyword = true
+ij_java_space_before_else_left_brace = true
+ij_java_space_before_finally_keyword = true
+ij_java_space_before_finally_left_brace = true
+ij_java_space_before_for_left_brace = true
+ij_java_space_before_for_parentheses = true
+ij_java_space_before_for_semicolon = false
+ij_java_space_before_if_left_brace = true
+ij_java_space_before_if_parentheses = true
+ij_java_space_before_method_call_parentheses = false
+ij_java_space_before_method_left_brace = true
+ij_java_space_before_method_parentheses = false
+ij_java_space_before_opening_angle_bracket_in_type_parameter = false
+ij_java_space_before_quest = true
+ij_java_space_before_switch_left_brace = true
+ij_java_space_before_switch_parentheses = true
+ij_java_space_before_synchronized_left_brace = true
+ij_java_space_before_synchronized_parentheses = true
+ij_java_space_before_try_left_brace = true
+ij_java_space_before_try_parentheses = true
+ij_java_space_before_type_parameter_list = false
+ij_java_space_before_while_keyword = true
+ij_java_space_before_while_left_brace = true
+ij_java_space_before_while_parentheses = true
+ij_java_space_inside_one_line_enum_braces = false
+ij_java_space_within_empty_array_initializer_braces = false
+ij_java_space_within_empty_method_call_parentheses = false
+ij_java_space_within_empty_method_parentheses = false
+ij_java_spaces_around_additive_operators = true
+ij_java_spaces_around_assignment_operators = true
+ij_java_spaces_around_bitwise_operators = true
+ij_java_spaces_around_equality_operators = true
+ij_java_spaces_around_lambda_arrow = true
+ij_java_spaces_around_logical_operators = true
+ij_java_spaces_around_method_ref_dbl_colon = false
+ij_java_spaces_around_multiplicative_operators = true
+ij_java_spaces_around_relational_operators = true
+ij_java_spaces_around_shift_operators = true
+ij_java_spaces_around_type_bounds_in_type_parameters = true
+ij_java_spaces_around_unary_operator = false
+ij_java_spaces_within_angle_brackets = false
+ij_java_spaces_within_annotation_parentheses = false
+ij_java_spaces_within_array_initializer_braces = false
+ij_java_spaces_within_braces = false
+ij_java_spaces_within_brackets = false
+ij_java_spaces_within_cast_parentheses = false
+ij_java_spaces_within_catch_parentheses = false
+ij_java_spaces_within_for_parentheses = false
+ij_java_spaces_within_if_parentheses = false
+ij_java_spaces_within_method_call_parentheses = false
+ij_java_spaces_within_method_parentheses = false
+ij_java_spaces_within_parentheses = false
+ij_java_spaces_within_record_header = false
+ij_java_spaces_within_switch_parentheses = false
+ij_java_spaces_within_synchronized_parentheses = false
+ij_java_spaces_within_try_parentheses = false
+ij_java_spaces_within_while_parentheses = false
+ij_java_special_else_if_treatment = true
+ij_java_subclass_name_suffix = Impl
+ij_java_ternary_operation_signs_on_next_line = false
+ij_java_ternary_operation_wrap = off
+ij_java_test_name_suffix = Test
+ij_java_throws_keyword_wrap = off
+ij_java_throws_list_wrap = off
+ij_java_use_external_annotations = false
+ij_java_use_fq_class_names = false
+ij_java_use_relative_indents = false
+ij_java_use_single_class_imports = true
+ij_java_variable_annotation_wrap = off
+ij_java_visibility = public
+ij_java_while_brace_force = never
+ij_java_while_on_new_line = false
+ij_java_wrap_comments = false
+ij_java_wrap_first_method_in_call_chain = false
+ij_java_wrap_long_lines = false
+
+[*.properties]
+ij_properties_align_group_field_declarations = false
+ij_properties_keep_blank_lines = false
+ij_properties_key_value_delimiter = equals
+ij_properties_spaces_around_key_value_delimiter = false
+
+[.editorconfig]
+ij_editorconfig_align_group_field_declarations = false
+ij_editorconfig_space_after_colon = false
+ij_editorconfig_space_after_comma = true
+ij_editorconfig_space_before_colon = false
+ij_editorconfig_space_before_comma = false
+ij_editorconfig_spaces_around_assignment_operators = true
+
+[{*.ant,*.fxml,*.jhm,*.jnlp,*.jrxml,*.rng,*.tld,*.wsdl,*.xml,*.xsd,*.xsl,*.xslt,*.xul}]
+ij_continuation_indent_size = 4
+ij_xml_align_attributes = false
+ij_xml_align_text = false
+ij_xml_attribute_wrap = normal
+ij_xml_block_comment_add_space = false
+ij_xml_block_comment_at_first_column = true
+ij_xml_keep_blank_lines = 2
+ij_xml_keep_indents_on_empty_lines = false
+ij_xml_keep_line_breaks = false
+ij_xml_keep_line_breaks_in_text = true
+ij_xml_keep_whitespaces = false
+ij_xml_keep_whitespaces_around_cdata = preserve
+ij_xml_keep_whitespaces_inside_cdata = false
+ij_xml_line_comment_at_first_column = true
+ij_xml_space_after_tag_name = false
+ij_xml_space_around_equals_in_attribute = false
+ij_xml_space_inside_empty_tag = true
+ij_xml_text_wrap = normal
+ij_xml_use_custom_settings = true
+
+[{*.apinotes,*.yaml,*.yml}]
+indent_size = 2
+ij_yaml_align_values_properties = do_not_align
+ij_yaml_autoinsert_sequence_marker = true
+ij_yaml_block_mapping_on_new_line = false
+ij_yaml_indent_sequence_value = true
+ij_yaml_keep_indents_on_empty_lines = false
+ij_yaml_keep_line_breaks = true
+ij_yaml_sequence_on_new_line = false
+ij_yaml_space_before_colon = false
+ij_yaml_spaces_within_braces = true
+ij_yaml_spaces_within_brackets = true
+
+[{*.bash,*.sh,*.zsh}]
+indent_size = 2
+tab_width = 2
+ij_shell_binary_ops_start_line = false
+ij_shell_keep_column_alignment_padding = false
+ij_shell_minify_program = false
+ij_shell_redirect_followed_by_space = false
+ij_shell_switch_cases_indented = false
+ij_shell_use_unix_line_separator = true
+
+[{*.c,*.c++,*.cc,*.cp,*.cpp,*.cu,*.cuh,*.cxx,*.h,*.h++,*.hh,*.hp,*.hpp,*.hxx,*.i,*.icc,*.ii,*.inl,*.ino,*.ipp,*.m,*.mm,*.pch,*.tcc,*.tpp}]
+ij_c_add_brief_tag = false
+ij_c_add_getter_prefix = true
+ij_c_add_setter_prefix = true
+ij_c_align_dictionary_pair_values = false
+ij_c_align_group_field_declarations = false
+ij_c_align_init_list_in_columns = true
+ij_c_align_multiline_array_initializer_expression = true
+ij_c_align_multiline_assignment = true
+ij_c_align_multiline_binary_operation = true
+ij_c_align_multiline_chained_methods = false
+ij_c_align_multiline_for = true
+ij_c_align_multiline_ternary_operation = true
+ij_c_array_initializer_comma_on_next_line = false
+ij_c_array_initializer_new_line_after_left_brace = false
+ij_c_array_initializer_right_brace_on_new_line = false
+ij_c_array_initializer_wrap = normal
+ij_c_assignment_wrap = off
+ij_c_binary_operation_sign_on_next_line = false
+ij_c_binary_operation_wrap = normal
+ij_c_blank_lines_after_class_header = 0
+ij_c_blank_lines_after_imports = 1
+ij_c_blank_lines_around_class = 1
+ij_c_blank_lines_around_field = 0
+ij_c_blank_lines_around_field_in_interface = 0
+ij_c_blank_lines_around_method = 1
+ij_c_blank_lines_around_method_in_interface = 1
+ij_c_blank_lines_around_namespace = 0
+ij_c_blank_lines_around_properties_in_declaration = 0
+ij_c_blank_lines_around_properties_in_interface = 0
+ij_c_blank_lines_before_imports = 1
+ij_c_blank_lines_before_method_body = 0
+ij_c_block_brace_placement = end_of_line
+ij_c_block_brace_style = end_of_line
+ij_c_block_comment_at_first_column = true
+ij_c_catch_on_new_line = false
+ij_c_class_brace_style = end_of_line
+ij_c_class_constructor_init_list_align_multiline = true
+ij_c_class_constructor_init_list_comma_on_next_line = false
+ij_c_class_constructor_init_list_new_line_after_colon = never
+ij_c_class_constructor_init_list_new_line_before_colon = if_long
+ij_c_class_constructor_init_list_wrap = normal
+ij_c_copy_is_deep = false
+ij_c_create_interface_for_categories = true
+ij_c_declare_generated_methods = true
+ij_c_description_include_member_names = true
+ij_c_discharged_short_ternary_operator = false
+ij_c_do_not_add_breaks = false
+ij_c_do_while_brace_force = never
+ij_c_else_on_new_line = false
+ij_c_enum_constants_comma_on_next_line = false
+ij_c_enum_constants_wrap = on_every_item
+ij_c_for_brace_force = never
+ij_c_for_statement_new_line_after_left_paren = false
+ij_c_for_statement_right_paren_on_new_line = false
+ij_c_for_statement_wrap = off
+ij_c_function_brace_placement = end_of_line
+ij_c_function_call_arguments_align_multiline = true
+ij_c_function_call_arguments_align_multiline_pars = false
+ij_c_function_call_arguments_comma_on_next_line = false
+ij_c_function_call_arguments_new_line_after_lpar = false
+ij_c_function_call_arguments_new_line_before_rpar = false
+ij_c_function_call_arguments_wrap = normal
+ij_c_function_non_top_after_return_type_wrap = normal
+ij_c_function_parameters_align_multiline = true
+ij_c_function_parameters_align_multiline_pars = false
+ij_c_function_parameters_comma_on_next_line = false
+ij_c_function_parameters_new_line_after_lpar = false
+ij_c_function_parameters_new_line_before_rpar = false
+ij_c_function_parameters_wrap = normal
+ij_c_function_top_after_return_type_wrap = normal
+ij_c_generate_additional_eq_operators = true
+ij_c_generate_additional_rel_operators = true
+ij_c_generate_class_constructor = true
+ij_c_generate_comparison_operators_use_std_tie = false
+ij_c_generate_instance_variables_for_properties = ask
+ij_c_generate_operators_as_members = true
+ij_c_header_guard_style_pattern = ${PROJECT_NAME}_${FILE_NAME}_${EXT}
+ij_c_if_brace_force = never
+ij_c_in_line_short_ternary_operator = true
+ij_c_indent_block_comment = true
+ij_c_indent_c_struct_members = 4
+ij_c_indent_case_from_switch = true
+ij_c_indent_class_members = 4
+ij_c_indent_directive_as_code = false
+ij_c_indent_implementation_members = 0
+ij_c_indent_inside_code_block = 4
+ij_c_indent_interface_members = 0
+ij_c_indent_interface_members_except_ivars_block = false
+ij_c_indent_namespace_members = 4
+ij_c_indent_preprocessor_directive = 0
+ij_c_indent_visibility_keywords = 0
+ij_c_insert_override = true
+ij_c_insert_virtual_with_override = false
+ij_c_introduce_auto_vars = false
+ij_c_introduce_const_params = false
+ij_c_introduce_const_vars = false
+ij_c_introduce_generate_property = false
+ij_c_introduce_generate_synthesize = true
+ij_c_introduce_globals_to_header = true
+ij_c_introduce_prop_to_private_category = false
+ij_c_introduce_static_consts = true
+ij_c_introduce_use_ns_types = false
+ij_c_ivars_prefix = _
+ij_c_keep_blank_lines_before_end = 2
+ij_c_keep_blank_lines_before_right_brace = 2
+ij_c_keep_blank_lines_in_code = 2
+ij_c_keep_blank_lines_in_declarations = 2
+ij_c_keep_case_expressions_in_one_line = false
+ij_c_keep_control_statement_in_one_line = true
+ij_c_keep_directive_at_first_column = true
+ij_c_keep_first_column_comment = true
+ij_c_keep_line_breaks = true
+ij_c_keep_nested_namespaces_in_one_line = false
+ij_c_keep_simple_blocks_in_one_line = true
+ij_c_keep_simple_methods_in_one_line = true
+ij_c_keep_structures_in_one_line = false
+ij_c_lambda_capture_list_align_multiline = false
+ij_c_lambda_capture_list_align_multiline_bracket = false
+ij_c_lambda_capture_list_comma_on_next_line = false
+ij_c_lambda_capture_list_new_line_after_lbracket = false
+ij_c_lambda_capture_list_new_line_before_rbracket = false
+ij_c_lambda_capture_list_wrap = off
+ij_c_line_comment_add_space = false
+ij_c_line_comment_at_first_column = true
+ij_c_method_brace_placement = end_of_line
+ij_c_method_call_arguments_align_by_colons = true
+ij_c_method_call_arguments_align_multiline = false
+ij_c_method_call_arguments_special_dictionary_pairs_treatment = true
+ij_c_method_call_arguments_wrap = off
+ij_c_method_call_chain_wrap = off
+ij_c_method_parameters_align_by_colons = true
+ij_c_method_parameters_align_multiline = false
+ij_c_method_parameters_wrap = off
+ij_c_namespace_brace_placement = end_of_line
+ij_c_parentheses_expression_new_line_after_left_paren = false
+ij_c_parentheses_expression_right_paren_on_new_line = false
+ij_c_place_assignment_sign_on_next_line = false
+ij_c_property_nonatomic = true
+ij_c_put_ivars_to_implementation = true
+ij_c_refactor_compatibility_aliases_and_classes = true
+ij_c_refactor_properties_and_ivars = true
+ij_c_release_style = ivar
+ij_c_retain_object_parameters_in_constructor = true
+ij_c_semicolon_after_method_signature = false
+ij_c_shift_operation_align_multiline = true
+ij_c_shift_operation_wrap = normal
+ij_c_show_non_virtual_functions = false
+ij_c_space_after_colon = true
+ij_c_space_after_colon_in_foreach = true
+ij_c_space_after_colon_in_selector = false
+ij_c_space_after_comma = true
+ij_c_space_after_cup_in_blocks = false
+ij_c_space_after_dictionary_literal_colon = true
+ij_c_space_after_for_semicolon = true
+ij_c_space_after_init_list_colon = true
+ij_c_space_after_method_parameter_type_parentheses = false
+ij_c_space_after_method_return_type_parentheses = false
+ij_c_space_after_pointer_in_declaration = false
+ij_c_space_after_quest = true
+ij_c_space_after_reference_in_declaration = false
+ij_c_space_after_reference_in_rvalue = false
+ij_c_space_after_structures_rbrace = true
+ij_c_space_after_superclass_colon = true
+ij_c_space_after_type_cast = true
+ij_c_space_after_visibility_sign_in_method_declaration = true
+ij_c_space_before_autorelease_pool_lbrace = true
+ij_c_space_before_catch_keyword = true
+ij_c_space_before_catch_left_brace = true
+ij_c_space_before_catch_parentheses = true
+ij_c_space_before_category_parentheses = true
+ij_c_space_before_chained_send_message = true
+ij_c_space_before_class_left_brace = true
+ij_c_space_before_colon = true
+ij_c_space_before_colon_in_foreach = false
+ij_c_space_before_comma = false
+ij_c_space_before_dictionary_literal_colon = false
+ij_c_space_before_do_left_brace = true
+ij_c_space_before_else_keyword = true
+ij_c_space_before_else_left_brace = true
+ij_c_space_before_for_left_brace = true
+ij_c_space_before_for_parentheses = true
+ij_c_space_before_for_semicolon = false
+ij_c_space_before_if_left_brace = true
+ij_c_space_before_if_parentheses = true
+ij_c_space_before_init_list = false
+ij_c_space_before_init_list_colon = true
+ij_c_space_before_method_call_parentheses = false
+ij_c_space_before_method_left_brace = true
+ij_c_space_before_method_parentheses = false
+ij_c_space_before_namespace_lbrace = true
+ij_c_space_before_pointer_in_declaration = true
+ij_c_space_before_property_attributes_parentheses = false
+ij_c_space_before_protocols_brackets = true
+ij_c_space_before_quest = true
+ij_c_space_before_reference_in_declaration = true
+ij_c_space_before_superclass_colon = true
+ij_c_space_before_switch_left_brace = true
+ij_c_space_before_switch_parentheses = true
+ij_c_space_before_template_call_lt = false
+ij_c_space_before_template_declaration_lt = false
+ij_c_space_before_try_left_brace = true
+ij_c_space_before_while_keyword = true
+ij_c_space_before_while_left_brace = true
+ij_c_space_before_while_parentheses = true
+ij_c_space_between_adjacent_brackets = false
+ij_c_space_between_operator_and_punctuator = false
+ij_c_space_within_empty_array_initializer_braces = false
+ij_c_spaces_around_additive_operators = true
+ij_c_spaces_around_assignment_operators = true
+ij_c_spaces_around_bitwise_operators = true
+ij_c_spaces_around_equality_operators = true
+ij_c_spaces_around_lambda_arrow = true
+ij_c_spaces_around_logical_operators = true
+ij_c_spaces_around_multiplicative_operators = true
+ij_c_spaces_around_pm_operators = false
+ij_c_spaces_around_relational_operators = true
+ij_c_spaces_around_shift_operators = true
+ij_c_spaces_around_unary_operator = false
+ij_c_spaces_within_array_initializer_braces = false
+ij_c_spaces_within_braces = true
+ij_c_spaces_within_brackets = false
+ij_c_spaces_within_cast_parentheses = false
+ij_c_spaces_within_catch_parentheses = false
+ij_c_spaces_within_category_parentheses = false
+ij_c_spaces_within_empty_braces = false
+ij_c_spaces_within_empty_function_call_parentheses = false
+ij_c_spaces_within_empty_function_declaration_parentheses = false
+ij_c_spaces_within_empty_lambda_capture_list_bracket = false
+ij_c_spaces_within_empty_template_call_ltgt = false
+ij_c_spaces_within_empty_template_declaration_ltgt = false
+ij_c_spaces_within_for_parentheses = false
+ij_c_spaces_within_function_call_parentheses = false
+ij_c_spaces_within_function_declaration_parentheses = false
+ij_c_spaces_within_if_parentheses = false
+ij_c_spaces_within_lambda_capture_list_bracket = false
+ij_c_spaces_within_method_parameter_type_parentheses = false
+ij_c_spaces_within_method_return_type_parentheses = false
+ij_c_spaces_within_parentheses = false
+ij_c_spaces_within_property_attributes_parentheses = false
+ij_c_spaces_within_protocols_brackets = false
+ij_c_spaces_within_send_message_brackets = false
+ij_c_spaces_within_switch_parentheses = false
+ij_c_spaces_within_template_call_ltgt = false
+ij_c_spaces_within_template_declaration_ltgt = false
+ij_c_spaces_within_template_double_gt = true
+ij_c_spaces_within_while_parentheses = false
+ij_c_special_else_if_treatment = true
+ij_c_superclass_list_after_colon = never
+ij_c_superclass_list_align_multiline = true
+ij_c_superclass_list_before_colon = if_long
+ij_c_superclass_list_comma_on_next_line = false
+ij_c_superclass_list_wrap = on_every_item
+ij_c_tag_prefix_of_block_comment = at
+ij_c_tag_prefix_of_line_comment = back_slash
+ij_c_template_call_arguments_align_multiline = false
+ij_c_template_call_arguments_align_multiline_pars = false
+ij_c_template_call_arguments_comma_on_next_line = false
+ij_c_template_call_arguments_new_line_after_lt = false
+ij_c_template_call_arguments_new_line_before_gt = false
+ij_c_template_call_arguments_wrap = off
+ij_c_template_declaration_function_body_indent = false
+ij_c_template_declaration_function_wrap = split_into_lines
+ij_c_template_declaration_struct_body_indent = false
+ij_c_template_declaration_struct_wrap = split_into_lines
+ij_c_template_parameters_align_multiline = false
+ij_c_template_parameters_align_multiline_pars = false
+ij_c_template_parameters_comma_on_next_line = false
+ij_c_template_parameters_new_line_after_lt = false
+ij_c_template_parameters_new_line_before_gt = false
+ij_c_template_parameters_wrap = off
+ij_c_ternary_operation_signs_on_next_line = true
+ij_c_ternary_operation_wrap = normal
+ij_c_type_qualifiers_placement = before
+ij_c_use_modern_casts = true
+ij_c_use_setters_in_constructor = true
+ij_c_while_brace_force = never
+ij_c_while_on_new_line = false
+ij_c_wrap_property_declaration = off
+
+[{*.cmake,CMakeLists.txt}]
+ij_cmake_align_multiline_parameters_in_calls = false
+ij_cmake_force_commands_case = 2
+ij_cmake_keep_blank_lines_in_code = 2
+ij_cmake_space_before_for_parentheses = true
+ij_cmake_space_before_if_parentheses = true
+ij_cmake_space_before_method_call_parentheses = false
+ij_cmake_space_before_method_parentheses = false
+ij_cmake_space_before_while_parentheses = true
+ij_cmake_spaces_within_for_parentheses = false
+ij_cmake_spaces_within_if_parentheses = false
+ij_cmake_spaces_within_method_call_parentheses = false
+ij_cmake_spaces_within_method_parentheses = false
+ij_cmake_spaces_within_while_parentheses = false
+
+[{*.gant,*.groovy,*.gy}]
+ij_groovy_align_group_field_declarations = false
+ij_groovy_align_multiline_array_initializer_expression = false
+ij_groovy_align_multiline_assignment = false
+ij_groovy_align_multiline_binary_operation = false
+ij_groovy_align_multiline_chained_methods = false
+ij_groovy_align_multiline_extends_list = false
+ij_groovy_align_multiline_for = true
+ij_groovy_align_multiline_list_or_map = true
+ij_groovy_align_multiline_method_parentheses = false
+ij_groovy_align_multiline_parameters = true
+ij_groovy_align_multiline_parameters_in_calls = false
+ij_groovy_align_multiline_resources = true
+ij_groovy_align_multiline_ternary_operation = false
+ij_groovy_align_multiline_throws_list = false
+ij_groovy_align_named_args_in_map = true
+ij_groovy_align_throws_keyword = false
+ij_groovy_array_initializer_new_line_after_left_brace = false
+ij_groovy_array_initializer_right_brace_on_new_line = false
+ij_groovy_array_initializer_wrap = off
+ij_groovy_assert_statement_wrap = off
+ij_groovy_assignment_wrap = off
+ij_groovy_binary_operation_wrap = off
+ij_groovy_blank_lines_after_class_header = 0
+ij_groovy_blank_lines_after_imports = 1
+ij_groovy_blank_lines_after_package = 1
+ij_groovy_blank_lines_around_class = 1
+ij_groovy_blank_lines_around_field = 0
+ij_groovy_blank_lines_around_field_in_interface = 0
+ij_groovy_blank_lines_around_method = 1
+ij_groovy_blank_lines_around_method_in_interface = 1
+ij_groovy_blank_lines_before_imports = 1
+ij_groovy_blank_lines_before_method_body = 0
+ij_groovy_blank_lines_before_package = 0
+ij_groovy_block_brace_style = end_of_line
+ij_groovy_block_comment_add_space = false
+ij_groovy_block_comment_at_first_column = true
+ij_groovy_call_parameters_new_line_after_left_paren = false
+ij_groovy_call_parameters_right_paren_on_new_line = false
+ij_groovy_call_parameters_wrap = off
+ij_groovy_catch_on_new_line = false
+ij_groovy_class_annotation_wrap = split_into_lines
+ij_groovy_class_brace_style = end_of_line
+ij_groovy_class_count_to_use_import_on_demand = 5
+ij_groovy_do_while_brace_force = never
+ij_groovy_else_on_new_line = false
+ij_groovy_enum_constants_wrap = off
+ij_groovy_extends_keyword_wrap = off
+ij_groovy_extends_list_wrap = off
+ij_groovy_field_annotation_wrap = split_into_lines
+ij_groovy_finally_on_new_line = false
+ij_groovy_for_brace_force = never
+ij_groovy_for_statement_new_line_after_left_paren = false
+ij_groovy_for_statement_right_paren_on_new_line = false
+ij_groovy_for_statement_wrap = off
+ij_groovy_if_brace_force = never
+ij_groovy_import_annotation_wrap = 2
+ij_groovy_imports_layout = *, |, javax.**, java.**, |, $*
+ij_groovy_indent_case_from_switch = true
+ij_groovy_indent_label_blocks = true
+ij_groovy_insert_inner_class_imports = false
+ij_groovy_keep_blank_lines_before_right_brace = 2
+ij_groovy_keep_blank_lines_in_code = 2
+ij_groovy_keep_blank_lines_in_declarations = 2
+ij_groovy_keep_control_statement_in_one_line = true
+ij_groovy_keep_first_column_comment = true
+ij_groovy_keep_indents_on_empty_lines = false
+ij_groovy_keep_line_breaks = true
+ij_groovy_keep_multiple_expressions_in_one_line = false
+ij_groovy_keep_simple_blocks_in_one_line = false
+ij_groovy_keep_simple_classes_in_one_line = true
+ij_groovy_keep_simple_lambdas_in_one_line = true
+ij_groovy_keep_simple_methods_in_one_line = true
+ij_groovy_label_indent_absolute = false
+ij_groovy_label_indent_size = 0
+ij_groovy_lambda_brace_style = end_of_line
+ij_groovy_layout_static_imports_separately = true
+ij_groovy_line_comment_add_space = false
+ij_groovy_line_comment_at_first_column = true
+ij_groovy_method_annotation_wrap = split_into_lines
+ij_groovy_method_brace_style = end_of_line
+ij_groovy_method_call_chain_wrap = off
+ij_groovy_method_parameters_new_line_after_left_paren = false
+ij_groovy_method_parameters_right_paren_on_new_line = false
+ij_groovy_method_parameters_wrap = off
+ij_groovy_modifier_list_wrap = false
+ij_groovy_names_count_to_use_import_on_demand = 3
+ij_groovy_packages_to_use_import_on_demand = java.awt.*, javax.swing.*
+ij_groovy_parameter_annotation_wrap = off
+ij_groovy_parentheses_expression_new_line_after_left_paren = false
+ij_groovy_parentheses_expression_right_paren_on_new_line = false
+ij_groovy_prefer_parameters_wrap = false
+ij_groovy_resource_list_new_line_after_left_paren = false
+ij_groovy_resource_list_right_paren_on_new_line = false
+ij_groovy_resource_list_wrap = off
+ij_groovy_space_after_assert_separator = true
+ij_groovy_space_after_colon = true
+ij_groovy_space_after_comma = true
+ij_groovy_space_after_comma_in_type_arguments = true
+ij_groovy_space_after_for_semicolon = true
+ij_groovy_space_after_quest = true
+ij_groovy_space_after_type_cast = true
+ij_groovy_space_before_annotation_parameter_list = false
+ij_groovy_space_before_array_initializer_left_brace = false
+ij_groovy_space_before_assert_separator = false
+ij_groovy_space_before_catch_keyword = true
+ij_groovy_space_before_catch_left_brace = true
+ij_groovy_space_before_catch_parentheses = true
+ij_groovy_space_before_class_left_brace = true
+ij_groovy_space_before_closure_left_brace = true
+ij_groovy_space_before_colon = true
+ij_groovy_space_before_comma = false
+ij_groovy_space_before_do_left_brace = true
+ij_groovy_space_before_else_keyword = true
+ij_groovy_space_before_else_left_brace = true
+ij_groovy_space_before_finally_keyword = true
+ij_groovy_space_before_finally_left_brace = true
+ij_groovy_space_before_for_left_brace = true
+ij_groovy_space_before_for_parentheses = true
+ij_groovy_space_before_for_semicolon = false
+ij_groovy_space_before_if_left_brace = true
+ij_groovy_space_before_if_parentheses = true
+ij_groovy_space_before_method_call_parentheses = false
+ij_groovy_space_before_method_left_brace = true
+ij_groovy_space_before_method_parentheses = false
+ij_groovy_space_before_quest = true
+ij_groovy_space_before_record_parentheses = false
+ij_groovy_space_before_switch_left_brace = true
+ij_groovy_space_before_switch_parentheses = true
+ij_groovy_space_before_synchronized_left_brace = true
+ij_groovy_space_before_synchronized_parentheses = true
+ij_groovy_space_before_try_left_brace = true
+ij_groovy_space_before_try_parentheses = true
+ij_groovy_space_before_while_keyword = true
+ij_groovy_space_before_while_left_brace = true
+ij_groovy_space_before_while_parentheses = true
+ij_groovy_space_in_named_argument = true
+ij_groovy_space_in_named_argument_before_colon = false
+ij_groovy_space_within_empty_array_initializer_braces = false
+ij_groovy_space_within_empty_method_call_parentheses = false
+ij_groovy_spaces_around_additive_operators = true
+ij_groovy_spaces_around_assignment_operators = true
+ij_groovy_spaces_around_bitwise_operators = true
+ij_groovy_spaces_around_equality_operators = true
+ij_groovy_spaces_around_lambda_arrow = true
+ij_groovy_spaces_around_logical_operators = true
+ij_groovy_spaces_around_multiplicative_operators = true
+ij_groovy_spaces_around_regex_operators = true
+ij_groovy_spaces_around_relational_operators = true
+ij_groovy_spaces_around_shift_operators = true
+ij_groovy_spaces_within_annotation_parentheses = false
+ij_groovy_spaces_within_array_initializer_braces = false
+ij_groovy_spaces_within_braces = true
+ij_groovy_spaces_within_brackets = false
+ij_groovy_spaces_within_cast_parentheses = false
+ij_groovy_spaces_within_catch_parentheses = false
+ij_groovy_spaces_within_for_parentheses = false
+ij_groovy_spaces_within_gstring_injection_braces = false
+ij_groovy_spaces_within_if_parentheses = false
+ij_groovy_spaces_within_list_or_map = false
+ij_groovy_spaces_within_method_call_parentheses = false
+ij_groovy_spaces_within_method_parentheses = false
+ij_groovy_spaces_within_parentheses = false
+ij_groovy_spaces_within_switch_parentheses = false
+ij_groovy_spaces_within_synchronized_parentheses = false
+ij_groovy_spaces_within_try_parentheses = false
+ij_groovy_spaces_within_tuple_expression = false
+ij_groovy_spaces_within_while_parentheses = false
+ij_groovy_special_else_if_treatment = true
+ij_groovy_ternary_operation_wrap = off
+ij_groovy_throws_keyword_wrap = off
+ij_groovy_throws_list_wrap = off
+ij_groovy_use_flying_geese_braces = false
+ij_groovy_use_fq_class_names = false
+ij_groovy_use_fq_class_names_in_javadoc = true
+ij_groovy_use_relative_indents = false
+ij_groovy_use_single_class_imports = true
+ij_groovy_variable_annotation_wrap = off
+ij_groovy_while_brace_force = never
+ij_groovy_while_on_new_line = false
+ij_groovy_wrap_chain_calls_after_dot = false
+ij_groovy_wrap_long_lines = false
+
+[{*.gradle.kts,*.kt,*.kts,*.main.kts}]
+ij_kotlin_align_in_columns_case_branch = false
+ij_kotlin_align_multiline_binary_operation = false
+ij_kotlin_align_multiline_extends_list = false
+ij_kotlin_align_multiline_method_parentheses = false
+ij_kotlin_align_multiline_parameters = true
+ij_kotlin_align_multiline_parameters_in_calls = false
+ij_kotlin_allow_trailing_comma = false
+ij_kotlin_allow_trailing_comma_on_call_site = false
+ij_kotlin_assignment_wrap = off
+ij_kotlin_blank_lines_after_class_header = 0
+ij_kotlin_blank_lines_around_block_when_branches = 0
+ij_kotlin_blank_lines_before_declaration_with_comment_or_annotation_on_separate_line = 1
+ij_kotlin_block_comment_add_space = false
+ij_kotlin_block_comment_at_first_column = true
+ij_kotlin_call_parameters_new_line_after_left_paren = false
+ij_kotlin_call_parameters_right_paren_on_new_line = false
+ij_kotlin_call_parameters_wrap = off
+ij_kotlin_catch_on_new_line = false
+ij_kotlin_class_annotation_wrap = split_into_lines
+ij_kotlin_continuation_indent_for_chained_calls = true
+ij_kotlin_continuation_indent_for_expression_bodies = true
+ij_kotlin_continuation_indent_in_argument_lists = true
+ij_kotlin_continuation_indent_in_elvis = true
+ij_kotlin_continuation_indent_in_if_conditions = true
+ij_kotlin_continuation_indent_in_parameter_lists = true
+ij_kotlin_continuation_indent_in_supertype_lists = true
+ij_kotlin_else_on_new_line = false
+ij_kotlin_enum_constants_wrap = off
+ij_kotlin_extends_list_wrap = off
+ij_kotlin_field_annotation_wrap = split_into_lines
+ij_kotlin_finally_on_new_line = false
+ij_kotlin_if_rparen_on_new_line = false
+ij_kotlin_import_nested_classes = false
+ij_kotlin_imports_layout = *, java.**, javax.**, kotlin.**, ^
+ij_kotlin_insert_whitespaces_in_simple_one_line_method = true
+ij_kotlin_keep_blank_lines_before_right_brace = 2
+ij_kotlin_keep_blank_lines_in_code = 2
+ij_kotlin_keep_blank_lines_in_declarations = 2
+ij_kotlin_keep_first_column_comment = true
+ij_kotlin_keep_indents_on_empty_lines = false
+ij_kotlin_keep_line_breaks = true
+ij_kotlin_lbrace_on_next_line = false
+ij_kotlin_line_comment_add_space = false
+ij_kotlin_line_comment_at_first_column = true
+ij_kotlin_method_annotation_wrap = split_into_lines
+ij_kotlin_method_call_chain_wrap = off
+ij_kotlin_method_parameters_new_line_after_left_paren = false
+ij_kotlin_method_parameters_right_paren_on_new_line = false
+ij_kotlin_method_parameters_wrap = off
+ij_kotlin_name_count_to_use_star_import = 5
+ij_kotlin_name_count_to_use_star_import_for_members = 3
+ij_kotlin_packages_to_use_import_on_demand = java.util.*, kotlinx.android.synthetic.**, io.ktor.**
+ij_kotlin_parameter_annotation_wrap = off
+ij_kotlin_space_after_comma = true
+ij_kotlin_space_after_extend_colon = true
+ij_kotlin_space_after_type_colon = true
+ij_kotlin_space_before_catch_parentheses = true
+ij_kotlin_space_before_comma = false
+ij_kotlin_space_before_extend_colon = true
+ij_kotlin_space_before_for_parentheses = true
+ij_kotlin_space_before_if_parentheses = true
+ij_kotlin_space_before_lambda_arrow = true
+ij_kotlin_space_before_type_colon = false
+ij_kotlin_space_before_when_parentheses = true
+ij_kotlin_space_before_while_parentheses = true
+ij_kotlin_spaces_around_additive_operators = true
+ij_kotlin_spaces_around_assignment_operators = true
+ij_kotlin_spaces_around_equality_operators = true
+ij_kotlin_spaces_around_function_type_arrow = true
+ij_kotlin_spaces_around_logical_operators = true
+ij_kotlin_spaces_around_multiplicative_operators = true
+ij_kotlin_spaces_around_range = false
+ij_kotlin_spaces_around_relational_operators = true
+ij_kotlin_spaces_around_unary_operator = false
+ij_kotlin_spaces_around_when_arrow = true
+ij_kotlin_use_custom_formatting_for_modifiers = true
+ij_kotlin_variable_annotation_wrap = off
+ij_kotlin_while_on_new_line = false
+ij_kotlin_wrap_elvis_expressions = 1
+ij_kotlin_wrap_expression_body_functions = 0
+ij_kotlin_wrap_first_method_in_call_chain = false
+
+[{*.har,*.json}]
+indent_size = 2
+ij_json_keep_blank_lines_in_code = 0
+ij_json_keep_indents_on_empty_lines = false
+ij_json_keep_line_breaks = true
+ij_json_space_after_colon = true
+ij_json_space_after_comma = true
+ij_json_space_before_colon = true
+ij_json_space_before_comma = false
+ij_json_spaces_within_braces = false
+ij_json_spaces_within_brackets = false
+ij_json_wrap_long_lines = false
+
+[{*.htm,*.html,*.sht,*.shtm,*.shtml}]
+ij_html_add_new_line_before_tags = body, div, p, form, h1, h2, h3
+ij_html_align_attributes = true
+ij_html_align_text = false
+ij_html_attribute_wrap = normal
+ij_html_block_comment_add_space = false
+ij_html_block_comment_at_first_column = true
+ij_html_do_not_align_children_of_min_lines = 0
+ij_html_do_not_break_if_inline_tags = title, h1, h2, h3, h4, h5, h6, p
+ij_html_do_not_indent_children_of_tags = html, body, thead, tbody, tfoot
+ij_html_enforce_quotes = false
+ij_html_inline_tags = a, abbr, acronym, b, basefont, bdo, big, br, cite, cite, code, dfn, em, font, i, img, input, kbd, label, q, s, samp, select, small, span, strike, strong, sub, sup, textarea, tt, u, var
+ij_html_keep_blank_lines = 2
+ij_html_keep_indents_on_empty_lines = false
+ij_html_keep_line_breaks = true
+ij_html_keep_line_breaks_in_text = true
+ij_html_keep_whitespaces = false
+ij_html_keep_whitespaces_inside = span, pre, textarea
+ij_html_line_comment_at_first_column = true
+ij_html_new_line_after_last_attribute = never
+ij_html_new_line_before_first_attribute = never
+ij_html_quote_style = double
+ij_html_remove_new_line_before_tags = br
+ij_html_space_after_tag_name = false
+ij_html_space_around_equality_in_attribute = false
+ij_html_space_inside_empty_tag = false
+ij_html_text_wrap = normal
+
+[{*.markdown,*.md}]
+ij_markdown_force_one_space_after_blockquote_symbol = true
+ij_markdown_force_one_space_after_header_symbol = true
+ij_markdown_force_one_space_after_list_bullet = true
+ij_markdown_force_one_space_between_words = true
+ij_markdown_keep_indents_on_empty_lines = false
+ij_markdown_max_lines_around_block_elements = 1
+ij_markdown_max_lines_around_header = 1
+ij_markdown_max_lines_between_paragraphs = 1
+ij_markdown_min_lines_around_block_elements = 1
+ij_markdown_min_lines_around_header = 1
+ij_markdown_min_lines_between_paragraphs = 1
+
+[{*.toml,Cargo.lock,Cargo.toml.orig,Gopkg.lock,Pipfile,poetry.lock}]
+ij_toml_keep_indents_on_empty_lines = false
diff --git a/.github/config.yml b/.github/config.yml
deleted file mode 100644
index 3ea88e9..0000000
--- a/.github/config.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-# Configuration for new-issue-welcome - https://github.com/behaviorbot/new-issue-welcome
-
-# Comment to be posted to on first time issues
-newIssueWelcomeComment: >
-  Thanks for opening your first issue here! :tada:
-
-# Configuration for new-pr-welcome - https://github.com/behaviorbot/new-pr-welcome
-
-# Comment to be posted to on PRs from first time contributors in your repository
-newPRWelcomeComment: >
-  Thanks for opening this pull request! :nerd_face:
-
-# Configuration for first-pr-merge - https://github.com/behaviorbot/first-pr-merge
-
-# Comment to be posted to on pull requests merged by a first time user
-firstPRMergeComment: >
-  Congrats on merging your first pull request here! You should be proud of yourself :1st_place_medal: 
-  ![Congratulations](https://media.giphy.com/media/ehhuGD0nByYxO/giphy.gif)
-
-# It is recommend to include as many gifs and emojis as possible
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2504eb4..8406cd7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,11 +12,11 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: temurin
           cache: 'gradle'
       - name: Perform base checks
-        run: ./gradlew app:assembleDebug library:sourcesJar library:dokkaJar --stacktrace
+        run: ./gradlew app:assembleDebug --stacktrace
   ANDROID_UNIT_TESTS:
     name: Unit Tests
     runs-on: ubuntu-latest
@@ -24,7 +24,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: temurin
           cache: 'gradle'
       - name: Execute unit tests
@@ -34,11 +34,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+        with:
+          # required for telegram notifications on PRs
+          fetch-depth: 0
       - uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: temurin
           cache: 'gradle'
+
       - name: Setup custom keystore file
         run: |
           mkdir -p $HOME/.android
diff --git a/.jitpack.yml b/.jitpack.yml
new file mode 100644
index 0000000..57db296
--- /dev/null
+++ b/.jitpack.yml
@@ -0,0 +1 @@
+jdk: openjdk17
\ No newline at end of file
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..86bd471
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,27 @@
+.PHONY: build
+
+clean:
+	./gradlew clean
+
+build:
+	./gradlew assembleDebug
+apk: build
+
+buildRelease:
+	./gradlew assembleRelease
+
+install: build
+	adb install ./app/build/outputs/apk/**/*.apk
+
+installRelease: buildRelease
+	adb install ./app/build/outputs/apk/**/*.apk
+
+run: install open
+
+runRelease: installRelease openRelease
+
+open:
+	adb shell am start -n "de.markusressel.kodeeditor.debug/de.markusressel.kodeeditor.demo.ComposeMainActivity" -a android.intent.action.MAIN -c android.intent.category.LAUNCHER
+
+openRelease:
+	adb shell am start -n "de.markusressel.kodeeditor/de.markusressel.kodeeditor.demo.ComposeMainActivity" -a android.intent.action.MAIN -c android.intent.category.LAUNCHER
diff --git a/README.md b/README.md
index bc12c36..07213e0 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,10 @@
-# KodeEditor
+# KodeEditor  [![codebeat badge](https://codebeat.co/badges/f7fa8602-1d15-457e-904d-cb585e984952)](https://codebeat.co/projects/github-com-markusressel-kodeeditor-master)
 A simple code editor with syntax highlighting and pinch to zoom
 
 ![Editing](https://thumbs.gfycat.com/TalkativeGrandIchthyosaurs-size_restricted.gif)
 ![Scroll and zoom](https://thumbs.gfycat.com/BouncyLividBlackbear-size_restricted.gif)
 ![Minimap](https://thumbs.gfycat.com/VigorousDimFrog-size_restricted.gif)
 
-# Build Status
-
-| Master |
-|--------|
-| [![codebeat badge](https://codebeat.co/badges/f7fa8602-1d15-457e-904d-cb585e984952)](https://codebeat.co/projects/github-com-markusressel-kodeeditor-master) |
-
 # Features
 * [x] Pinch-To-Zoom
 * [x] Line numbers
diff --git a/app/build.gradle b/app/build.gradle
deleted file mode 100644
index 574053a..0000000
--- a/app/build.gradle
+++ /dev/null
@@ -1,66 +0,0 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-parcelize'
-
-android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
-
-    defaultConfig {
-        applicationId "de.markusressel.kodeeditor"
-        minSdkVersion rootProject.ext.minSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode rootProject.ext.versionCode
-        versionName rootProject.ext.versionName
-        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
-
-        setProperty("archivesBaseName", "KodeEditor_v${versionName}_(${versionCode})")
-
-        multiDexEnabled true
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-
-    buildFeatures {
-        viewBinding true
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    packagingOptions {
-        pickFirst 'META-INF/proguard/androidx-annotations.pro'
-        exclude 'LICENSE.txt'
-        exclude 'META-INF/DEPENDENCIES'
-        exclude 'META-INF/ASL2.0'
-        exclude 'META-INF/NOTICE'
-        exclude 'META-INF/LICENSE'
-    }
-}
-
-dependencies {
-    implementation project(':library')
-
-    // Syntax Highlighting
-    api("com.github.markusressel.KodeHighlighter:markdown:$kodeHighlighterVersion")
-
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-
-    implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'com.google.android.material:material:1.5.0'
-
-    def fuelVersion = "2.3.1"
-    implementation "com.github.kittinunf.fuel:fuel:$fuelVersion"
-    implementation "com.github.kittinunf.fuel:fuel-android:$fuelVersion"
-
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-}
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
new file mode 100644
index 0000000..8b0fd05
--- /dev/null
+++ b/app/build.gradle.kts
@@ -0,0 +1,46 @@
+plugins {
+    id("kodeeditor.android.application")
+    id("kodeeditor.android.application.compose")
+    id("kodeeditor.android.application.flavors")
+}
+
+android {
+    namespace = "de.markusressel.kodeeditor.demo"
+
+    defaultConfig {
+        applicationId = "de.markusressel.kodeeditor"
+        versionCode = 1
+        versionName = "4.0.1"
+
+        setProperty("archivesBaseName", "KodeEditor_v${versionName}_(${versionCode})")
+    }
+}
+
+dependencies {
+    implementation(project(":library"))
+
+    // Syntax Highlighting
+    implementation(libs.kodehighlighter.markdown)
+
+    implementation(libs.kotlin.stdlib.jdk8)
+
+    implementation(libs.androidx.appcompat)
+    implementation(libs.material)
+    implementation(libs.androidx.compose.ui)
+    implementation(libs.androidx.compose.material)
+    implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.activity.compose)
+
+    implementation(libs.fuel)
+    implementation(libs.fuel.android)
+
+    implementation(libs.kotlinx.coroutines.core)
+    implementation(libs.kotlinx.coroutines.android)
+
+    debugImplementation(libs.androidx.compose.ui.tooling)
+    implementation(libs.androidx.compose.ui.tooling.preview)
+
+    testImplementation(libs.junit4)
+    androidTestImplementation(libs.androidx.test.ext.junit)
+    androidTestImplementation(libs.androidx.test.espresso.core)
+}
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
deleted file mode 100644
index f1b4245..0000000
--- a/app/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f20dd8d..12106e0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.markusressel.kodeeditor">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
@@ -13,14 +12,19 @@
         android:theme="@style/AppTheme"
         android:windowSoftInputMode="adjustResize">
         <activity
-            android:name=".MainActivity"
-            android:exported="true">
+            android:name=".ComposeMainActivity"
+            android:exported="true"
+            android:theme="@style/AppTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+        <activity
+            android:name=".MainActivity"
+            android:exported="false" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/de/markusressel/kodeeditor/demo/ComposeMainActivity.kt b/app/src/main/java/de/markusressel/kodeeditor/demo/ComposeMainActivity.kt
new file mode 100644
index 0000000..b9c3108
--- /dev/null
+++ b/app/src/main/java/de/markusressel/kodeeditor/demo/ComposeMainActivity.kt
@@ -0,0 +1,139 @@
+package de.markusressel.kodeeditor.demo
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.annotation.RawRes
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.*
+import androidx.compose.material.Button
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.runtime.*
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import de.markusressel.kodeeditor.demo.ui.theme.KodeEditorTheme
+import de.markusressel.kodeeditor.library.compose.KodeEditor
+import de.markusressel.kodeeditor.library.compose.KodeEditorDefaults
+import de.markusressel.kodehighlighter.language.markdown.MarkdownRuleBook
+import de.markusressel.kodehighlighter.language.markdown.colorscheme.DarkBackgroundColorSchemeWithSpanStyle
+
+class ComposeMainActivity : ComponentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContent {
+            KodeEditorTheme {
+                var currentFontSize by remember {
+                    mutableStateOf(14)
+                }
+
+                Column(
+                    modifier = Modifier.background(MaterialTheme.colors.background),
+                ) {
+                    KodeEditorConfigurationMenu(
+                        currentFontSize = currentFontSize,
+                        onIncreaseFontSize = { currentFontSize++ },
+                        onDecreaseFontSize = { currentFontSize-- },
+                    )
+
+                    var text by rememberSaveable(stateSaver = TextFieldValue.Saver) {
+                        val initialText = readResourceFileAsText(R.raw.short_sample)
+//                        val initialText = readResourceFileAsText(R.raw.sample_text)
+                        mutableStateOf(TextFieldValue(initialText))
+                    }
+
+                    KodeEditor(
+                        modifier = Modifier
+                            .fillMaxSize()
+                            .border(BorderStroke(1.dp, MaterialTheme.colors.primary)),
+                        languageRuleBook = MarkdownRuleBook(),
+                        colorScheme = DarkBackgroundColorSchemeWithSpanStyle(),
+                        text = text,
+                        onValueChange = { text = it },
+                        textStyle = TextStyle(fontSize = currentFontSize.sp).copy(
+                            color = MaterialTheme.colors.onSurface,
+                        ),
+                        colors = KodeEditorDefaults.editorColors()
+                    )
+                }
+            }
+        }
+    }
+
+    @Composable
+    private fun KodeEditorConfigurationMenu(
+        currentFontSize: Int,
+        onIncreaseFontSize: () -> Unit,
+        onDecreaseFontSize: () -> Unit,
+    ) {
+        Column(
+            modifier = Modifier.padding(4.dp),
+            verticalArrangement = Arrangement.spacedBy(4.dp)
+        ) {
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+            ) {
+                Text(
+                    modifier = Modifier.weight(1f),
+                    text = "Font Size: $currentFontSize",
+                    color = MaterialTheme.colors.onSurface,
+                )
+
+                Button(onClick = onIncreaseFontSize) {
+                    Text(
+                        text = "+",
+                        color = MaterialTheme.colors.onPrimary,
+                    )
+                }
+
+                Spacer(modifier = Modifier.size(4.dp))
+
+                Button(onClick = onDecreaseFontSize) {
+                    Text(
+                        text = "-",
+                        color = MaterialTheme.colors.onPrimary,
+                    )
+                }
+            }
+        }
+    }
+
+    private fun readResourceFileAsText(@RawRes resourceId: Int) =
+        resources.openRawResource(resourceId).bufferedReader().readText()
+
+}
+
+
+@Preview(showBackground = true)
+@Composable
+private fun DefaultPreview() {
+    KodeEditorTheme {
+        var text by rememberSaveable(stateSaver = TextFieldValue.Saver) {
+            val initialText = """
+                # Heading
+                    
+                Heading Test
+                    
+                ## Subheading
+                    
+                Subheading Text
+                """.trimIndent()
+            mutableStateOf(TextFieldValue(initialText))
+        }
+
+        KodeEditor(
+            languageRuleBook = MarkdownRuleBook(),
+            colorScheme = DarkBackgroundColorSchemeWithSpanStyle(),
+            text = text,
+            onValueChange = { text = it }
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/de/markusressel/kodeeditor/MainActivity.kt b/app/src/main/java/de/markusressel/kodeeditor/demo/MainActivity.kt
similarity index 89%
rename from app/src/main/java/de/markusressel/kodeeditor/MainActivity.kt
rename to app/src/main/java/de/markusressel/kodeeditor/demo/MainActivity.kt
index c09e580..8321229 100644
--- a/app/src/main/java/de/markusressel/kodeeditor/MainActivity.kt
+++ b/app/src/main/java/de/markusressel/kodeeditor/demo/MainActivity.kt
@@ -1,4 +1,4 @@
-package de.markusressel.kodeeditor
+package de.markusressel.kodeeditor.demo
 
 import android.graphics.Color
 import android.os.Bundle
@@ -6,9 +6,10 @@ import android.view.Gravity
 import androidx.annotation.RawRes
 import androidx.appcompat.app.AppCompatActivity
 import com.github.kittinunf.fuel.Fuel
-import de.markusressel.kodeeditor.databinding.ActivityMainBinding
+import de.markusressel.kodeeditor.demo.databinding.ActivityMainBinding
 import de.markusressel.kodeeditor.library.extensions.dpToPx
 import de.markusressel.kodehighlighter.language.markdown.MarkdownRuleBook
+import de.markusressel.kodehighlighter.language.markdown.colorscheme.DarkBackgroundColorScheme
 
 class MainActivity : AppCompatActivity() {
 
@@ -22,6 +23,7 @@ class MainActivity : AppCompatActivity() {
 
         binding.codeEditorLayout.apply {
             languageRuleBook = MarkdownRuleBook()
+            colorScheme = DarkBackgroundColorScheme()
             lineNumberGenerator = { lines ->
                 (1..lines).map { " $it " }
             }
diff --git a/app/src/main/java/de/markusressel/kodeeditor/demo/ui/theme/Color.kt b/app/src/main/java/de/markusressel/kodeeditor/demo/ui/theme/Color.kt
new file mode 100644
index 0000000..fb44652
--- /dev/null
+++ b/app/src/main/java/de/markusressel/kodeeditor/demo/ui/theme/Color.kt
@@ -0,0 +1,8 @@
+package de.markusressel.kodeeditor.demo.ui.theme
+
+import androidx.compose.ui.graphics.Color
+
+val Purple200 = Color(0xFFBB86FC)
+val Purple500 = Color(0xFF6200EE)
+val Purple700 = Color(0xFF3700B3)
+val Teal200 = Color(0xFF03DAC5)
\ No newline at end of file
diff --git a/app/src/main/java/de/markusressel/kodeeditor/demo/ui/theme/Shape.kt b/app/src/main/java/de/markusressel/kodeeditor/demo/ui/theme/Shape.kt
new file mode 100644
index 0000000..90768f9
--- /dev/null
+++ b/app/src/main/java/de/markusressel/kodeeditor/demo/ui/theme/Shape.kt
@@ -0,0 +1,11 @@
+package de.markusressel.kodeeditor.demo.ui.theme
+
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.Shapes
+import androidx.compose.ui.unit.dp
+
+val Shapes = Shapes(
+        small = RoundedCornerShape(4.dp),
+        medium = RoundedCornerShape(4.dp),
+        large = RoundedCornerShape(0.dp)
+)
\ No newline at end of file
diff --git a/app/src/main/java/de/markusressel/kodeeditor/demo/ui/theme/Theme.kt b/app/src/main/java/de/markusressel/kodeeditor/demo/ui/theme/Theme.kt
new file mode 100644
index 0000000..5d1c9ce
--- /dev/null
+++ b/app/src/main/java/de/markusressel/kodeeditor/demo/ui/theme/Theme.kt
@@ -0,0 +1,44 @@
+package de.markusressel.kodeeditor.demo.ui.theme
+
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.darkColors
+import androidx.compose.material.lightColors
+import androidx.compose.runtime.Composable
+
+private val DarkColorPalette = darkColors(
+        primary = Purple200,
+        primaryVariant = Purple700,
+        secondary = Teal200
+)
+
+private val LightColorPalette = lightColors(
+        primary = Purple500,
+        primaryVariant = Purple700,
+        secondary = Teal200
+
+        /* Other default colors to override
+    background = Color.White,
+    surface = Color.White,
+    onPrimary = Color.White,
+    onSecondary = Color.Black,
+    onBackground = Color.Black,
+    onSurface = Color.Black,
+    */
+)
+
+@Composable
+fun KodeEditorTheme(darkTheme: Boolean = isSystemInDarkTheme(), content: @Composable () -> Unit) {
+    val colors = if (darkTheme) {
+        DarkColorPalette
+    } else {
+        LightColorPalette
+    }
+
+    MaterialTheme(
+            colors = colors,
+            typography = Typography,
+            shapes = Shapes,
+            content = content
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/java/de/markusressel/kodeeditor/demo/ui/theme/Type.kt b/app/src/main/java/de/markusressel/kodeeditor/demo/ui/theme/Type.kt
new file mode 100644
index 0000000..8a9dddd
--- /dev/null
+++ b/app/src/main/java/de/markusressel/kodeeditor/demo/ui/theme/Type.kt
@@ -0,0 +1,28 @@
+package de.markusressel.kodeeditor.demo.ui.theme
+
+import androidx.compose.material.Typography
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.sp
+
+// Set of Material typography styles to start with
+val Typography = Typography(
+        body1 = TextStyle(
+                fontFamily = FontFamily.Default,
+                fontWeight = FontWeight.Normal,
+                fontSize = 16.sp
+        )
+        /* Other default text styles to override
+    button = TextStyle(
+        fontFamily = FontFamily.Default,
+        fontWeight = FontWeight.W500,
+        fontSize = 14.sp
+    ),
+    caption = TextStyle(
+        fontFamily = FontFamily.Default,
+        fontWeight = FontWeight.Normal,
+        fontSize = 12.sp
+    )
+    */
+)
\ No newline at end of file
diff --git a/app/src/main/res/raw/short_sample b/app/src/main/res/raw/short_sample
new file mode 100644
index 0000000..c605b18
--- /dev/null
+++ b/app/src/main/res/raw/short_sample
@@ -0,0 +1,2 @@
+# KodeEditor
+A simple code editor with syntax highlighting and pinch to zoom
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
new file mode 100644
index 0000000..78554f9
--- /dev/null
+++ b/app/src/main/res/values/themes.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+
+</resources>
\ No newline at end of file
diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts
new file mode 100644
index 0000000..36efc20
--- /dev/null
+++ b/build-logic/convention/build.gradle.kts
@@ -0,0 +1,60 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+plugins {
+    `kotlin-dsl`
+}
+
+group = "de.markusressel.kodeeditor.buildlogic"
+version = "0.1.0"
+
+java {
+    // Up to Java 11 APIs are available through desugaring
+    // https://developer.android.com/studio/write/java11-minimal-support-table
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
+
+tasks.withType<KotlinCompile>().configureEach {
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_17.toString()
+    }
+}
+
+dependencies {
+    compileOnly(libs.android.gradle.plugin)
+    compileOnly(libs.kotlin.gradle.plugin)
+    compileOnly(libs.ksp.gradle.plugin)
+}
+
+gradlePlugin {
+    plugins {
+        register("androidApplicationCompose") {
+            id = "kodeeditor.android.application.compose"
+            implementationClass = "AndroidApplicationComposeConventionPlugin"
+        }
+        register("androidApplication") {
+            id = "kodeeditor.android.application"
+            implementationClass = "AndroidApplicationConventionPlugin"
+        }
+        register("androidLibraryCompose") {
+            id = "kodeeditor.android.library.compose"
+            implementationClass = "AndroidLibraryComposeConventionPlugin"
+        }
+        register("androidLibrary") {
+            id = "kodeeditor.android.library"
+            implementationClass = "AndroidLibraryConventionPlugin"
+        }
+        register("androidLibraryPublishing") {
+            id = "kodeeditor.android.library.publishing"
+            implementationClass = "AndroidLibraryPublishingConventionPlugin"
+        }
+        register("androidTest") {
+            id = "kodeeditor.android.test"
+            implementationClass = "AndroidTestConventionPlugin"
+        }
+        register("androidFlavors") {
+            id = "kodeeditor.android.application.flavors"
+            implementationClass = "AndroidApplicationFlavorsConventionPlugin"
+        }
+    }
+}
diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt
new file mode 100644
index 0000000..13856db
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt
@@ -0,0 +1,16 @@
+import com.android.build.api.dsl.ApplicationExtension
+import de.markusressel.kodeeditor.configureAndroidCompose
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.getByType
+
+class AndroidApplicationComposeConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            pluginManager.apply("com.android.application")
+            val extension = extensions.getByType<ApplicationExtension>()
+            configureAndroidCompose(extension)
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
new file mode 100644
index 0000000..c8e5c75
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
@@ -0,0 +1,52 @@
+import com.android.build.api.dsl.ApplicationExtension
+import com.android.build.api.variant.ApplicationAndroidComponentsExtension
+import de.markusressel.kodeeditor.TARGET_SDK
+import de.markusressel.kodeeditor.configureKotlinAndroid
+import de.markusressel.kodeeditor.configureKotlinAndroidToolchain
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.configure
+
+class AndroidApplicationConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            with(pluginManager) {
+                apply("com.android.application")
+                apply("org.jetbrains.kotlin.android")
+                apply("org.jetbrains.kotlin.plugin.parcelize")
+            }
+
+            group = "de.markusressel.kodeeditor.demo"
+
+            configureKotlinAndroidToolchain()
+            extensions.configure<ApplicationExtension> {
+                configureKotlinAndroid(this)
+
+                defaultConfig {
+                    targetSdk = TARGET_SDK
+                    testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+                }
+
+                dataBinding {
+                    enable = true
+                }
+                viewBinding {
+                    enable = true
+                }
+
+                packaging {
+                    resources {
+                        excludes.add("/META-INF/{AL2.0,LGPL2.1}")
+                        excludes.addAll(
+                            listOf("LICENSE.txt", "META-INF/DEPENDENCIES", "META-INF/ASL2.0", "META-INF/NOTICE", "META-INF/LICENSE")
+                        )
+                        pickFirsts.add("META-INF/proguard/androidx-annotations.pro")
+                    }
+                }
+            }
+            extensions.configure<ApplicationAndroidComponentsExtension> {
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationFlavorsConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationFlavorsConventionPlugin.kt
new file mode 100644
index 0000000..74bc7c9
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/AndroidApplicationFlavorsConventionPlugin.kt
@@ -0,0 +1,13 @@
+import com.android.build.api.dsl.ApplicationExtension
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.configure
+
+class AndroidApplicationFlavorsConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            extensions.configure<ApplicationExtension> {
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt
new file mode 100644
index 0000000..1b242c4
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt
@@ -0,0 +1,16 @@
+import com.android.build.gradle.LibraryExtension
+import de.markusressel.kodeeditor.configureAndroidCompose
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.getByType
+
+class AndroidLibraryComposeConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            pluginManager.apply("com.android.library")
+            val extension = extensions.getByType<LibraryExtension>()
+            configureAndroidCompose(extension)
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
new file mode 100644
index 0000000..840d065
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
@@ -0,0 +1,53 @@
+import com.android.build.api.variant.LibraryAndroidComponentsExtension
+import com.android.build.gradle.LibraryExtension
+import de.markusressel.kodeeditor.TARGET_SDK
+import de.markusressel.kodeeditor.configureKotlinAndroid
+import de.markusressel.kodeeditor.configureKotlinAndroidToolchain
+import de.markusressel.kodeeditor.disableUnnecessaryAndroidTests
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.artifacts.VersionCatalogsExtension
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.getByType
+import org.gradle.kotlin.dsl.kotlin
+
+class AndroidLibraryConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            with(pluginManager) {
+                apply("com.android.library")
+                apply("org.jetbrains.kotlin.android")
+            }
+
+            group = "de.markusressel.kodeeditor.library"
+
+            configureKotlinAndroidToolchain()
+            extensions.configure<LibraryExtension> {
+                configureKotlinAndroid(this)
+                defaultConfig.targetSdk = TARGET_SDK
+            }
+            extensions.configure<LibraryAndroidComponentsExtension> {
+                disableUnnecessaryAndroidTests(target)
+            }
+            val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
+            configurations.configureEach {
+                resolutionStrategy {
+                    // TODO:
+                    //cacheChangingModulesFor(0, 'seconds')
+
+                    force(libs.findLibrary("kotlin-stdlib").get())
+                    force(libs.findLibrary("kotlin-stdlib-jdk8").get())
+
+                    force(libs.findLibrary("junit4").get())
+                    // Temporary workaround for https://issuetracker.google.com/174733673
+                    force("org.objenesis:objenesis:2.6")
+                }
+            }
+            dependencies {
+                add("androidTestImplementation", kotlin("test"))
+                add("testImplementation", kotlin("test"))
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryPublishingConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryPublishingConventionPlugin.kt
new file mode 100644
index 0000000..7ca1926
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/AndroidLibraryPublishingConventionPlugin.kt
@@ -0,0 +1,42 @@
+import com.android.build.gradle.LibraryExtension
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.publish.PublishingExtension
+import org.gradle.api.publish.maven.MavenPublication
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.create
+
+class AndroidLibraryPublishingConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            extensions.configure<LibraryExtension> {
+                with(pluginManager) {
+                    apply("maven-publish")
+                }
+                publishing {
+                    singleVariant("release") {
+                        group = "com.github.markusressel.KodeEditor"
+                        withJavadocJar()
+                        withSourcesJar()
+                    }
+                }
+                configure<PublishingExtension> {
+                    publications {
+                        create("maven", MavenPublication::class) {
+                            groupId = "com.github.markusressel"
+                            artifactId = "KodeEditor"
+                            version = "${target.version}"
+
+                            artifact("${layout.buildDirectory.get().asFile}/outputs/aar/${target.name}-release.aar") {
+                                builtBy(tasks.getByName("assemble"))
+                            }
+                        }
+                    }
+                    repositories {
+                        mavenLocal()
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/AndroidTestConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidTestConventionPlugin.kt
new file mode 100644
index 0000000..ede625f
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/AndroidTestConventionPlugin.kt
@@ -0,0 +1,23 @@
+import com.android.build.gradle.TestExtension
+import de.markusressel.kodeeditor.TARGET_SDK
+import de.markusressel.kodeeditor.configureKotlinAndroid
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.configure
+
+class AndroidTestConventionPlugin : Plugin<Project> {
+    override fun apply(target: Project) {
+        with(target) {
+            with(pluginManager) {
+                apply("com.android.test")
+                apply("org.jetbrains.kotlin.android")
+            }
+
+            extensions.configure<TestExtension> {
+                configureKotlinAndroid(this)
+                defaultConfig.targetSdk = TARGET_SDK
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/kotlin/de/markusressel/kodeeditor/AndroidCompose.kt b/build-logic/convention/src/main/kotlin/de/markusressel/kodeeditor/AndroidCompose.kt
new file mode 100644
index 0000000..4e3aa5a
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/de/markusressel/kodeeditor/AndroidCompose.kt
@@ -0,0 +1,62 @@
+package de.markusressel.kodeeditor
+
+import com.android.build.api.dsl.CommonExtension
+import org.gradle.api.Project
+import org.gradle.api.artifacts.VersionCatalogsExtension
+import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.getByType
+import org.gradle.kotlin.dsl.withType
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import java.io.File
+
+/**
+ * Configure Compose-specific options
+ */
+internal fun Project.configureAndroidCompose(
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
+) {
+    val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
+    pluginManager.apply("org.jetbrains.kotlin.plugin.compose")
+
+    commonExtension.apply {
+        buildFeatures {
+            compose = true
+        }
+
+        dependencies {
+            val bom = libs.findLibrary("androidx-compose-bom").get()
+            add("implementation", platform(bom))
+            add("androidTestImplementation", platform(bom))
+        }
+    }
+
+    tasks.withType<KotlinCompile>().configureEach {
+        kotlinOptions {
+            freeCompilerArgs = freeCompilerArgs + buildComposeMetricsParameters()
+        }
+    }
+}
+
+private fun Project.buildComposeMetricsParameters(): List<String> {
+    val metricParameters = mutableListOf<String>()
+    val enableMetricsProvider = project.providers.gradleProperty("enableComposeCompilerMetrics")
+    val enableMetrics = (enableMetricsProvider.orNull == "true")
+    if (enableMetrics) {
+        val metricsFolder = File(project.layout.buildDirectory.get().asFile, "compose-metrics")
+        metricParameters.add("-P")
+        metricParameters.add(
+            "plugin:androidx.compose.compiler.plugins.kotlin:metricsDestination=" + metricsFolder.absolutePath
+        )
+    }
+
+    val enableReportsProvider = project.providers.gradleProperty("enableComposeCompilerReports")
+    val enableReports = (enableReportsProvider.orNull == "true")
+    if (enableReports) {
+        val reportsFolder = File(project.layout.buildDirectory.get().asFile, "compose-reports")
+        metricParameters.add("-P")
+        metricParameters.add(
+            "plugin:androidx.compose.compiler.plugins.kotlin:reportsDestination=" + reportsFolder.absolutePath
+        )
+    }
+    return metricParameters.toList()
+}
diff --git a/build-logic/convention/src/main/kotlin/de/markusressel/kodeeditor/AndroidInstrumentedTests.kt b/build-logic/convention/src/main/kotlin/de/markusressel/kodeeditor/AndroidInstrumentedTests.kt
new file mode 100644
index 0000000..9bf14be
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/de/markusressel/kodeeditor/AndroidInstrumentedTests.kt
@@ -0,0 +1,19 @@
+package de.markusressel.kodeeditor
+
+import com.android.build.api.variant.LibraryAndroidComponentsExtension
+import org.gradle.api.Project
+
+/**
+ * Disable unnecessary Android instrumented tests for the [project] if there is no `androidTest` folder.
+ * Otherwise, these projects would be compiled, packaged, installed and ran only to end-up with the following message:
+ *
+ * > Starting 0 tests on AVD
+ *
+ * Note: this could be improved by checking other potential sourceSets based on buildTypes and flavors.
+ */
+internal fun LibraryAndroidComponentsExtension.disableUnnecessaryAndroidTests(
+    project: Project,
+) = beforeVariants {
+    it.enableAndroidTest = it.enableAndroidTest
+        && project.projectDir.resolve("src/androidTest").exists()
+}
diff --git a/build-logic/convention/src/main/kotlin/de/markusressel/kodeeditor/KotlinAndroid.kt b/build-logic/convention/src/main/kotlin/de/markusressel/kodeeditor/KotlinAndroid.kt
new file mode 100644
index 0000000..ba21968
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/de/markusressel/kodeeditor/KotlinAndroid.kt
@@ -0,0 +1,74 @@
+package de.markusressel.kodeeditor
+
+import com.android.build.api.dsl.CommonExtension
+import org.gradle.api.JavaVersion
+import org.gradle.api.Project
+import org.gradle.api.artifacts.VersionCatalogsExtension
+import org.gradle.api.plugins.ExtensionAware
+import org.gradle.kotlin.dsl.*
+import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
+import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+const val COMPILE_SDK = 34
+const val TARGET_SDK = 34
+
+/**
+ * Configure base Kotlin with Android options
+ */
+internal fun Project.configureKotlinAndroid(
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
+) {
+    commonExtension.apply {
+        compileSdk = COMPILE_SDK
+
+        defaultConfig {
+            minSdk = 21
+        }
+
+        compileOptions {
+            // Up to Java 11 APIs are available through desugaring
+            // https://developer.android.com/studio/write/java11-minimal-support-table
+            sourceCompatibility = JavaVersion.VERSION_17
+            targetCompatibility = JavaVersion.VERSION_17
+            isCoreLibraryDesugaringEnabled = true
+        }
+    }
+
+    // Use withType to workaround https://youtrack.jetbrains.com/issue/KT-55947
+    tasks.withType<KotlinCompile>().configureEach {
+        kotlinOptions {
+            // Set JVM target to 11
+            jvmTarget = JavaVersion.VERSION_17.toString()
+            // Treat all Kotlin warnings as errors (disabled by default)
+            // Override by setting warningsAsErrors=true in your ~/.gradle/gradle.properties
+            val warningsAsErrors: String? by project
+            allWarningsAsErrors = warningsAsErrors.toBoolean()
+            freeCompilerArgs = freeCompilerArgs + listOf(
+                "-opt-in=kotlin.RequiresOptIn",
+                // Enable experimental coroutines APIs, including Flow
+                "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
+                "-opt-in=kotlinx.coroutines.FlowPreview",
+            )
+        }
+    }
+
+    val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
+
+    dependencies {
+        add("coreLibraryDesugaring", libs.findLibrary("android.desugarJdkLibs").get())
+    }
+}
+
+fun CommonExtension<*, *, *, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {
+    (this as ExtensionAware).extensions.configure("kotlinOptions", block)
+}
+
+/**
+ * Configure Kotlin's jvm toolchain for Android projects
+ */
+internal fun Project.configureKotlinAndroidToolchain() {
+    extensions.configure<KotlinAndroidProjectExtension> {
+        jvmToolchain(17)
+    }
+}
diff --git a/build-logic/gradle.properties b/build-logic/gradle.properties
new file mode 100644
index 0000000..1c9073e
--- /dev/null
+++ b/build-logic/gradle.properties
@@ -0,0 +1,4 @@
+# Gradle properties are not passed to included builds https://github.com/gradle/gradle/issues/2534
+org.gradle.parallel=true
+org.gradle.caching=true
+org.gradle.configureondemand=true
diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts
new file mode 100644
index 0000000..2907fbf
--- /dev/null
+++ b/build-logic/settings.gradle.kts
@@ -0,0 +1,14 @@
+dependencyResolutionManagement {
+    repositories {
+        google()
+        mavenCentral()
+    }
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}
+
+rootProject.name = "build-logic"
+include(":convention")
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index b68f2b6..0000000
--- a/build.gradle
+++ /dev/null
@@ -1,66 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
-buildscript {
-    ext.kotlin_version = '1.8.21'
-    ext.dokka_version = '1.6.10'
-
-    ext {
-        group = 'com.github.markusressel'
-
-        gradle_plugin_version = '7.0.4'
-
-        minSdkVersion = 19
-        versionName = "4.0.1"
-        versionCode = 1
-
-        compileSdkVersion = 31
-        targetSdkVersion = 31
-        buildToolsVersion = "30.0.3"
-
-        // DEPENDENCIES
-
-        kodeHighlighterVersion = "v3.0.0"
-//        kodeHighlighterVersion = "master-SNAPSHOT"
-
-        javaxAnnotationVersion = "10.0-b28"
-        aboutlibrariesVersion = "8.2.0"
-
-        flowBindingVersion = "1.2.0"
-
-        timberKtVersion = "1.5.1"
-    }
-
-    repositories {
-        google()
-        jcenter()
-    }
-
-    dependencies {
-        classpath "com.android.tools.build:gradle:$gradle_plugin_version"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath("org.jetbrains.dokka:dokka-gradle-plugin:${dokka_version}")
-    }
-}
-
-allprojects {
-    configurations.all() {
-        resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
-
-        resolutionStrategy.force "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-        resolutionStrategy.force "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    }
-}
-
-apply plugin: 'kotlin'
-
-compileKotlin {
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-}
-compileTestKotlin {
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-}
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 0000000..0abaa27
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,15 @@
+buildscript {
+    repositories {
+        google()
+        mavenCentral()
+        maven(url = "https://jitpack.io")
+    }
+}
+
+plugins {
+    alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.compose.compiler) apply false
+    alias(libs.plugins.kotlin.jvm) apply false
+    alias(libs.plugins.kotlin.serialization) apply false
+    alias(libs.plugins.ksp) apply false
+}
diff --git a/gradle.properties b/gradle.properties
index dc251f5..336247a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,4 +12,6 @@ org.gradle.jvmargs=-Xmx1536m
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 android.useAndroidX=true
-android.enableJetifier=true
\ No newline at end of file
+android.enableJetifier=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 0000000..c740164
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,78 @@
+[versions]
+activityCompose = "1.9.0"
+androidDesugarJdkLibs = "2.0.4"
+androidGradlePlugin = "8.3.2"
+androidxAnnotation = "1.8.0"
+androidxAppCompat = "1.7.0"
+androidxComposeBom = "2024.06.00"
+androidxComposeUi = "1.6.8"
+androidxComposeUiText = "1.6.8"
+androidxLifecycle = "2.8.3"
+androidxTestExtJunit = "1.2.1"
+androidxTestEspressoCore = "3.6.1"
+dokkaGradlePlugin = "1.7.20"
+fuel = "2.3.1"
+flowbindingAndroid = "1.2.0"
+junit4 = "4.13.2"
+kotlin = "2.0.0"
+kotlinCoroutinesCore = "1.8.0"
+kotlinCoroutinesAndroid = "1.8.0"
+kodehighlighter = "4.0.3"
+ksp = "2.0.0-1.0.22"
+material = "1.12.0"
+zoomlayout = "1.9.0"
+
+
+[libraries]
+android-desugarJdkLibs = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref = "androidDesugarJdkLibs" }
+android-gradle-plugin = { group = "com.android.tools.build", name = "gradle", version.ref = "androidGradlePlugin" }
+
+androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" }
+androidx-annotation = { group = "androidx.annotation", name = "annotation", version.ref = "androidxAnnotation" }
+
+androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidxAppCompat" }
+
+androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "androidxComposeBom" }
+androidx-compose-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "androidxComposeUi" }
+androidx-compose-ui-text = { group = "androidx.compose.ui", name = "ui-text", version.ref = "androidxComposeUiText" }
+androidx-compose-material = { group = "androidx.compose.material", name = "material", version.ref = "androidxComposeUiText" }
+androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
+androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
+
+androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "androidxLifecycle" }
+
+dokka-gradle-plugin = { group = "org.jetbrains.dokka", name = "dokka-gradle-plugin", version.ref = "dokkaGradlePlugin" }
+
+fuel = { group = "com.github.kittinunf.fuel", name = "fuel", version.ref = "fuel" }
+fuel-android = { group = "com.github.kittinunf.fuel", name = "fuel-android", version.ref = "fuel" }
+
+flowbinding-android = { group = "io.github.reactivecircus.flowbinding", name = "flowbinding-android", version.ref = "flowbindingAndroid" }
+
+kotlin-gradle-plugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
+kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" }
+kotlin-stdlib-jdk8 = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-jdk8", version.ref = "kotlin" }
+kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinCoroutinesCore" }
+kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "kotlinCoroutinesAndroid" }
+
+ksp-gradle-plugin = { group = "com.google.devtools.ksp", name = "com.google.devtools.ksp.gradle.plugin", version.ref = "ksp" }
+
+kodehighlighter-core = { group = "com.github.markusressel.KodeHighlighter", name = "core", version.ref = "kodehighlighter" }
+kodehighlighter-markdown = { group = "com.github.markusressel.KodeHighlighter", name = "markdown", version.ref = "kodehighlighter" }
+
+material = { module = "com.google.android.material:material", version.ref = "material" }
+zoomlayout = { group = "com.otaliastudios", name = "zoomlayout", version.ref = "zoomlayout" }
+
+junit4 = { group = "junit", name = "junit", version.ref = "junit4" }
+androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidxTestExtJunit" }
+androidx-test-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "androidxTestEspressoCore" }
+
+[plugins]
+android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
+android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" }
+android-test = { id = "com.android.test", version.ref = "androidGradlePlugin" }
+kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
+kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
+ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
+
+org-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 49ca654..5eb588b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
diff --git a/library/build.gradle b/library/build.gradle
deleted file mode 100644
index b3b065c..0000000
--- a/library/build.gradle
+++ /dev/null
@@ -1,83 +0,0 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'org.jetbrains.dokka'
-
-group = rootProject.ext.group
-
-android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
-
-    defaultConfig {
-        minSdkVersion rootProject.ext.minSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
-        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-}
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-//    api 'org.jetbrains.kotlinx:kotlinx-coroutines-android:0.25.0'
-
-    implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'androidx.annotation:annotation:1.3.0'
-
-    // RxFlow
-    implementation "io.github.reactivecircus.flowbinding:flowbinding-android:$flowBindingVersion"
-
-    // Lifecycle
-    def lifecycle_version = "2.4.1"
-    implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
-
-    // Syntax Highlighting
-    api("com.github.markusressel.KodeHighlighter:core:$kodeHighlighterVersion")
-
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2"
-
-    // Zoom Layout Container
-    api 'com.otaliastudios:zoomlayout:1.9.0'
-
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-}
-
-configurations.all {
-    resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
-}
-
-// build a jar with source files
-task sourcesJar(type: Jar) {
-    from android.sourceSets.main.java.srcDirs
-    classifier = 'sources'
-}
-
-task dokkaJar(type: Jar, dependsOn: dokkaHtml) {
-    classifier = 'javadoc'
-    from dokkaHtml.outputDirectory
-}
-
-dokkaHtml.configure {
-    dokkaSourceSets {
-        named("main") {
-            noAndroidSdkLink.set(false)
-        }
-    }
-}
-
-artifacts {
-    archives sourcesJar
-    archives dokkaJar
-}
diff --git a/library/build.gradle.kts b/library/build.gradle.kts
new file mode 100644
index 0000000..57faea3
--- /dev/null
+++ b/library/build.gradle.kts
@@ -0,0 +1,42 @@
+plugins {
+    id("kodeeditor.android.library")
+    id("kodeeditor.android.library.compose")
+    id("kodeeditor.android.library.publishing")
+}
+
+android {
+    namespace = "de.markusressel.kodeeditor.library"
+}
+
+dependencies {
+    implementation(libs.kotlin.stdlib.jdk8)
+//    api 'org.jetbrains.kotlinx:kotlinx-coroutines-android:0.25.0'
+
+    implementation(libs.androidx.appcompat)
+    implementation(libs.androidx.annotation)
+
+    implementation(libs.androidx.compose.ui)
+    implementation(libs.androidx.compose.material)
+
+    debugImplementation(libs.androidx.compose.ui.tooling)
+    implementation(libs.androidx.compose.ui.tooling.preview)
+
+    // RxFlow
+    implementation(libs.flowbinding.android)
+
+    // Lifecycle
+    implementation(libs.androidx.lifecycle.runtime.ktx)
+
+    // Syntax Highlighting
+    api(libs.kodehighlighter.core)
+
+    implementation(libs.kotlinx.coroutines.core)
+    implementation(libs.kotlinx.coroutines.android)
+
+    // Zoom Layout Container
+    api(libs.zoomlayout)
+
+    testImplementation(libs.junit4)
+    androidTestImplementation(libs.androidx.test.ext.junit)
+    androidTestImplementation(libs.androidx.test.espresso.core)
+}
diff --git a/library/proguard-rules.pro b/library/proguard-rules.pro
deleted file mode 100644
index f1b4245..0000000
--- a/library/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
index 692fb76..cc947c5 100644
--- a/library/src/main/AndroidManifest.xml
+++ b/library/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="de.markusressel.kodeeditor.library" />
+<manifest />
diff --git a/library/src/main/java/de/markusressel/kodeeditor/library/compose/KodeEditor.kt b/library/src/main/java/de/markusressel/kodeeditor/library/compose/KodeEditor.kt
new file mode 100644
index 0000000..bfb7cf8
--- /dev/null
+++ b/library/src/main/java/de/markusressel/kodeeditor/library/compose/KodeEditor.kt
@@ -0,0 +1,211 @@
+package de.markusressel.kodeeditor.library.compose
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.wrapContentSize
+import androidx.compose.material.LocalTextStyle
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clipToBounds
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.TransformOrigin
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.zIndex
+import de.markusressel.kodehighlighter.core.LanguageRuleBook
+import de.markusressel.kodehighlighter.core.StyleFactory
+import de.markusressel.kodehighlighter.core.colorscheme.ColorScheme
+import de.markusressel.kodehighlighter.core.rule.LanguageRule
+import de.markusressel.kodehighlighter.core.rule.RuleHelper
+import de.markusressel.kodehighlighter.core.rule.RuleMatch
+import de.markusressel.kodehighlighter.core.ui.KodeTextField
+
+/**
+ * Compose version of the KodeEditorLayout
+ *
+ * @param modifier compose modifiers
+ * @param text the current text of the editor
+ * @param languageRuleBook the language rule book to use for highlighting
+ * @param colorScheme the color scheme to apply
+ * @param onValueChange callback for changes to the text and/or cursor selection
+ * @param colors the color scheme to use for highlighting
+ * @param textStyle the text style used for the editor text
+ * @param enabled whether the editor is enabled
+ * @param readOnly whether the contents of the editor can be changed by the user
+ */
+@Composable
+fun KodeEditor(
+    modifier: Modifier = Modifier,
+    text: TextFieldValue,
+    languageRuleBook: LanguageRuleBook,
+    colorScheme: ColorScheme<SpanStyle>,
+    onValueChange: (TextFieldValue) -> Unit,
+    colors: KodeEditorColors = KodeEditorDefaults.editorColors(),
+    textStyle: TextStyle = LocalTextStyle.current,
+    enabled: Boolean = true,
+    readOnly: Boolean = enabled.not(),
+) {
+    var offset by remember { mutableStateOf(Offset.Zero) }
+    var zoom by remember { mutableStateOf(1f) }
+
+    Box(modifier = Modifier
+        .clipToBounds()
+        .then(modifier)
+    ) {
+        var lineNumberWidth by remember {
+            mutableStateOf(0)
+        }
+        LineNumbers(
+            modifier = Modifier
+                .zIndex(1f)
+                .wrapContentSize(
+                    align = Alignment.TopStart,
+                    unbounded = true
+                )
+                .onGloballyPositioned {
+                    lineNumberWidth = it.size.width
+                }
+                .graphicsLayer(
+                    transformOrigin = TransformOrigin(0f, 0f),
+                    scaleX = zoom, scaleY = zoom,
+                    translationX = 0f,
+                    translationY = -offset.y * zoom,
+                ),
+            text = text.text,
+            textStyle = textStyle,
+            textColor = colors.lineNumberTextColor().value,
+            backgroundColor = colors.lineNumberBackgroundColor().value,
+        )
+
+        val computedPadding = LocalDensity.current.run {
+            (lineNumberWidth).coerceAtLeast(0).toDp()
+        }
+
+        // Text Editor
+        ZoomLayout(
+            modifier = Modifier
+                .zIndex(0f)
+                .padding(
+                    start = computedPadding,
+                )
+                .matchParentSize(),
+            offset = offset,
+            zoom = zoom,
+            onOffsetChanged = {
+//                val newOffset = Offset(
+//                    x = (offset + it).x.coerceIn(0f, (size.width.toFloat() - (configuration.screenWidthDp.dp.toPx() / newScale)).coerceAtLeast(0f)),
+//                    y = (offset + it).y.coerceIn(0f, (size.height.toFloat() - (configuration.screenHeightDp.dp.toPx() / newScale)).coerceAtLeast(0f)),
+//                )
+
+                val newOffset = offset + (it / zoom)
+                offset = newOffset.copy(
+                    x = newOffset.x.coerceAtLeast(0f),
+                    y = newOffset.y.coerceAtLeast(0f)
+                )
+            },
+            onZoomChanged = {
+                zoom *= it
+            },
+        ) {
+            KodeTextField(
+                modifier = Modifier
+                    .align(Alignment.TopStart)
+                    .wrapContentSize(
+                        align = Alignment.TopStart,
+                        unbounded = true
+                    )
+                    .matchParentSize()
+                    .background(colors.textFieldBackgroundColor().value)
+                    .padding(
+                        start = 4.dp,
+                        end = 4.dp
+                    ),
+                value = text,
+                languageRuleBook = languageRuleBook,
+                colorScheme = colorScheme,
+                onValueChange = onValueChange,
+                colors = colors.textFieldColors(enabled = enabled).value,
+                textStyle = textStyle,
+                enabled = enabled,
+                readOnly = readOnly,
+            )
+        }
+    }
+}
+
+
+private data class DummyData(
+    val headingRule: LanguageRule = object : LanguageRule {
+        override fun findMatches(text: CharSequence): List<RuleMatch> {
+            val PATTERN = "^\\s{0,3}#{1,6} .+".toRegex(RegexOption.MULTILINE)
+            return RuleHelper.findRegexMatches(text, PATTERN)
+        }
+    },
+
+    val dummyRuleBook: LanguageRuleBook = object : LanguageRuleBook {
+        override fun getRules() = listOf(
+            headingRule
+        )
+    },
+
+    val colorScheme: ColorScheme<SpanStyle> = object : ColorScheme<SpanStyle> {
+        override fun getStyles(type: LanguageRule): Set<StyleFactory<SpanStyle>> {
+            return setOf { SpanStyle(Color(0xFFFF6D00)) }
+        }
+    }
+)
+
+private val dummyData = DummyData()
+
+@Preview
+@Composable
+private fun KodeEditorPreview() {
+    var text by remember {
+        val initialText = """
+            # Hello World
+            Code: `readResourceFileAsText(R.raw.sample_text)`
+            
+            ## Secondary headline
+            
+            This is a listing:
+            
+            * 1
+            * 2
+            * 3
+            
+            # Code Block
+            
+            ```
+            This is a code block.
+            ```
+        """.trimIndent()
+        mutableStateOf(TextFieldValue(
+            text = initialText
+        ))
+    }
+
+    val languageRuleBook by remember {
+        mutableStateOf(dummyData.dummyRuleBook)
+    }
+    val colorScheme by remember {
+        mutableStateOf(dummyData.colorScheme)
+    }
+
+    KodeEditor(
+        modifier = Modifier.fillMaxSize(),
+        text = text,
+        languageRuleBook = languageRuleBook,
+        colorScheme = colorScheme,
+        onValueChange = { text = it }
+    )
+}
diff --git a/library/src/main/java/de/markusressel/kodeeditor/library/compose/KodeEditorColors.kt b/library/src/main/java/de/markusressel/kodeeditor/library/compose/KodeEditorColors.kt
new file mode 100644
index 0000000..ea869cf
--- /dev/null
+++ b/library/src/main/java/de/markusressel/kodeeditor/library/compose/KodeEditorColors.kt
@@ -0,0 +1,102 @@
+package de.markusressel.kodeeditor.library.compose
+
+import androidx.compose.material.MaterialTheme
+import androidx.compose.runtime.*
+import androidx.compose.ui.graphics.Color
+import de.markusressel.kodehighlighter.core.ui.KodeTextField
+import de.markusressel.kodehighlighter.core.ui.KodeTextFieldColors
+import de.markusressel.kodehighlighter.core.ui.KodeTextFieldDefaults
+
+
+/**
+ * Represents the colors of the code editor (without highlighting), line numbers, etc. used
+ * in a code editor in different states.
+ *
+ * See [KodeEditorDefaults.editorColors] for the default colors used in [KodeEditorDefaults].
+ */
+@Stable
+interface KodeEditorColors {
+
+    /**
+     * [KodeTextField] specific set of colors
+     *
+     * @param enabled whether the text field is enabled
+     */
+    @Composable
+    fun textFieldColors(enabled: Boolean): State<KodeTextFieldColors>
+
+    /**
+     * Represents the color used for the background of the editor text.
+     */
+    @Composable
+    fun textFieldBackgroundColor(): State<Color>
+
+    /**
+     * Represents the color used for line numbers text.
+     */
+    @Composable
+    fun lineNumberTextColor(): State<Color>
+
+    /**
+     * Represents the color used for the background of the line numbers.
+     */
+    @Composable
+    fun lineNumberBackgroundColor(): State<Color>
+
+}
+
+
+/**
+ * Contains the default values used by [KodeTextField].
+ */
+@Immutable
+object KodeEditorDefaults {
+
+    /**
+     * Creates a [KodeEditorColors] that represents the default input text, background and content
+     * (including label, placeholder, leading and trailing icons) colors used in a [KodeEditor].
+     */
+    @Composable
+    fun editorColors(
+        textFieldColors: KodeTextFieldColors = KodeTextFieldDefaults.textFieldColors(),
+        textFieldBackgroundColor: Color = MaterialTheme.colors.surface,
+        lineNumberTextColor: Color = MaterialTheme.colors.onSurface,
+        lineNumberBackgroundColor: Color = MaterialTheme.colors.surface,
+    ): KodeEditorColors =
+        DefaultKodeEditorColors(
+            textFieldColors = textFieldColors,
+            textFieldBackgroundColor = textFieldBackgroundColor,
+            lineNumberTextColor = lineNumberTextColor,
+            lineNumberBackgroundColor = lineNumberBackgroundColor,
+        )
+}
+
+
+private data class DefaultKodeEditorColors(
+    private val textFieldColors: KodeTextFieldColors,
+    private val textFieldBackgroundColor: Color,
+    private val lineNumberTextColor: Color,
+    private val lineNumberBackgroundColor: Color,
+) : KodeEditorColors {
+
+    @Composable
+    override fun textFieldColors(enabled: Boolean): State<KodeTextFieldColors> {
+        return rememberUpdatedState(textFieldColors)
+    }
+
+    @Composable
+    override fun textFieldBackgroundColor(): State<Color> {
+        return rememberUpdatedState(textFieldBackgroundColor)
+    }
+
+    @Composable
+    override fun lineNumberTextColor(): State<Color> {
+        return rememberUpdatedState(lineNumberTextColor)
+    }
+
+    @Composable
+    override fun lineNumberBackgroundColor(): State<Color> {
+        return rememberUpdatedState(lineNumberBackgroundColor)
+    }
+
+}
diff --git a/library/src/main/java/de/markusressel/kodeeditor/library/compose/LineNumbers.kt b/library/src/main/java/de/markusressel/kodeeditor/library/compose/LineNumbers.kt
new file mode 100644
index 0000000..43e1b30
--- /dev/null
+++ b/library/src/main/java/de/markusressel/kodeeditor/library/compose/LineNumbers.kt
@@ -0,0 +1,58 @@
+package de.markusressel.kodeeditor.library.compose
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.LocalTextStyle
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun LineNumbers(
+    modifier: Modifier = Modifier,
+    text: String,
+    textStyle: TextStyle = LocalTextStyle.current,
+    backgroundColor: Color,
+    textColor: Color = Color.Unspecified,
+) {
+    val lineNumbers by remember(text) {
+        val lineCount = text.lines().size
+        val lineText = (1..lineCount).joinToString(separator = "\n")
+        mutableStateOf(lineText)
+    }
+
+    Box(modifier = modifier) {
+        Text(
+            modifier = Modifier
+                .background(color = backgroundColor)
+                .padding(start = 4.dp, end = 4.dp),
+            text = lineNumbers,
+            fontSize = textStyle.fontSize,
+            color = textColor,
+            textAlign = TextAlign.End,
+        )
+    }
+}
+
+
+@Preview(widthDp = 100, heightDp = 500, backgroundColor = 0xFF00FF)
+@Composable
+private fun LineNumbersPreview() {
+    val text = (1..10).joinToString(separator = "\n", prefix = "Line: ")
+    LineNumbers(
+        text = text,
+        backgroundColor = Color.White,
+        textColor = Color.Black,
+    )
+}
+
+
diff --git a/library/src/main/java/de/markusressel/kodeeditor/library/compose/ZoomLayout.kt b/library/src/main/java/de/markusressel/kodeeditor/library/compose/ZoomLayout.kt
new file mode 100644
index 0000000..77a1130
--- /dev/null
+++ b/library/src/main/java/de/markusressel/kodeeditor/library/compose/ZoomLayout.kt
@@ -0,0 +1,97 @@
+package de.markusressel.kodeeditor.library.compose
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.gestures.detectTransformGestures
+import androidx.compose.foundation.layout.*
+import androidx.compose.material.Surface
+import androidx.compose.runtime.*
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.TransformOrigin
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+
+@Preview
+@Composable
+private fun ZoomLayoutPreview() {
+    var offset by remember { mutableStateOf(Offset.Zero) }
+    var zoom by remember { mutableStateOf(2f) }
+
+    ZoomLayout(
+        modifier = Modifier
+            .padding(16.dp)
+            .background(Color.White),
+        zoom = zoom,
+        offset = offset,
+        onOffsetChanged = { offset = it },
+        onZoomChanged = { zoom = it },
+    ) {
+        Column(modifier = Modifier) {
+            for (i in 1..10) {
+                Row(modifier = Modifier) {
+                    for (j in 1..10) {
+                        val k = (i + j) % 2
+                        Surface(
+                            modifier = Modifier.size(20.dp), color = when (k) {
+                            1 -> Color.Black
+                            else -> Color.White
+                        }) {
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun ZoomLayout(
+    modifier: Modifier = Modifier,
+    zoom: Float = 1f,
+    minZoom: Float = 0.01f,
+    maxZoom: Float = 10f,
+    offset: Offset = Offset.Zero,
+    onOffsetChanged: (Offset) -> Unit,
+    onZoomChanged: (Float) -> Unit,
+    content: @Composable BoxScope.() -> Unit,
+) {
+    Box(
+        modifier = Modifier
+            .pointerInput(Unit) {
+                detectTransformGestures { centroid, pan, gestureZoom, gestureRotate ->
+
+                    val oldScale = zoom
+                    val newScale = zoom * gestureZoom
+
+                    // For natural zooming and rotating, the centroid of the gesture should
+                    // be the fixed point where zooming and rotating occurs.
+                    // We compute where the centroid was (in the pre-transformed coordinate
+                    // space), and then compute where it will be after this delta.
+                    // We then compute what the new offset should be to keep the centroid
+                    // visually stationary for rotating and zooming, and also apply the pan.
+                    val tOffset = (offset + centroid / oldScale) - (centroid / newScale + pan / oldScale)
+
+                    if (offset != tOffset) {
+                        onOffsetChanged(tOffset)
+                    }
+
+                    val newZoom = (newScale).coerceIn(minZoom, maxZoom)
+                    if (zoom != newZoom) {
+                        onZoomChanged(newZoom)
+                    }
+                }
+            }
+            .graphicsLayer(
+                transformOrigin = TransformOrigin(0f, 0f),
+                scaleX = zoom, scaleY = zoom,
+                translationX = -offset.x * zoom,
+                translationY = -offset.y * zoom,
+            )
+            .then(modifier),
+    ) {
+        content()
+    }
+}
\ No newline at end of file
diff --git a/library/src/main/java/de/markusressel/kodeeditor/library/view/CodeEditorLayout.kt b/library/src/main/java/de/markusressel/kodeeditor/library/view/CodeEditorLayout.kt
index e37efd4..1a02580 100644
--- a/library/src/main/java/de/markusressel/kodeeditor/library/view/CodeEditorLayout.kt
+++ b/library/src/main/java/de/markusressel/kodeeditor/library/view/CodeEditorLayout.kt
@@ -8,6 +8,7 @@ import android.graphics.Rect
 import android.graphics.drawable.GradientDrawable
 import android.os.Build
 import android.text.Layout
+import android.text.style.CharacterStyle
 import android.util.AttributeSet
 import android.util.Log
 import android.util.TypedValue
@@ -22,6 +23,7 @@ import de.markusressel.kodeeditor.library.extensions.createSnapshot
 import de.markusressel.kodeeditor.library.extensions.dpToPx
 import de.markusressel.kodeeditor.library.extensions.getColor
 import de.markusressel.kodehighlighter.core.LanguageRuleBook
+import de.markusressel.kodehighlighter.core.colorscheme.ColorScheme
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -122,6 +124,15 @@ constructor(
             codeEditorView.languageRuleBook = value
         }
 
+    /**
+     * The currently active syntax highlighter (if any)
+     */
+    var colorScheme: ColorScheme<CharacterStyle>?
+        get() = codeEditorView.colorScheme
+        set(value) {
+            codeEditorView.colorScheme = value
+        }
+
     /**
      * Set the text in the editor
      *
diff --git a/library/src/main/java/de/markusressel/kodeeditor/library/view/CodeEditorView.kt b/library/src/main/java/de/markusressel/kodeeditor/library/view/CodeEditorView.kt
index 98e83cd..e21ab83 100644
--- a/library/src/main/java/de/markusressel/kodeeditor/library/view/CodeEditorView.kt
+++ b/library/src/main/java/de/markusressel/kodeeditor/library/view/CodeEditorView.kt
@@ -2,6 +2,7 @@ package de.markusressel.kodeeditor.library.view
 
 import android.content.Context
 import android.graphics.Color
+import android.text.style.CharacterStyle
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
@@ -14,6 +15,7 @@ import de.markusressel.kodeeditor.library.R
 import de.markusressel.kodeeditor.library.extensions.getColor
 import de.markusressel.kodeeditor.library.extensions.setViewBackgroundWithoutResettingPadding
 import de.markusressel.kodehighlighter.core.LanguageRuleBook
+import de.markusressel.kodehighlighter.core.colorscheme.ColorScheme
 import de.markusressel.kodehighlighter.core.util.EditTextHighlighter
 import de.markusressel.kodehighlighter.core.util.StatefulSpannableHighlighter
 
@@ -21,8 +23,8 @@ import de.markusressel.kodehighlighter.core.util.StatefulSpannableHighlighter
  * Code Editor that allows pinch-to-zoom
  */
 open class CodeEditorView
-@JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0)
-    : ZoomLayout(context, attrs, defStyleAttr), SelectionChangedListener {
+@JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) :
+    ZoomLayout(context, attrs, defStyleAttr), SelectionChangedListener {
 
     /**
      * The actual text editor content
@@ -37,18 +39,43 @@ open class CodeEditorView
     /**
      * The currently active syntax highlighter (if any)
      */
-    var languageRuleBook: LanguageRuleBook?
-        get() = codeEditText.highlighter?.languageRuleBook
+    var languageRuleBook: LanguageRuleBook? = null
+        //get() = codeEditText.highlighter?.languageRuleBook
         set(value) {
-            if (value != null) {
-                codeEditText.highlighter = EditTextHighlighter(codeEditText, value)
-                codeTextView.highlighter = StatefulSpannableHighlighter(value, value.defaultColorScheme)
-            } else {
-                codeEditText.highlighter = null
-                codeTextView.highlighter = null
-            }
+            field = value
+            updateHighlighter(value, colorScheme)
         }
 
+    /**
+     * The color scheme to use for the currently active syntax highlighter (if any)
+     */
+    var colorScheme: ColorScheme<CharacterStyle>? = null
+        //get() = codeEditText.highlighter?.colorScheme
+        set(value) {
+            field = value
+            updateHighlighter(languageRuleBook, value)
+        }
+
+    private fun updateHighlighter(
+        languageRuleBook: LanguageRuleBook?,
+        colorScheme: ColorScheme<CharacterStyle>?,
+    ) {
+        if (languageRuleBook != null && colorScheme != null) {
+            codeEditText.highlighter = EditTextHighlighter(
+                target = codeEditText,
+                languageRuleBook = languageRuleBook,
+                colorScheme = colorScheme
+            )
+            codeTextView.highlighter = StatefulSpannableHighlighter(
+                languageRuleBook = languageRuleBook,
+                colorScheme = colorScheme
+            )
+        } else {
+            codeEditText.highlighter = null
+            codeTextView.highlighter = null
+        }
+    }
+
     /**
      * Listener for selection changes
      */
@@ -124,11 +151,15 @@ open class CodeEditorView
     private fun readParameters(attrs: AttributeSet?, defStyleAttr: Int) {
         val a = context.obtainStyledAttributes(attrs, R.styleable.CodeEditorView, defStyleAttr, 0)
 
-        val editTextBackgroundColor = a.getColor(context,
-                defaultColor = Color.WHITE,
-                styleableRes = R.styleable.CodeEditorView_ke_editor_backgroundColor,
-                attr = intArrayOf(R.attr.ke_editor_backgroundColor,
-                        android.R.attr.windowBackground))
+        val editTextBackgroundColor = a.getColor(
+            context,
+            defaultColor = Color.WHITE,
+            styleableRes = R.styleable.CodeEditorView_ke_editor_backgroundColor,
+            attr = intArrayOf(
+                R.attr.ke_editor_backgroundColor,
+                android.R.attr.windowBackground
+            )
+        )
         codeEditText.setBackgroundColor(editTextBackgroundColor)
 
         val maxRealZoom = a.getFloat(R.styleable.CodeEditorView_ke_editor_maxZoom, DEFAULT_MAX_ZOOM)
@@ -173,8 +204,10 @@ open class CodeEditorView
         val containerHeight = height - (paddingTop + paddingBottom)
 
         val codeEditTextLayoutParams = (codeEditText.layoutParams as MarginLayoutParams)
-        val minimumWidth = containerWidth + (codeEditTextLayoutParams.leftMargin + codeEditTextLayoutParams.rightMargin)
-        val minimumHeight = containerHeight - (codeEditTextLayoutParams.topMargin + codeEditTextLayoutParams.bottomMargin)
+        val minimumWidth =
+            containerWidth + (codeEditTextLayoutParams.leftMargin + codeEditTextLayoutParams.rightMargin)
+        val minimumHeight =
+            containerHeight - (codeEditTextLayoutParams.topMargin + codeEditTextLayoutParams.bottomMargin)
 
         codeEditText.minWidth = minimumWidth
         codeTextView.minWidth = minimumWidth
diff --git a/settings.gradle b/settings.gradle
deleted file mode 100644
index 5243a55..0000000
--- a/settings.gradle
+++ /dev/null
@@ -1,12 +0,0 @@
-dependencyResolutionManagement {
-    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
-    repositories {
-        google()
-        mavenCentral()
-        maven { url "https://jitpack.io" }
-    }
-}
-
-rootProject.name = "KodeEditor"
-
-include ':app', ':library'
diff --git a/settings.gradle.kts b/settings.gradle.kts
new file mode 100644
index 0000000..9938e0a
--- /dev/null
+++ b/settings.gradle.kts
@@ -0,0 +1,23 @@
+pluginManagement {
+    includeBuild("build-logic")
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+        maven(url = "https://jitpack.io")
+    }
+}
+
+rootProject.name = "KodeEditor"
+if (System.getenv("JITPACK").toBoolean().not())
+    include(":app")
+include(":library")