Release 1.21.1

Closes #327

.gitignore

@@ -5,6 +5,8 @@
 bld/*
 !bld/*.iss
 !bld/*.bat
+!bld/*.ps1
+!bld/Redist
 !bld/Resources
 
 # Rider
@@ -144,4 +146,3 @@ _UpgradeReport_Files/
 Backup*/
 UpgradeLog*.XML
 UpgradeLog*.htm
-

.idea/.idea.TweetDuck/.idea/codeStyles/Project.xml

@@ -1,12 +1,40 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <option name="AUTODETECT_INDENTS" value="false" />
+    <option name="OTHER_INDENT_OPTIONS">
+      <value>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </value>
+    </option>
     <option name="LINE_SEPARATOR" value="&#10;" />
     <option name="RIGHT_MARGIN" value="999" />
     <option name="FORMATTER_TAGS_ENABLED" value="true" />
     <CssCodeStyleSettings>
       <option name="HEX_COLOR_LOWER_CASE" value="true" />
     </CssCodeStyleSettings>
+    <DB2CodeStyleSettings version="6">
+      <option name="USE_GENERIC_STYLE" value="true" />
+    </DB2CodeStyleSettings>
+    <DerbyCodeStyleSettings version="6">
+      <option name="USE_GENERIC_STYLE" value="true" />
+    </DerbyCodeStyleSettings>
+    <GoCodeStyleSettings>
+      <option name="MOVE_ALL_STDLIB_IMPORTS_IN_ONE_GROUP" value="true" />
+      <option name="GROUP_STDLIB_IMPORTS" value="true" />
+      <option name="WRAP_COMP_LIT" value="5" />
+      <option name="WRAP_FUNC_PARAMS" value="5" />
+      <option name="WRAP_FUNC_RESULT" value="5" />
+    </GoCodeStyleSettings>
+    <H2CodeStyleSettings version="6">
+      <option name="USE_GENERIC_STYLE" value="true" />
+    </H2CodeStyleSettings>
+    <H2CodeStyleSettings version="6">
+      <option name="USE_GENERIC_STYLE" value="true" />
+    </H2CodeStyleSettings>
+    <HSQLCodeStyleSettings version="6">
+      <option name="USE_GENERIC_STYLE" value="true" />
+    </HSQLCodeStyleSettings>
     <HTMLCodeStyleSettings>
       <option name="HTML_ALIGN_TEXT" value="true" />
       <option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
@@ -17,23 +45,146 @@
       <option name="FORCE_SEMICOLON_STYLE" value="true" />
       <option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACKETS" value="true" />
       <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-      <option name="SPACE_BEFORE_CLASS_LBRACE" value="false" />
       <option name="FORCE_QUOTE_STYlE" value="true" />
+      <option name="USE_EXPLICIT_JS_EXTENSION" value="TRUE" />
       <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
       <option name="SPACES_WITHIN_IMPORTS" value="true" />
       <option name="USE_CHAINED_CALLS_GROUP_INDENTS" value="true" />
       <option name="SPACE_BEFORE_ASYNC_ARROW_LPAREN" value="false" />
+      <option name="IMPORT_SORT_MODULE_NAME" value="true" />
     </JSCodeStyleSettings>
     <JSON>
       <option name="OBJECT_WRAPPING" value="5" />
       <option name="ARRAY_WRAPPING" value="5" />
     </JSON>
+    <JavaCodeStyleSettings>
+      <option name="INSERT_INNER_CLASS_IMPORTS" value="true" />
+      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+      <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+      <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
+        <value />
+      </option>
+      <option name="IMPORT_LAYOUT_TABLE">
+        <value>
+          <package name="" withSubpackages="true" static="false" />
+          <package name="javax" withSubpackages="true" static="false" />
+          <package name="java" withSubpackages="true" static="false" />
+          <package name="" withSubpackages="true" static="true" />
+        </value>
+      </option>
+    </JavaCodeStyleSettings>
+    <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value>
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="ALIGN_IN_COLUMNS_CASE_BRANCH" value="true" />
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
+      <option name="IMPORT_NESTED_CLASSES" value="true" />
+      <option name="WRAP_ELVIS_EXPRESSIONS" value="0" />
+      <option name="ALLOW_TRAILING_COMMA" value="true" />
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </JetCodeStyleSettings>
+    <LessCodeStyleSettings>
+      <option name="HEX_COLOR_LOWER_CASE" value="true" />
+    </LessCodeStyleSettings>
+    <MSSQLCodeStyleSettings version="6">
+      <option name="USE_GENERIC_STYLE" value="true" />
+    </MSSQLCodeStyleSettings>
+    <MySQLCodeStyleSettings version="6">
+      <option name="USE_GENERIC_STYLE" value="true" />
+    </MySQLCodeStyleSettings>
+    <Objective-C>
+      <option name="INDENT_DIRECTIVE_AS_CODE" value="true" />
+      <option name="KEEP_STRUCTURES_IN_ONE_LINE" value="true" />
+      <option name="KEEP_CASE_EXPRESSIONS_IN_ONE_LINE" value="true" />
+      <option name="SPACE_BEFORE_INIT_LIST" value="true" />
+      <option name="SPACE_AFTER_DICTIONARY_LITERAL_COLON" value="false" />
+    </Objective-C>
+    <OracleCodeStyleSettings version="6">
+      <option name="USE_GENERIC_STYLE" value="true" />
+    </OracleCodeStyleSettings>
+    <PHPCodeStyleSettings>
+      <option name="ALIGN_KEY_VALUE_PAIRS" value="true" />
+      <option name="CONCAT_SPACES" value="false" />
+      <option name="COMMA_AFTER_LAST_ARRAY_ELEMENT" value="true" />
+      <option name="PHPDOC_BLANK_LINE_BEFORE_TAGS" value="true" />
+      <option name="LOWER_CASE_BOOLEAN_CONST" value="true" />
+      <option name="LOWER_CASE_NULL_CONST" value="true" />
+      <option name="ELSE_IF_STYLE" value="COMBINE" />
+      <option name="VARIABLE_NAMING_STYLE" value="SNAKE_CASE" />
+      <option name="KEEP_BLANK_LINES_AFTER_LBRACE" value="0" />
+      <option name="SPACE_BEFORE_CLOSURE_LEFT_PARENTHESIS" value="false" />
+      <option name="FORCE_SHORT_DECLARATION_ARRAY_STYLE" value="true" />
+      <option name="NEW_LINE_AFTER_PHP_OPENING_TAG" value="true" />
+      <option name="SPACE_AROUND_ASSIGNMENT_IN_DECLARE" value="true" />
+    </PHPCodeStyleSettings>
+    <PostgresCodeStyleSettings version="6">
+      <option name="USE_GENERIC_STYLE" value="true" />
+    </PostgresCodeStyleSettings>
     <Properties>
       <option name="KEEP_BLANK_LINES" value="true" />
     </Properties>
+    <Python>
+      <option name="SPACE_AROUND_EQ_IN_NAMED_PARAMETER" value="true" />
+      <option name="SPACE_AROUND_EQ_IN_KEYWORD_ARGUMENT" value="true" />
+      <option name="NEW_LINE_AFTER_COLON" value="true" />
+      <option name="DICT_WRAPPING" value="5" />
+      <option name="DICT_NEW_LINE_AFTER_LEFT_BRACE" value="true" />
+      <option name="DICT_NEW_LINE_BEFORE_RIGHT_BRACE" value="true" />
+    </Python>
+    <RsCodeStyleSettings>
+      <option name="ALIGN_RET_TYPE" value="false" />
+      <option name="ALIGN_TYPE_PARAMS" value="true" />
+      <option name="ALLOW_ONE_LINE_MATCH" value="true" />
+      <option name="SPACE_AROUND_ASSOC_TYPE_BINDING" value="true" />
+    </RsCodeStyleSettings>
+    <Ruby>
+      <option name="INDENT_PRIVATE_METHODS" value="true" />
+      <option name="INDENT_PROTECTED_METHODS" value="true" />
+      <option name="INDENT_PUBLIC_METHODS" value="true" />
+      <option name="INDENT_WHEN_CASES" value="true" />
+      <option name="CHAIN_CALLS_ALIGNMENT" value="2" />
+    </Ruby>
+    <SQLiteCodeStyleSettings version="6">
+      <option name="USE_GENERIC_STYLE" value="true" />
+    </SQLiteCodeStyleSettings>
+    <ScssCodeStyleSettings>
+      <option name="HEX_COLOR_LOWER_CASE" value="true" />
+    </ScssCodeStyleSettings>
+    <SqlCodeStyleSettings version="6">
+      <option name="KEYWORD_CASE" value="2" />
+      <option name="TYPE_CASE" value="2" />
+      <option name="CUSTOM_TYPE_CASE" value="2" />
+      <option name="SUBQUERY_CONTENT" value="1" />
+      <option name="SUBQUERY_CLOSING" value="1" />
+      <option name="INSERT_TABLE_EL_LINE" value="0" />
+      <option name="INSERT_EL_WRAP" value="2" />
+      <option name="SET_EL_WRAP" value="2" />
+      <option name="SET_ALIGN_EQUAL_SIGN" value="false" />
+      <option name="FROM_EL_WRAP" value="2" />
+      <option name="FROM_ALIGN_JOIN_TABLES" value="true" />
+      <option name="FROM_INDENT_JOIN" value="false" />
+      <option name="FROM_ONLY_JOIN_INDENT" value="2" />
+      <option name="WHERE_EL_WRAP" value="2" />
+      <option name="TABLE_OPENING" value="1" />
+      <option name="TABLE_CONTENT" value="2" />
+      <option name="TABLE_CLOSING" value="3" />
+      <option name="TABLE_DEFAULTS_ALIGN" value="false" />
+      <option name="TABLE_NULLABILITIES_ALIGN" value="false" />
+      <option name="CONSTRAINT_WRAP_1" value="false" />
+      <option name="CONSTRAINT_WRAP_3" value="true" />
+      <option name="CONSTRAINT_WRAP_4" value="true" />
+      <option name="VIEW_INDENT_QUERY" value="true" />
+      <option name="EXPR_CASE_WHEN_WRAP" value="false" />
+    </SqlCodeStyleSettings>
+    <SybaseCodeStyleSettings version="6">
+      <option name="USE_GENERIC_STYLE" value="true" />
+    </SybaseCodeStyleSettings>
     <TypeScriptCodeStyleSettings version="0">
       <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-      <option name="SPACE_BEFORE_CLASS_LBRACE" value="false" />
       <option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
       <option name="SPACES_WITHIN_IMPORTS" value="true" />
       <option name="USE_CHAINED_CALLS_GROUP_INDENTS" value="true" />
@@ -42,6 +193,14 @@
     <XML>
       <option name="XML_SPACE_INSIDE_EMPTY_TAG" value="true" />
     </XML>
+    <codeStyleSettings language="CMake">
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+        <option name="USE_TAB_CHARACTER" value="true" />
+        <option name="SMART_TABS" value="true" />
+        <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
     <codeStyleSettings language="CSS">
       <indentOptions>
         <option name="INDENT_SIZE" value="2" />
@@ -49,6 +208,20 @@
         <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
       </indentOptions>
     </codeStyleSettings>
+    <codeStyleSettings language="Groovy">
+      <option name="ELSE_ON_NEW_LINE" value="true" />
+      <option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACES" value="true" />
+      <option name="IF_BRACE_FORCE" value="3" />
+      <option name="DOWHILE_BRACE_FORCE" value="3" />
+      <option name="WHILE_BRACE_FORCE" value="3" />
+      <option name="FOR_BRACE_FORCE" value="3" />
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+        <option name="USE_TAB_CHARACTER" value="true" />
+        <option name="SMART_TABS" value="true" />
+        <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
     <codeStyleSettings language="HTML">
       <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
       <option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
@@ -58,6 +231,28 @@
         <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
       </indentOptions>
     </codeStyleSettings>
+    <codeStyleSettings language="JAVA">
+      <option name="RIGHT_MARGIN" value="999" />
+      <option name="BLANK_LINES_AFTER_PACKAGE" value="0" />
+      <option name="BLANK_LINES_BEFORE_IMPORTS" value="0" />
+      <option name="ELSE_ON_NEW_LINE" value="true" />
+      <option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACES" value="true" />
+      <option name="SPACE_AFTER_TYPE_CAST" value="false" />
+      <option name="SPACE_BEFORE_SYNCHRONIZED_PARENTHESES" value="false" />
+      <option name="KEEP_SIMPLE_METHODS_IN_ONE_LINE" value="true" />
+      <option name="KEEP_SIMPLE_LAMBDAS_IN_ONE_LINE" value="true" />
+      <option name="KEEP_SIMPLE_CLASSES_IN_ONE_LINE" value="true" />
+      <option name="IF_BRACE_FORCE" value="3" />
+      <option name="DOWHILE_BRACE_FORCE" value="3" />
+      <option name="WHILE_BRACE_FORCE" value="3" />
+      <option name="FOR_BRACE_FORCE" value="3" />
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+        <option name="USE_TAB_CHARACTER" value="true" />
+        <option name="SMART_TABS" value="true" />
+        <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
     <codeStyleSettings language="JSON">
       <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
       <option name="SPACE_WITHIN_BRACKETS" value="true" />
@@ -70,29 +265,13 @@
       <option name="ELSE_ON_NEW_LINE" value="true" />
       <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
       <option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true" />
-      <option name="SPACE_BEFORE_WHILE_PARENTHESES" value="false" />
-      <option name="SPACE_BEFORE_FOR_PARENTHESES" value="false" />
-      <option name="SPACE_BEFORE_CATCH_PARENTHESES" value="false" />
-      <option name="SPACE_BEFORE_SWITCH_PARENTHESES" value="false" />
-      <option name="SPACE_BEFORE_METHOD_LBRACE" value="false" />
-      <option name="SPACE_BEFORE_IF_LBRACE" value="false" />
-      <option name="SPACE_BEFORE_ELSE_LBRACE" value="false" />
-      <option name="SPACE_BEFORE_WHILE_LBRACE" value="false" />
-      <option name="SPACE_BEFORE_FOR_LBRACE" value="false" />
-      <option name="SPACE_BEFORE_DO_LBRACE" value="false" />
-      <option name="SPACE_BEFORE_SWITCH_LBRACE" value="false" />
-      <option name="SPACE_BEFORE_TRY_LBRACE" value="false" />
-      <option name="SPACE_BEFORE_CATCH_LBRACE" value="false" />
-      <option name="SPACE_BEFORE_FINALLY_LBRACE" value="false" />
-      <option name="SPACE_BEFORE_ELSE_KEYWORD" value="false" />
-      <option name="SPACE_BEFORE_WHILE_KEYWORD" value="false" />
-      <option name="SPACE_BEFORE_CATCH_KEYWORD" value="false" />
-      <option name="SPACE_BEFORE_FINALLY_KEYWORD" value="false" />
       <option name="IF_BRACE_FORCE" value="3" />
       <option name="DOWHILE_BRACE_FORCE" value="3" />
       <option name="WHILE_BRACE_FORCE" value="3" />
       <option name="FOR_BRACE_FORCE" value="3" />
       <indentOptions>
+        <option name="USE_TAB_CHARACTER" value="true" />
+        <option name="SMART_TABS" value="true" />
         <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
       </indentOptions>
     </codeStyleSettings>
@@ -101,6 +280,81 @@
         <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
       </indentOptions>
     </codeStyleSettings>
+    <codeStyleSettings language="Lua">
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+        <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="ObjectiveC">
+      <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
+      <option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
+      <option name="LINE_COMMENT_ADD_SPACE" value="true" />
+      <option name="ELSE_ON_NEW_LINE" value="true" />
+      <option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACES" value="true" />
+      <option name="IF_BRACE_FORCE" value="3" />
+      <option name="DOWHILE_BRACE_FORCE" value="3" />
+      <option name="WHILE_BRACE_FORCE" value="3" />
+      <option name="FOR_BRACE_FORCE" value="3" />
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+        <option name="USE_TAB_CHARACTER" value="true" />
+        <option name="SMART_TABS" value="true" />
+        <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="PHP">
+      <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
+      <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
+      <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
+      <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
+      <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+      <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
+      <option name="CLASS_BRACE_STYLE" value="1" />
+      <option name="METHOD_BRACE_STYLE" value="1" />
+      <option name="ELSE_ON_NEW_LINE" value="true" />
+      <option name="SPECIAL_ELSE_IF_TREATMENT" value="true" />
+      <option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" />
+      <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+      <option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true" />
+      <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
+      <option name="KEEP_SIMPLE_METHODS_IN_ONE_LINE" value="true" />
+      <option name="KEEP_SIMPLE_CLASSES_IN_ONE_LINE" value="true" />
+      <option name="IF_BRACE_FORCE" value="3" />
+      <option name="DOWHILE_BRACE_FORCE" value="3" />
+      <option name="WHILE_BRACE_FORCE" value="3" />
+      <option name="FOR_BRACE_FORCE" value="3" />
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+        <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="Puppet">
+      <indentOptions>
+        <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="Python">
+      <indentOptions>
+        <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="RHTML">
+      <indentOptions>
+        <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="Rust">
+      <option name="RIGHT_MARGIN" value="140" />
+      <option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" />
+      <indentOptions>
+        <option name="USE_TAB_CHARACTER" value="true" />
+        <option name="SMART_TABS" value="true" />
+        <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
     <codeStyleSettings language="SASS">
       <indentOptions>
         <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
@@ -115,10 +369,19 @@
       <indentOptions>
         <option name="USE_TAB_CHARACTER" value="true" />
         <option name="SMART_TABS" value="true" />
+        <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="Shell Script">
+      <indentOptions>
+        <option name="INDENT_SIZE" value="4" />
+        <option name="TAB_SIZE" value="4" />
+        <option name="USE_TAB_CHARACTER" value="true" />
       </indentOptions>
     </codeStyleSettings>
     <codeStyleSettings language="TOML">
       <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
         <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
       </indentOptions>
     </codeStyleSettings>
@@ -126,29 +389,13 @@
       <option name="ELSE_ON_NEW_LINE" value="true" />
       <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
       <option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true" />
-      <option name="SPACE_BEFORE_WHILE_PARENTHESES" value="false" />
-      <option name="SPACE_BEFORE_FOR_PARENTHESES" value="false" />
-      <option name="SPACE_BEFORE_CATCH_PARENTHESES" value="false" />
-      <option name="SPACE_BEFORE_SWITCH_PARENTHESES" value="false" />
-      <option name="SPACE_BEFORE_METHOD_LBRACE" value="false" />
-      <option name="SPACE_BEFORE_IF_LBRACE" value="false" />
-      <option name="SPACE_BEFORE_ELSE_LBRACE" value="false" />
-      <option name="SPACE_BEFORE_WHILE_LBRACE" value="false" />
-      <option name="SPACE_BEFORE_FOR_LBRACE" value="false" />
-      <option name="SPACE_BEFORE_DO_LBRACE" value="false" />
-      <option name="SPACE_BEFORE_SWITCH_LBRACE" value="false" />
-      <option name="SPACE_BEFORE_TRY_LBRACE" value="false" />
-      <option name="SPACE_BEFORE_CATCH_LBRACE" value="false" />
-      <option name="SPACE_BEFORE_FINALLY_LBRACE" value="false" />
-      <option name="SPACE_BEFORE_ELSE_KEYWORD" value="false" />
-      <option name="SPACE_BEFORE_WHILE_KEYWORD" value="false" />
-      <option name="SPACE_BEFORE_CATCH_KEYWORD" value="false" />
-      <option name="SPACE_BEFORE_FINALLY_KEYWORD" value="false" />
       <option name="IF_BRACE_FORCE" value="3" />
       <option name="DOWHILE_BRACE_FORCE" value="3" />
       <option name="WHILE_BRACE_FORCE" value="3" />
       <option name="FOR_BRACE_FORCE" value="3" />
       <indentOptions>
+        <option name="USE_TAB_CHARACTER" value="true" />
+        <option name="SMART_TABS" value="true" />
         <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
       </indentOptions>
     </codeStyleSettings>
@@ -160,6 +407,40 @@
         <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
       </indentOptions>
     </codeStyleSettings>
+    <codeStyleSettings language="go">
+      <option name="CALL_PARAMETERS_WRAP" value="5" />
+      <indentOptions>
+        <option name="SMART_TABS" value="true" />
+        <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="kotlin">
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+      <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
+      <option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
+      <option name="LINE_COMMENT_ADD_SPACE" value="true" />
+      <option name="ELSE_ON_NEW_LINE" value="true" />
+      <option name="METHOD_ANNOTATION_WRAP" value="0" />
+      <option name="CLASS_ANNOTATION_WRAP" value="0" />
+      <option name="FIELD_ANNOTATION_WRAP" value="0" />
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+        <option name="USE_TAB_CHARACTER" value="true" />
+        <option name="SMART_TABS" value="true" />
+        <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="liquid">
+      <indentOptions>
+        <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="ruby">
+      <option name="SPACE_WITHIN_BRACES" value="true" />
+      <indentOptions>
+        <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
     <codeStyleSettings language="yaml">
       <indentOptions>
         <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />

.idea/.idea.TweetDuck/.idea/indexLayout.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ContentModelUserStore">
+  <component name="UserContentModel">
     <attachedFolders />
     <explicitIncludes />
     <explicitExcludes />

.idea/.idea.TweetDuck/.idea/inspectionProfiles/Project.xml

@@ -532,7 +532,6 @@
     <inspection_tool class="ResultOfObjectAllocationIgnored" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="ResultSetIndexZero" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="ReturnOfInnerClass" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="ReuseOfLocalVariableJS" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="RsSimplifyBooleanExpression" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="RuntimeExec" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="RuntimeExecWithNonConstantString" enabled="true" level="WARNING" enabled_by_default="true" />

.idea/.idea.TweetDuck/.idea/jsLibraryMappings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptLibraryMappings">
+    <file url="PROJECT" libraries="{@types/jquery}" />
+  </component>
+</project>

.idea/.idea.TweetDuck/.idea/riderModule.iml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="RIDER_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$/../.." />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

Application/FileDialogs.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using TweetDuck.Management;
+using TweetLib.Core.Application;
+using TweetLib.Core.Systems.Dialogs;
+
+namespace TweetDuck.Application {
+	sealed class FileDialogs : IAppFileDialogs {
+		public void SaveFile(SaveFileDialogSettings settings, Action<string> onAccepted) {
+			static string FormatFilter(FileDialogFilter filter) {
+				var builder = new StringBuilder();
+				builder.Append(filter.Name);
+
+				var extensions = string.Join(";", filter.Extensions.Select(ext => "*" + ext));
+				if (extensions.Length > 0) {
+					builder.Append(" (");
+					builder.Append(extensions);
+					builder.Append(")");
+				}
+
+				builder.Append('|');
+				builder.Append(extensions.Length == 0 ? "*.*" : extensions);
+				return builder.ToString();
+			}
+
+			FormManager.RunOnUIThreadAsync(() => {
+				using SaveFileDialog dialog = new SaveFileDialog {
+					AutoUpgradeEnabled = true,
+					OverwritePrompt = settings.OverwritePrompt,
+					Title = settings.DialogTitle,
+					FileName = settings.FileName,
+					Filter = settings.Filters == null ? null : string.Join("|", settings.Filters.Select(FormatFilter))
+				};
+
+				if (dialog.ShowDialog() == DialogResult.OK) {
+					onAccepted(dialog.FileName);
+				}
+			});
+		}
+	}
+}

Application/MessageDialogs.cs

@@ -0,0 +1,15 @@
+using TweetDuck.Dialogs;
+using TweetDuck.Management;
+using TweetLib.Core.Application;
+
+namespace TweetDuck.Application {
+	sealed class MessageDialogs : IAppMessageDialogs {
+		public void Information(string caption, string text, string buttonAccept) {
+			FormManager.RunOnUIThreadAsync(() => FormMessage.Information(caption, text, buttonAccept));
+		}
+
+		public void Error(string caption, string text, string buttonAccept) {
+			FormManager.RunOnUIThreadAsync(() => FormMessage.Error(caption, text, buttonAccept));
+		}
+	}
+}

Application/SystemHandler.cs

@@ -1,22 +1,78 @@
 using System;
 using System.Diagnostics;
+using System.Drawing;
 using System.IO;
+using System.Windows.Forms;
+using TweetDuck.Browser;
+using TweetDuck.Dialogs;
+using TweetDuck.Management;
+using TweetLib.Core;
 using TweetLib.Core.Application;
+using TweetLib.Core.Features.Twitter;
+using TweetLib.Core.Systems.Configuration;
 
 namespace TweetDuck.Application {
-    class SystemHandler : IAppSystemHandler{
-        void IAppSystemHandler.OpenAssociatedProgram(string path){
+	sealed class SystemHandler : IAppSystemHandler {
+		public void OpenBrowser(string url) {
+			if (string.IsNullOrWhiteSpace(url)) {
+				return;
+			}
+
+			FormManager.RunOnUIThreadAsync(() => {
+				var config = Program.Config.User;
+
+				switch (TwitterUrls.Check(url)) {
+					case TwitterUrls.UrlType.Fine:
+						string browserPath = config.BrowserPath;
+
+						if (browserPath == null || !File.Exists(browserPath)) {
+							OpenAssociatedProgram(url);
+						}
+						else {
+							string quotedUrl = '"' + url + '"';
+							string browserArgs = config.BrowserPathArgs == null ? quotedUrl : config.BrowserPathArgs + ' ' + quotedUrl;
+
 							try {
-                using(Process.Start(new ProcessStartInfo{
-                    FileName = path,
-                    ErrorDialog = true
-                })){}
+								using (Process.Start(browserPath, browserArgs)) {}
 							} catch (Exception e) {
-                Program.Reporter.HandleException("Error Opening Program", "Could not open the associated program for " + path, true, e);
+								App.ErrorHandler.HandleException("Error Opening Browser", "Could not open the browser.", true, e);
 							}
 						}
 
-        void IAppSystemHandler.OpenFileExplorer(string path){
+						break;
+
+					case TwitterUrls.UrlType.Tracking:
+						if (config.IgnoreTrackingUrlWarning) {
+							goto case TwitterUrls.UrlType.Fine;
+						}
+
+						using (FormMessage form = new FormMessage("Blocked URL", "TweetDuck has blocked a tracking url due to privacy concerns. Do you want to visit it anyway?\n" + url, MessageBoxIcon.Warning)) {
+							form.AddButton(FormMessage.No, DialogResult.No, ControlType.Cancel | ControlType.Focused);
+							form.AddButton(FormMessage.Yes, DialogResult.Yes, ControlType.Accept);
+							form.AddButton("Always Visit", DialogResult.Ignore);
+
+							DialogResult result = form.ShowDialog();
+
+							if (result == DialogResult.Ignore) {
+								config.IgnoreTrackingUrlWarning = true;
+								config.Save();
+							}
+
+							if (result == DialogResult.Ignore || result == DialogResult.Yes) {
+								goto case TwitterUrls.UrlType.Fine;
+							}
+						}
+
+						break;
+
+					case TwitterUrls.UrlType.Invalid:
+						FormMessage.Warning("Blocked URL", "A potentially malicious or invalid URL was blocked from opening:\n" + url, FormMessage.OK);
+						break;
+				}
+			});
+		}
+
+		public void OpenFileExplorer(string path) {
 			if (File.Exists(path)) {
 				using (Process.Start("explorer.exe", "/select,\"" + path.Replace('/', '\\') + "\"")) {}
 			}
@@ -24,5 +80,76 @@ namespace TweetDuck.Application{
 				using (Process.Start("explorer.exe", '"' + path.Replace('/', '\\') + '"')) {}
 			}
 		}
+
+		public IAppSystemHandler.OpenAssociatedProgramFunc OpenAssociatedProgram { get; } = path => {
+			try {
+				using (Process.Start(new ProcessStartInfo {
+					FileName = path,
+					ErrorDialog = true
+				})) {}
+			} catch (Exception e) {
+				App.ErrorHandler.HandleException("Error Opening Program", "Could not open the associated program for " + path, true, e);
+			}
+		};
+
+
+		public IAppSystemHandler.CopyImageFromFileFunc CopyImageFromFile { get; } = path => {
+			FormManager.RunOnUIThreadAsync(() => {
+				Image image;
+
+				try {
+					image = Image.FromFile(path);
+				} catch (Exception ex) {
+					FormMessage.Error("Copy Image", "An error occurred while copying the image: " + ex.Message, FormMessage.OK);
+					return;
+				}
+
+				ClipboardManager.SetImage(image);
+			});
+		};
+
+		public IAppSystemHandler.CopyTextFunc CopyText { get; } = text => {
+			FormManager.RunOnUIThreadAsync(() => ClipboardManager.SetText(text, TextDataFormat.UnicodeText));
+		};
+
+		public IAppSystemHandler.SearchTextFunc SearchText { get; } = text => {
+			if (string.IsNullOrWhiteSpace(text)) {
+				return;
+			}
+
+			void PerformSearch() {
+				var config = Program.Config.User;
+				string searchUrl = config.SearchEngineUrl;
+
+				if (string.IsNullOrEmpty(searchUrl)) {
+					if (FormMessage.Question("Search Options", "You have not configured a default search engine yet, would you like to do it now?", FormMessage.Yes, FormMessage.No)) {
+						bool wereSettingsOpen = FormManager.TryFind<FormSettings>() != null;
+
+						FormManager.TryFind<FormBrowser>()?.OpenSettings();
+
+						if (wereSettingsOpen) {
+							return;
+						}
+
+						FormSettings settings = FormManager.TryFind<FormSettings>();
+
+						if (settings == null) {
+							return;
+						}
+
+						settings.FormClosed += (sender, args) => {
+							if (args.CloseReason == CloseReason.UserClosing && config.SearchEngineUrl != searchUrl) {
+								PerformSearch();
+							}
+						};
+					}
+				}
+				else {
+					App.SystemHandler.OpenBrowser(searchUrl + Uri.EscapeUriString(text));
+				}
+			}
+
+			FormManager.RunOnUIThreadAsync(PerformSearch);
+		};
 	}
 }

Browser/Adapters/CefBrowserComponent.cs

@@ -0,0 +1,108 @@
+using System;
+using CefSharp;
+using CefSharp.WinForms;
+using TweetDuck.Browser.Handling;
+using TweetDuck.Utils;
+using TweetLib.Browser.Base;
+using TweetLib.Browser.Events;
+using TweetLib.Browser.Interfaces;
+using TweetLib.Utils.Static;
+using IContextMenuHandler = TweetLib.Browser.Interfaces.IContextMenuHandler;
+using IResourceRequestHandler = TweetLib.Browser.Interfaces.IResourceRequestHandler;
+
+namespace TweetDuck.Browser.Adapters {
+	internal abstract class CefBrowserComponent : IBrowserComponent {
+		public bool Ready { get; private set; }
+
+		public string Url => browser.Address;
+
+		public IFileDownloader FileDownloader => TwitterFileDownloader.Instance;
+
+		public event EventHandler<BrowserLoadedEventArgs> BrowserLoaded;
+		public event EventHandler<PageLoadEventArgs> PageLoadStart;
+		public event EventHandler<PageLoadEventArgs> PageLoadEnd;
+
+		private readonly ChromiumWebBrowser browser;
+
+		protected CefBrowserComponent(ChromiumWebBrowser browser) {
+			this.browser = browser;
+			this.browser.JsDialogHandler = new JavaScriptDialogHandler();
+			this.browser.LifeSpanHandler = new CustomLifeSpanHandler();
+			this.browser.LoadingStateChanged += OnLoadingStateChanged;
+			this.browser.LoadError += OnLoadError;
+			this.browser.FrameLoadStart += OnFrameLoadStart;
+			this.browser.FrameLoadEnd += OnFrameLoadEnd;
+			this.browser.SetupZoomEvents();
+		}
+
+		void IBrowserComponent.Setup(BrowserSetup setup) {
+			browser.MenuHandler = SetupContextMenu(setup.ContextMenuHandler);
+			browser.ResourceRequestHandlerFactory = SetupResourceHandlerFactory(setup.ResourceRequestHandler);
+		}
+
+		protected abstract ContextMenuBase SetupContextMenu(IContextMenuHandler handler);
+
+		protected abstract CefResourceHandlerFactory SetupResourceHandlerFactory(IResourceRequestHandler handler);
+
+		private void OnLoadingStateChanged(object sender, LoadingStateChangedEventArgs e) {
+			if (!e.IsLoading) {
+				Ready = true;
+				browser.LoadingStateChanged -= OnLoadingStateChanged;
+				BrowserLoaded?.Invoke(this, new BrowserLoadedEventArgsImpl(browser));
+				BrowserLoaded = null;
+			}
+		}
+
+		private sealed class BrowserLoadedEventArgsImpl : BrowserLoadedEventArgs {
+			private readonly IWebBrowser browser;
+
+			public BrowserLoadedEventArgsImpl(IWebBrowser browser) {
+				this.browser = browser;
+			}
+
+			public override void AddDictionaryWords(params string[] words) {
+				foreach (string word in words) {
+					browser.AddWordToDictionary(word);
+				}
+			}
+		}
+
+		private void OnLoadError(object sender, LoadErrorEventArgs e) {
+			if (e.ErrorCode == CefErrorCode.Aborted) {
+				return;
+			}
+
+			if (!e.FailedUrl.StartsWithOrdinal("td://resources/error/")) {
+				string errorName = Enum.GetName(typeof(CefErrorCode), e.ErrorCode);
+				string errorTitle = StringUtils.ConvertPascalCaseToScreamingSnakeCase(errorName ?? string.Empty);
+				browser.Load("td://resources/error/error.html#" + Uri.EscapeDataString(errorTitle));
+			}
+		}
+
+		private void OnFrameLoadStart(object sender, FrameLoadStartEventArgs e) {
+			if (e.Frame.IsMain) {
+				PageLoadStart?.Invoke(this, new PageLoadEventArgs(e.Url));
+			}
+		}
+
+		private void OnFrameLoadEnd(object sender, FrameLoadEndEventArgs e) {
+			if (e.Frame.IsMain) {
+				PageLoadEnd?.Invoke(this, new PageLoadEventArgs(e.Url));
+			}
+		}
+
+		public void AttachBridgeObject(string name, object bridge) {
+			browser.JavascriptObjectRepository.Settings.LegacyBindingEnabled = true;
+			browser.JavascriptObjectRepository.Register(name, bridge, isAsync: true, BindingOptions.DefaultBinder);
+		}
+
+		public void RunFunction(string name, params object[] args) {
+			browser.BrowserCore.ExecuteScriptAsync(name, args);
+		}
+
+		public void RunScript(string identifier, string script) {
+			using IFrame frame = browser.GetMainFrame();
+			frame.ExecuteJavaScriptAsync(script, identifier, 1);
+		}
+	}
+}

Browser/Adapters/CefContextMenuActionRegistry.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using CefSharp;
+
+namespace TweetDuck.Browser.Adapters {
+	internal sealed class CefContextMenuActionRegistry {
+		private readonly Dictionary<CefMenuCommand, Action> actions = new Dictionary<CefMenuCommand, Action>();
+
+		public CefMenuCommand AddAction(Action action) {
+			CefMenuCommand id = CefMenuCommand.UserFirst + 500 + actions.Count;
+			actions[id] = action;
+			return id;
+		}
+
+		public bool Execute(CefMenuCommand id) {
+			if (actions.TryGetValue(id, out var action)) {
+				action();
+				return true;
+			}
+
+			return false;
+		}
+
+		public void Clear() {
+			actions.Clear();
+		}
+	}
+}

Browser/Adapters/CefContextMenuModel.cs

@@ -0,0 +1,80 @@
+using System;
+using CefSharp;
+using TweetLib.Browser.Contexts;
+using TweetLib.Browser.Interfaces;
+using TweetLib.Core.Features.TweetDeck;
+using TweetLib.Core.Features.Twitter;
+
+namespace TweetDuck.Browser.Adapters {
+	internal sealed class CefContextMenuModel : IContextMenuBuilder {
+		private readonly IMenuModel model;
+		private readonly CefContextMenuActionRegistry actionRegistry;
+
+		public CefContextMenuModel(IMenuModel model, CefContextMenuActionRegistry actionRegistry) {
+			this.model = model;
+			this.actionRegistry = actionRegistry;
+		}
+
+		public void AddAction(string name, Action action) {
+			var id = actionRegistry.AddAction(action);
+			model.AddItem(id, name);
+		}
+
+		public void AddActionWithCheck(string name, bool isChecked, Action action) {
+			var id = actionRegistry.AddAction(action);
+			model.AddCheckItem(id, name);
+			model.SetChecked(id, isChecked);
+		}
+
+		public void AddSeparator() {
+			if (model.Count > 0 && model.GetTypeAt(model.Count - 1) != MenuItemType.Separator) { // do not add separators if there is nothing to separate
+				model.AddSeparator();
+			}
+		}
+
+		public static Context CreateContext(IContextMenuParams parameters, TweetDeckExtraContext extraContext, ImageQuality imageQuality) {
+			var context = new Context();
+			var flags = parameters.TypeFlags;
+
+			var tweet = extraContext?.Tweet;
+			if (tweet != null && !flags.HasFlag(ContextMenuType.Editable)) {
+				context.Tweet = tweet;
+			}
+
+			context.Link = GetLink(parameters, extraContext);
+			context.Media = GetMedia(parameters, extraContext, imageQuality);
+
+			if (flags.HasFlag(ContextMenuType.Selection)) {
+				context.Selection = new Selection(parameters.SelectionText, flags.HasFlag(ContextMenuType.Editable));
+			}
+
+			return context;
+		}
+
+		private static Link? GetLink(IContextMenuParams parameters, TweetDeckExtraContext extraContext) {
+			var link = extraContext?.Link;
+			if (link != null) {
+				return link;
+			}
+
+			if (parameters.TypeFlags.HasFlag(ContextMenuType.Link) && extraContext?.Media == null) {
+				return new Link(parameters.LinkUrl, parameters.UnfilteredLinkUrl);
+			}
+
+			return null;
+		}
+
+		private static Media? GetMedia(IContextMenuParams parameters, TweetDeckExtraContext extraContext, ImageQuality imageQuality) {
+			var media = extraContext?.Media;
+			if (media != null) {
+				return media;
+			}
+
+			if (parameters.TypeFlags.HasFlag(ContextMenuType.Media) && parameters.HasImageContents) {
+				return new Media(Media.Type.Image, TwitterUrls.GetMediaLink(parameters.SourceUrl, imageQuality));
+			}
+
+			return null;
+		}
+	}
+}

Browser/Adapters/CefResourceHandlerFactory.cs

@@ -0,0 +1,23 @@
+using System.Diagnostics.CodeAnalysis;
+using CefSharp;
+using IResourceRequestHandler = TweetLib.Browser.Interfaces.IResourceRequestHandler;
+
+namespace TweetDuck.Browser.Adapters {
+	sealed class CefResourceHandlerFactory : IResourceRequestHandlerFactory {
+		bool IResourceRequestHandlerFactory.HasHandlers => registry != null;
+
+		private readonly CefResourceRequestHandler resourceRequestHandler;
+		private readonly CefResourceHandlerRegistry registry;
+
+		public CefResourceHandlerFactory(IResourceRequestHandler resourceRequestHandler, CefResourceHandlerRegistry registry) {
+			this.resourceRequestHandler = new CefResourceRequestHandler(registry, resourceRequestHandler);
+			this.registry = registry;
+		}
+
+		[SuppressMessage("ReSharper", "RedundantAssignment")]
+		CefSharp.IResourceRequestHandler IResourceRequestHandlerFactory.GetResourceRequestHandler(IWebBrowser chromiumWebBrowser, IBrowser browser, IFrame frame, IRequest request, bool isNavigation, bool isDownload, string requestInitiator, ref bool disableDefaultHandling) {
+			disableDefaultHandling = registry != null && registry.HasHandler(request.Url);
+			return resourceRequestHandler;
+		}
+	}
+}

Browser/Adapters/CefResourceHandlerRegistry.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Concurrent;
+using System.Text;
+using CefSharp;
+
+namespace TweetDuck.Browser.Adapters {
+	internal sealed class CefResourceHandlerRegistry {
+		private readonly ConcurrentDictionary<string, Func<IResourceHandler>> resourceHandlers = new ConcurrentDictionary<string, Func<IResourceHandler>>(StringComparer.OrdinalIgnoreCase);
+
+		public bool HasHandler(string url) {
+			return resourceHandlers.ContainsKey(url);
+		}
+
+		public IResourceHandler GetHandler(string url) {
+			return resourceHandlers.TryGetValue(url, out var handler) ? handler() : null;
+		}
+
+		private void Register(string url, Func<IResourceHandler> factory) {
+			if (!Uri.TryCreate(url, UriKind.Absolute, out Uri uri)) {
+				throw new ArgumentException("Resource handler URL must be absolute!");
+			}
+
+			resourceHandlers.AddOrUpdate(uri.AbsoluteUri, factory, (key, prev) => factory);
+		}
+
+		public void RegisterStatic(string url, byte[] staticData, string mimeType = ResourceHandler.DefaultMimeType) {
+			Register(url, () => ResourceHandler.FromByteArray(staticData, mimeType));
+		}
+
+		public void RegisterStatic(string url, string staticData, string mimeType = ResourceHandler.DefaultMimeType) {
+			Register(url, () => ResourceHandler.FromString(staticData, Encoding.UTF8, mimeType: mimeType));
+		}
+
+		public void RegisterDynamic(string url, IResourceHandler handler) {
+			Register(url, () => handler);
+		}
+
+		public void Unregister(string url) {
+			resourceHandlers.TryRemove(url, out _);
+		}
+	}
+}

Browser/Adapters/CefResourceRequestHandler.cs

@@ -0,0 +1,77 @@
+using System.Collections.Generic;
+using CefSharp;
+using CefSharp.Handler;
+using TweetDuck.Browser.Handling;
+using TweetLib.Browser.Interfaces;
+using TweetLib.Browser.Request;
+using IResourceRequestHandler = TweetLib.Browser.Interfaces.IResourceRequestHandler;
+using ResourceType = TweetLib.Browser.Request.ResourceType;
+
+namespace TweetDuck.Browser.Adapters {
+	sealed class CefResourceRequestHandler : ResourceRequestHandler {
+		private readonly CefResourceHandlerRegistry resourceHandlerRegistry;
+		private readonly IResourceRequestHandler resourceRequestHandler;
+		private readonly Dictionary<ulong, IResponseProcessor> responseProcessors = new Dictionary<ulong, IResponseProcessor>();
+
+		public CefResourceRequestHandler(CefResourceHandlerRegistry resourceHandlerRegistry, IResourceRequestHandler resourceRequestHandler) {
+			this.resourceHandlerRegistry = resourceHandlerRegistry;
+			this.resourceRequestHandler = resourceRequestHandler;
+		}
+
+		protected override CefReturnValue OnBeforeResourceLoad(IWebBrowser chromiumWebBrowser, IBrowser browser, IFrame frame, IRequest request, IRequestCallback callback) {
+			if (request.ResourceType == CefSharp.ResourceType.CspReport) {
+				callback.Dispose();
+				return CefReturnValue.Cancel;
+			}
+
+			if (resourceRequestHandler != null) {
+				var result = resourceRequestHandler.Handle(request.Url, TranslateResourceType(request.ResourceType));
+
+				switch (result) {
+					case RequestHandleResult.Redirect redirect:
+						request.Url = redirect.Url;
+						break;
+
+					case RequestHandleResult.Process process:
+						request.SetHeaderByName("Accept-Encoding", "identity", overwrite: true);
+						responseProcessors[request.Identifier] = process.Processor;
+						break;
+
+					case RequestHandleResult.Cancel _:
+						callback.Dispose();
+						return CefReturnValue.Cancel;
+				}
+			}
+
+			return base.OnBeforeResourceLoad(chromiumWebBrowser, browser, frame, request, callback);
+		}
+
+		protected override IResourceHandler GetResourceHandler(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request) {
+			return resourceHandlerRegistry?.GetHandler(request.Url);
+		}
+
+		protected override IResponseFilter GetResourceResponseFilter(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IResponse response) {
+			if (responseProcessors.TryGetValue(request.Identifier, out var processor) && int.TryParse(response.Headers["Content-Length"], out int totalBytes)) {
+				return new ResponseFilter(processor, totalBytes);
+			}
+
+			return base.GetResourceResponseFilter(browserControl, browser, frame, request, response);
+		}
+
+		protected override void OnResourceLoadComplete(IWebBrowser chromiumWebBrowser, IBrowser browser, IFrame frame, IRequest request, IResponse response, UrlRequestStatus status, long receivedContentLength) {
+			responseProcessors.Remove(request.Identifier);
+			base.OnResourceLoadComplete(chromiumWebBrowser, browser, frame, request, response, status, receivedContentLength);
+		}
+
+		private static ResourceType TranslateResourceType(CefSharp.ResourceType resourceType) {
+			return resourceType switch {
+				CefSharp.ResourceType.MainFrame  => ResourceType.MainFrame,
+				CefSharp.ResourceType.Script     => ResourceType.Script,
+				CefSharp.ResourceType.Stylesheet => ResourceType.Stylesheet,
+				CefSharp.ResourceType.Xhr        => ResourceType.Xhr,
+				CefSharp.ResourceType.Image      => ResourceType.Image,
+				_                                => ResourceType.Unknown
+			};
+		}
+	}
+}

Browser/Adapters/CefSchemeHandlerFactory.cs

@@ -0,0 +1,29 @@
+using System;
+using CefSharp;
+using CefSharp.WinForms;
+using TweetLib.Browser.Interfaces;
+
+namespace TweetDuck.Browser.Adapters {
+	internal sealed class CefSchemeHandlerFactory : ISchemeHandlerFactory {
+		public static void Register(CefSettings settings, ICustomSchemeHandler handler) {
+			settings.RegisterScheme(new CefCustomScheme {
+				SchemeName = handler.Protocol,
+				IsStandard = false,
+				IsSecure = true,
+				IsCorsEnabled = true,
+				IsCSPBypassing = true,
+				SchemeHandlerFactory = new CefSchemeHandlerFactory(handler)
+			});
+		}
+
+		private readonly ICustomSchemeHandler handler;
+
+		private CefSchemeHandlerFactory(ICustomSchemeHandler handler) {
+			this.handler = handler;
+		}
+
+		public IResourceHandler Create(IBrowser browser, IFrame frame, string schemeName, IRequest request) {
+			return Uri.TryCreate(request.Url, UriKind.Absolute, out var uri) ? handler.Resolve(uri)?.Visit(CefSchemeResourceVisitor.Instance) : null;
+		}
+	}
+}

Browser/Adapters/CefSchemeResourceVisitor.cs

@@ -0,0 +1,38 @@
+using System;
+using System.IO;
+using System.Net;
+using CefSharp;
+using TweetLib.Browser.Interfaces;
+using TweetLib.Browser.Request;
+
+namespace TweetDuck.Browser.Adapters {
+	internal sealed class CefSchemeResourceVisitor : ISchemeResourceVisitor<IResourceHandler> {
+		public static CefSchemeResourceVisitor Instance { get; } = new CefSchemeResourceVisitor();
+
+		private static readonly SchemeResource.Status FileIsEmpty = new SchemeResource.Status(HttpStatusCode.NoContent, "File is empty.");
+
+		private CefSchemeResourceVisitor() {}
+
+		public IResourceHandler Status(SchemeResource.Status status) {
+			var handler = CreateHandler(Array.Empty<byte>());
+			handler.StatusCode = (int) status.Code;
+			handler.StatusText = status.Message;
+			return handler;
+		}
+
+		public IResourceHandler File(SchemeResource.File file) {
+			byte[] contents = file.Contents;
+			if (contents.Length == 0) {
+				return Status(FileIsEmpty); // FromByteArray crashes CEF internals with no contents
+			}
+
+			var handler = CreateHandler(contents);
+			handler.MimeType = Cef.GetMimeType(file.Extension);
+			return handler;
+		}
+
+		private static ResourceHandler CreateHandler(byte[] bytes) {
+			return ResourceHandler.FromStream(new MemoryStream(bytes), autoDisposeStream: true);
+		}
+	}
+}

Browser/Adapters/CefScriptExecutor.cs

@@ -1,41 +0,0 @@
-using System.IO;
-using CefSharp;
-using TweetLib.Core.Browser;
-
-namespace TweetDuck.Browser.Adapters{
-    sealed class CefScriptExecutor : IScriptExecutor{
-        private readonly IWebBrowser browser;
-
-        public CefScriptExecutor(IWebBrowser browser){
-            this.browser = browser;
-        }
-
-        public void RunFunction(string name, params object[] args){
-            browser.ExecuteScriptAsync(name, args);
-        }
-
-        public void RunScript(string identifier, string script){
-            using IFrame frame = browser.GetMainFrame();
-            RunScript(frame, script, identifier);
-        }
-
-        public bool RunFile(string file){
-            using IFrame frame = browser.GetMainFrame();
-            return RunFile(frame, file);
-        }
-
-        // Helpers
-
-        public static void RunScript(IFrame frame, string script, string identifier){
-            if (script != null){
-                frame.ExecuteJavaScriptAsync(script, identifier, 1);
-            }
-        }
-
-        public static bool RunFile(IFrame frame, string file){
-            string script = Program.Resources.Load(file);
-            RunScript(frame, script, "root:" + Path.GetFileNameWithoutExtension(file));
-            return script != null;
-        }
-    }
-}

Browser/Bridge/PropertyBridge.cs

@@ -1,38 +0,0 @@
-using System.Text;
-using TweetDuck.Configuration;
-using TweetLib.Core;
-using TweetLib.Core.Utils;
-
-namespace TweetDuck.Browser.Bridge{
-    static class PropertyBridge{
-        public enum Environment{
-            Browser, Notification
-        }
-
-        public static string GenerateScript(Environment environment){
-            static string Bool(bool value) => value ? "true;" : "false;";
-            static string Str(string value) => $"\"{value}\";";
-
-            UserConfig config = Program.Config.User;
-            StringBuilder build = new StringBuilder(384).Append("(function(x){");
-
-            build.Append("x.expandLinksOnHover=").Append(Bool(config.ExpandLinksOnHover));
-            
-            if (environment == Environment.Browser){
-                build.Append("x.focusDmInput=").Append(Bool(config.FocusDmInput));
-                build.Append("x.openSearchInFirstColumn=").Append(Bool(config.OpenSearchInFirstColumn));
-                build.Append("x.keepLikeFollowDialogsOpen=").Append(Bool(config.KeepLikeFollowDialogsOpen));
-                build.Append("x.muteNotifications=").Append(Bool(config.MuteNotifications));
-                build.Append("x.notificationMediaPreviews=").Append(Bool(config.NotificationMediaPreviews));
-                build.Append("x.translationTarget=").Append(Str(config.TranslationTarget));
-                build.Append("x.firstDayOfWeek=").Append(config.CalendarFirstDay == -1 ? LocaleUtils.GetJQueryDayOfWeek(Lib.Culture.DateTimeFormat.FirstDayOfWeek) : config.CalendarFirstDay);
-            }
-
-            if (environment == Environment.Notification){
-                build.Append("x.skipOnLinkClick=").Append(Bool(config.NotificationSkipOnLinkClick));
-            }
-            
-            return build.Append("})(window.$TDX=window.$TDX||{});if(window.TDGF_onPropertiesUpdated)window.TDGF_onPropertiesUpdated()").ToString();
-        }
-    }
-}

Browser/Bridge/TweetDeckBridge.cs

@@ -1,161 +0,0 @@
-using System;
-using System.Diagnostics.CodeAnalysis;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using CefSharp;
-using TweetDuck.Browser.Handling;
-using TweetDuck.Browser.Notification;
-using TweetDuck.Controls;
-using TweetDuck.Dialogs;
-using TweetDuck.Management;
-using TweetDuck.Utils;
-using TweetLib.Core.Features.Notifications;
-using TweetLib.Core.Utils;
-
-namespace TweetDuck.Browser.Bridge{
-    [SuppressMessage("ReSharper", "UnusedMember.Global")]
-    class TweetDeckBridge{
-        public static void ResetStaticProperties(){
-            FormNotificationBase.FontSize = null;
-            FormNotificationBase.HeadLayout = null;
-        }
-
-        private readonly FormBrowser form;
-        private readonly FormNotificationMain notification;
-
-        protected TweetDeckBridge(FormBrowser form, FormNotificationMain notification){
-            this.form = form;
-            this.notification = notification;
-        }
-
-        // Browser only
-
-        public sealed class Browser : TweetDeckBridge{
-            public Browser(FormBrowser form, FormNotificationMain notification) : base(form, notification){}
-
-            public void OpenContextMenu(){
-                form.InvokeAsyncSafe(form.OpenContextMenu);
-            }
-
-            public void OpenProfileImport(){
-                form.InvokeAsyncSafe(form.OpenProfileImport);
-            }
-            
-            public void OnIntroductionClosed(bool showGuide, bool allowDataCollection){
-                form.InvokeAsyncSafe(() => form.OnIntroductionClosed(showGuide, allowDataCollection));
-            }
-
-            public void LoadNotificationLayout(string fontSize, string headLayout){
-                form.InvokeAsyncSafe(() => {
-                    FormNotificationBase.FontSize = fontSize;
-                    FormNotificationBase.HeadLayout = headLayout;
-                });
-            }
-
-            public void SetRightClickedLink(string type, string url){
-                ContextMenuBase.CurrentInfo.SetLink(type, url);
-            }
-
-            public void SetRightClickedChirp(string tweetUrl, string quoteUrl, string chirpAuthors, string chirpImages){
-                ContextMenuBase.CurrentInfo.SetChirp(tweetUrl, quoteUrl, chirpAuthors, chirpImages);
-            }
-
-            public void DisplayTooltip(string text){
-                form.InvokeAsyncSafe(() => form.DisplayTooltip(text));
-            }
-        }
-
-        // Notification only
-        
-        public sealed class Notification : TweetDeckBridge{
-            public Notification(FormBrowser form, FormNotificationMain notification) : base(form, notification){}
-
-            public void DisplayTooltip(string text){
-                notification.InvokeAsyncSafe(() => notification.DisplayTooltip(text));
-            }
-
-            public void LoadNextNotification(){
-                notification.InvokeAsyncSafe(notification.FinishCurrentNotification);
-            }
-
-            public void ShowTweetDetail(){
-                notification.InvokeAsyncSafe(notification.ShowTweetDetail);
-            }
-        }
-
-        // Global
-
-        public void OnTweetPopup(string columnId, string chirpId, string columnName, string tweetHtml, int tweetCharacters, string tweetUrl, string quoteUrl){
-            notification.InvokeAsyncSafe(() => {
-                form.OnTweetNotification();
-                notification.ShowNotification(new DesktopNotification(columnId, chirpId, columnName, tweetHtml, tweetCharacters, tweetUrl, quoteUrl));
-            });
-        }
-
-        public void OnTweetSound(){
-            form.InvokeAsyncSafe(() => {
-                form.OnTweetNotification();
-                form.OnTweetSound();
-            });
-        }
-
-        public void ScreenshotTweet(string html, int width){
-            form.InvokeAsyncSafe(() => form.OnTweetScreenshotReady(html, width));
-        }
-
-        public void PlayVideo(string videoUrl, string tweetUrl, string username, IJavascriptCallback callShowOverlay){
-            form.InvokeAsyncSafe(() => form.PlayVideo(videoUrl, tweetUrl, username, callShowOverlay));
-        }
-        
-        public void StopVideo(){
-            form.InvokeAsyncSafe(form.StopVideo);
-        }
-
-        public void FixClipboard(){
-            form.InvokeAsyncSafe(ClipboardManager.StripHtmlStyles);
-        }
-
-        public void OpenBrowser(string url){
-            form.InvokeAsyncSafe(() => BrowserUtils.OpenExternalBrowser(url));
-        }
-
-        public void MakeGetRequest(string url, IJavascriptCallback onSuccess, IJavascriptCallback onError){
-            Task.Run(async () => {
-                var client = WebUtils.NewClient(BrowserUtils.UserAgentVanilla);
-
-                try{
-                    var result = await client.DownloadStringTaskAsync(url);
-                    await onSuccess.ExecuteAsync(result);
-                }catch(Exception e){
-                    await onError.ExecuteAsync(e.Message);
-                }finally{
-                    onSuccess.Dispose();
-                    onError.Dispose();
-                    client.Dispose();
-                }
-            });
-        }
-
-        public int GetIdleSeconds(){
-            return NativeMethods.GetIdleSeconds();
-        }
-
-        public void Alert(string type, string contents){
-            MessageBoxIcon icon = type switch{
-                "error"   => MessageBoxIcon.Error,
-                "warning" => MessageBoxIcon.Warning,
-                "info"    => MessageBoxIcon.Information,
-                _         => MessageBoxIcon.None
-            };
-
-            FormMessage.Show("TweetDuck Browser Message", contents, icon, FormMessage.OK);
-        }
-
-        public void CrashDebug(string message){
-            #if DEBUG
-            System.Diagnostics.Debug.WriteLine(message);
-            System.Diagnostics.Debugger.Break();
-            #endif
-        }
-    }
-}

Browser/Bridge/UpdateBridge.cs

@@ -1,65 +0,0 @@
-using System;
-using System.Diagnostics.CodeAnalysis;
-using System.Windows.Forms;
-using TweetDuck.Controls;
-using TweetLib.Core.Systems.Updates;
-
-namespace TweetDuck.Browser.Bridge{
-    [SuppressMessage("ReSharper", "UnusedMember.Global")]
-    class UpdateBridge{
-        private readonly UpdateHandler updates;
-        private readonly Control sync;
-
-        private UpdateInfo nextUpdate = null;
-
-        public event EventHandler<UpdateInfo> UpdateAccepted;
-        public event EventHandler<UpdateInfo> UpdateDismissed;
-
-        public UpdateBridge(UpdateHandler updates, Control sync){
-            this.sync = sync;
-
-            this.updates = updates;
-            this.updates.CheckFinished += updates_CheckFinished;
-        }
-
-        internal void Cleanup(){
-            updates.CheckFinished -= updates_CheckFinished;
-            nextUpdate?.DeleteInstaller();
-        }
-
-        private void updates_CheckFinished(object sender, UpdateCheckEventArgs e){
-            UpdateInfo foundUpdate = e.Result.HasValue ? e.Result.Value : null;
-
-            if (nextUpdate != null && !nextUpdate.Equals(foundUpdate)){
-                nextUpdate.DeleteInstaller();
-            }
-
-            nextUpdate = foundUpdate;
-        }
-
-        private void HandleInteractionEvent(EventHandler<UpdateInfo> eventHandler){
-            UpdateInfo tmpInfo = nextUpdate;
-
-            if (tmpInfo != null){
-                sync.InvokeAsyncSafe(() => eventHandler?.Invoke(this, tmpInfo));
-            }
-        }
-
-        // Bridge methods
-
-        public void TriggerUpdateCheck(){
-            updates.Check(false);
-        }
-
-        public void OnUpdateAccepted(){
-            HandleInteractionEvent(UpdateAccepted);
-        }
-
-        public void OnUpdateDismissed(){
-            HandleInteractionEvent(UpdateDismissed);
-
-            nextUpdate?.DeleteInstaller();
-            nextUpdate = null;
-        }
-    }
-}

Browser/Data/ContextInfo.cs

@@ -1,161 +0,0 @@
-using System;
-using CefSharp;
-using TweetLib.Core.Utils;
-
-namespace TweetDuck.Browser.Data{
-    sealed class ContextInfo{
-        private LinkInfo link;
-        private ChirpInfo? chirp;
-        
-        public ContextInfo(){
-            Reset();
-        }
-        
-        public void SetLink(string type, string url){
-            link = string.IsNullOrEmpty(url) ? null : new LinkInfo(type, url);
-        }
-
-        public void SetChirp(string tweetUrl, string quoteUrl, string chirpAuthors, string chirpImages){
-            chirp = string.IsNullOrEmpty(tweetUrl) ? (ChirpInfo?)null : new ChirpInfo(tweetUrl, quoteUrl, chirpAuthors, chirpImages);
-        }
-
-        public ContextData Reset(){
-            link = null;
-            chirp = null;
-            return ContextData.Empty;
-        }
-
-        public ContextData Create(IContextMenuParams parameters){
-            ContextData.Builder builder = new ContextData.Builder();
-            builder.AddContext(parameters);
-
-            if (link != null){
-                builder.AddOverride(link.Type, link.Url);
-            }
-            
-            if (chirp.HasValue){
-                builder.AddChirp(chirp.Value);
-            }
-
-            return builder.Build();
-        }
-
-        // Data structures
-
-        private sealed class LinkInfo{
-            public string Type { get; }
-            public string Url { get; }
-
-            public LinkInfo(string type, string url){
-                this.Type = type;
-                this.Url = url;
-            }
-        }
-
-        public struct ChirpInfo{
-            public string TweetUrl { get; }
-            public string QuoteUrl { get; }
-
-            public string[] Authors => chirpAuthors?.Split(';') ?? StringUtils.EmptyArray;
-            public string[] Images => chirpImages?.Split(';') ?? StringUtils.EmptyArray;
-            
-            private readonly string chirpAuthors;
-            private readonly string chirpImages;
-
-            public ChirpInfo(string tweetUrl, string quoteUrl, string chirpAuthors, string chirpImages){
-                this.TweetUrl = tweetUrl;
-                this.QuoteUrl = quoteUrl;
-                this.chirpAuthors = chirpAuthors;
-                this.chirpImages = chirpImages;
-            }
-        }
-
-        // Constructed context
-
-        [Flags]
-        public enum ContextType{
-            Unknown = 0,
-            Link    = 0b0001,
-            Image   = 0b0010,
-            Video   = 0b0100,
-            Chirp   = 0b1000
-        }
-
-        public sealed class ContextData{
-            public static readonly ContextData Empty = new Builder().Build();
-
-            public ContextType Types { get; }
-
-            public string LinkUrl { get; }
-            public string UnsafeLinkUrl { get; }
-            public string MediaUrl { get; }
-
-            public ChirpInfo Chirp { get; }
-
-            public ContextData(ContextType types, string linkUrl, string unsafeLinkUrl, string mediaUrl, ChirpInfo chirp){
-                Types = types;
-                LinkUrl = linkUrl;
-                UnsafeLinkUrl = unsafeLinkUrl;
-                MediaUrl = mediaUrl;
-                Chirp = chirp;
-            }
-
-            public sealed class Builder{
-                private ContextType types = ContextType.Unknown;
-
-                private string linkUrl = string.Empty;
-                private string unsafeLinkUrl = string.Empty;
-                private string mediaUrl = string.Empty;
-
-                private ChirpInfo chirp = default;
-
-                public void AddContext(IContextMenuParams parameters){
-                    ContextMenuType flags = parameters.TypeFlags;
-
-                    if (flags.HasFlag(ContextMenuType.Media) && parameters.HasImageContents){
-                        types |= ContextType.Image;
-                        types &= ~ContextType.Video;
-                        mediaUrl = parameters.SourceUrl;
-                    }
-
-                    if (flags.HasFlag(ContextMenuType.Link)){
-                        types |= ContextType.Link;
-                        linkUrl = parameters.LinkUrl;
-                        unsafeLinkUrl = parameters.UnfilteredLinkUrl;
-                    }
-                }
-
-                public void AddOverride(string type, string url){
-                    switch(type){
-                        case "link":
-                            types |= ContextType.Link;
-                            linkUrl = url;
-                            unsafeLinkUrl = url;
-                            break;
-
-                        case "image":
-                            types |= ContextType.Image;
-                            types &= ~(ContextType.Video | ContextType.Link);
-                            mediaUrl = url;
-                            break;
-
-                        case "video":
-                            types |= ContextType.Video;
-                            types &= ~(ContextType.Image | ContextType.Link);
-                            mediaUrl = url;
-                            break;
-                    }
-                }
-
-                public void AddChirp(ChirpInfo chirp){
-                    this.types |= ContextType.Chirp;
-                    this.chirp = chirp;
-                }
-
-                public ContextData Build(){
-                    return new ContextData(types, linkUrl, unsafeLinkUrl, mediaUrl, chirp);
-                }
-            }
-        }
-    }
-}

Browser/Data/ResourceHandlers.cs

@@ -1,50 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using CefSharp;
-
-namespace TweetDuck.Browser.Data{
-    sealed class ResourceHandlers{
-        private readonly ConcurrentDictionary<string, Func<IResourceHandler>> handlers = new ConcurrentDictionary<string, Func<IResourceHandler>>(StringComparer.OrdinalIgnoreCase);
-
-        public bool HasHandler(IRequest request){
-            return handlers.ContainsKey(request.Url);
-        }
-
-        public IResourceHandler GetHandler(IRequest request){
-            return handlers.TryGetValue(request.Url, out var factory) ? factory() : null;
-        }
-
-        public bool Register(string url, Func<IResourceHandler> factory){
-            if (Uri.TryCreate(url, UriKind.Absolute, out Uri uri)){
-                handlers.AddOrUpdate(uri.AbsoluteUri, factory, (key, prev) => factory);
-                return true;
-            }
-
-            return false;
-        }
-
-        public bool Register(ResourceLink link){
-            return Register(link.Url, link.Factory);
-        }
-
-        public bool Unregister(string url){
-            return handlers.TryRemove(url, out _);
-        }
-
-        public bool Unregister(ResourceLink link){
-            return Unregister(link.Url);
-        }
-
-        public static Func<IResourceHandler> ForString(string str){
-            return () => ResourceHandler.FromString(str);
-        }
-
-        public static Func<IResourceHandler> ForString(string str, string mimeType){
-            return () => ResourceHandler.FromString(str, mimeType: mimeType);
-        }
-
-        public static Func<IResourceHandler> ForBytes(byte[] bytes, string mimeType){
-            return () => ResourceHandler.FromByteArray(bytes, mimeType);
-        }
-    }
-}

Browser/Data/ResourceLink.cs

@@ -1,14 +0,0 @@
-using System;
-using CefSharp;
-
-namespace TweetDuck.Browser.Data{
-    sealed class ResourceLink{
-        public string Url { get; }
-        public Func<IResourceHandler> Factory { get; }
-
-        public ResourceLink(string url, Func<IResourceHandler> factory){
-            this.Url = url;
-            this.Factory = factory;
-        }
-    }
-}

Browser/Data/WindowState.cs

@@ -1,42 +0,0 @@
-using System.Drawing;
-using System.Windows.Forms;
-using TweetDuck.Controls;
-using TweetLib.Core.Serialization.Converters;
-using TweetLib.Core.Utils;
-
-namespace TweetDuck.Browser.Data{
-    sealed class WindowState{
-        private Rectangle rect;
-        private bool isMaximized;
-
-        public void Save(Form form){
-            rect = form.WindowState == FormWindowState.Normal ? form.DesktopBounds : form.RestoreBounds;
-            isMaximized = form.WindowState == FormWindowState.Maximized;
-        }
-
-        public void Restore(Form form, bool firstTimeFullscreen){
-            if (rect != Rectangle.Empty){
-                form.DesktopBounds = rect;
-                form.WindowState = isMaximized ? FormWindowState.Maximized : FormWindowState.Normal;
-            }
-
-            if ((rect == Rectangle.Empty && firstTimeFullscreen) || form.IsFullyOutsideView()){
-                form.DesktopBounds = Screen.PrimaryScreen.WorkingArea;
-                form.WindowState = FormWindowState.Maximized;
-                Save(form);
-            }
-        }
-
-        public static readonly SingleTypeConverter<WindowState> Converter = new SingleTypeConverter<WindowState>{
-            ConvertToString = value => $"{(value.isMaximized ? 'M' : '_')}{value.rect.X} {value.rect.Y} {value.rect.Width} {value.rect.Height}",
-            ConvertToObject = value => {
-                int[] elements = StringUtils.ParseInts(value.Substring(1), ' ');
-                
-                return new WindowState{
-                    rect = new Rectangle(elements[0], elements[1], elements[2], elements[3]),
-                    isMaximized = value[0] == 'M'
-                };
-            }
-        };
-    }
-}

Browser/FormBrowser.Designer.cs

@@ -27,7 +27,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.BackColor = TweetDuck.Utils.TwitterUtils.BackgroundColor;
+            this.BackColor = TweetDuck.Browser.TweetDeckBrowser.BackgroundColor;
             this.ClientSize = new System.Drawing.Size(1008, 730);
             this.Icon = Properties.Resources.icon;
             this.Location = TweetDuck.Controls.ControlExtensions.InvisibleLocation;

Browser/FormBrowser.cs

@@ -2,12 +2,11 @@
 using System.Diagnostics;
 using System.Drawing;
 using System.IO;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using CefSharp;
-using TweetDuck.Browser.Bridge;
 using TweetDuck.Browser.Handling;
-using TweetDuck.Browser.Handling.General;
 using TweetDuck.Browser.Notification;
 using TweetDuck.Browser.Notification.Screenshot;
 using TweetDuck.Configuration;
@@ -15,16 +14,18 @@ using TweetDuck.Controls;
 using TweetDuck.Dialogs;
 using TweetDuck.Dialogs.Settings;
 using TweetDuck.Management;
-using TweetDuck.Management.Analytics;
-using TweetDuck.Plugins;
 using TweetDuck.Updates;
 using TweetDuck.Utils;
+using TweetLib.Core;
+using TweetLib.Core.Features.Notifications;
 using TweetLib.Core.Features.Plugins;
-using TweetLib.Core.Features.Plugins.Events;
+using TweetLib.Core.Features.TweetDeck;
+using TweetLib.Core.Resources;
+using TweetLib.Core.Systems.Configuration;
 using TweetLib.Core.Systems.Updates;
 
 namespace TweetDuck.Browser {
-    sealed partial class FormBrowser : Form, AnalyticsFile.IProvider{
+	sealed partial class FormBrowser : Form, CustomKeyboardHandler.IBrowserKeyHandler {
 		private static UserConfig Config => Program.Config.User;
 
 		public bool IsWaiting {
@@ -45,64 +46,61 @@ namespace TweetDuck.Browser{
 		}
 
 		public UpdateInstaller UpdateInstaller { get; private set; }
-        private bool ignoreUpdateCheckError;
-        
-        public AnalyticsFile AnalyticsFile => analytics?.File ?? AnalyticsFile.Dummy;
 
 		#pragma warning disable IDE0069 // Disposable fields should be disposed
 		private readonly TweetDeckBrowser browser;
 		private readonly FormNotificationTweet notification;
 		#pragma warning restore IDE0069 // Disposable fields should be disposed
 
+		private readonly ResourceCache resourceCache;
+		private readonly ITweetDeckInterface tweetDeckInterface;
 		private readonly PluginManager plugins;
-        private readonly UpdateHandler updates;
+		private readonly UpdateChecker updates;
 		private readonly ContextMenu contextMenu;
-        private readonly UpdateBridge updateBridge;
+		private readonly uint windowRestoreMessage;
 
 		private bool isLoaded;
 		private FormWindowState prevState;
 
 		private TweetScreenshotManager notificationScreenshotManager;
 		private VideoPlayer videoPlayer;
-        private AnalyticsManager analytics;
 
-        public FormBrowser(PluginSchemeFactory pluginScheme){
+		public FormBrowser(ResourceCache resourceCache, PluginManager pluginManager, IUpdateCheckClient updateCheckClient, uint windowRestoreMessage) {
 			InitializeComponent();
 
 			Text = Program.BrandName;
 
-            this.plugins = new PluginManager(Program.Config.Plugins, Program.PluginPath, Program.PluginDataPath);
-            this.plugins.Reloaded += plugins_Reloaded;
-            this.plugins.Executed += plugins_Executed;
-            this.plugins.Reload();
-            pluginScheme.Setup(plugins);
+			this.resourceCache = resourceCache;
 
-            this.notification = new FormNotificationTweet(this, plugins);
+			this.plugins = pluginManager;
+
+			this.tweetDeckInterface = new TweetDeckInterfaceImpl(this);
+
+			this.notification = new FormNotificationTweet(this, tweetDeckInterface, plugins);
 			this.notification.Show();
 
-            this.updates = new UpdateHandler(new UpdateCheckClient(Program.InstallerPath), TaskScheduler.FromCurrentSynchronizationContext());
-            this.updates.CheckFinished += updates_CheckFinished;
+			this.updates = new UpdateChecker(updateCheckClient, TaskScheduler.FromCurrentSynchronizationContext());
+			this.updates.InteractionManager.UpdateAccepted += updateInteractionManager_UpdateAccepted;
+			this.updates.InteractionManager.UpdateDismissed += updateInteractionManager_UpdateDismissed;
 
-            this.updateBridge = new UpdateBridge(updates, this);
-            this.updateBridge.UpdateAccepted += updateBridge_UpdateAccepted;
-            this.updateBridge.UpdateDismissed += updateBridge_UpdateDismissed;
-
-            this.browser = new TweetDeckBrowser(this, plugins, new TweetDeckBridge.Browser(this, notification), updateBridge);
+			this.browser = new TweetDeckBrowser(this, plugins, tweetDeckInterface, updates);
 			this.contextMenu = ContextMenuBrowser.CreateMenu(this);
 
+			this.windowRestoreMessage = windowRestoreMessage;
+
 			Controls.Add(new MenuStrip { Visible = false }); // fixes Alt freezing the program in Win 10 Anniversary Update
 
+			Config.MuteToggled += Config_MuteToggled;
+			Config.TrayBehaviorChanged += Config_TrayBehaviorChanged;
+
 			Disposed += (sender, args) => {
 				Config.MuteToggled -= Config_MuteToggled;
 				Config.TrayBehaviorChanged -= Config_TrayBehaviorChanged;
 				browser.Dispose();
 			};
 
-            Config.MuteToggled += Config_MuteToggled;
-
 			this.trayIcon.ClickRestore += trayIcon_ClickRestore;
 			this.trayIcon.ClickClose += trayIcon_ClickClose;
-            Config.TrayBehaviorChanged += Config_TrayBehaviorChanged;
 
 			UpdateTray();
 
@@ -110,10 +108,6 @@ namespace TweetDuck.Browser{
 				UpdateFormIcon();
 			}
 
-            if (Config.AllowDataCollection){
-                analytics = new AnalyticsManager(this, plugins, Program.AnalyticsFilePath);
-            }
-
 			RestoreWindow();
 		}
 
@@ -126,7 +120,6 @@ namespace TweetDuck.Browser{
 
 				notificationScreenshotManager?.Dispose();
 				videoPlayer?.Dispose();
-                analytics?.Dispose();
 			}
 
 			base.Dispose(disposing);
@@ -237,13 +230,13 @@ namespace TweetDuck.Browser{
 
 		private void FormBrowser_FormClosed(object sender, FormClosedEventArgs e) {
 			if (isLoaded && UpdateInstaller == null) {
-                updateBridge.Cleanup();
+				updates.InteractionManager.ClearUpdate();
+				updates.InteractionManager.Dispose();
 			}
 		}
 
 		private void Config_MuteToggled(object sender, EventArgs e) {
 			UpdateFormIcon();
-            AnalyticsFile.NotificationMutes.Trigger();
 		}
 
 		private void Config_TrayBehaviorChanged(object sender, EventArgs e) {
@@ -261,46 +254,8 @@ namespace TweetDuck.Browser{
 			ForceClose();
 		}
 
-        private void plugins_Reloaded(object sender, PluginErrorEventArgs e){
-            if (e.HasErrors){
-                FormMessage.Error("Error Loading Plugins", "The following plugins will not be available until the issues are resolved:\n\n" + string.Join("\n\n", e.Errors), FormMessage.OK);
-            }
-
-            if (isLoaded){
-                browser.ReloadToTweetDeck();
-            }
-        }
-        
-        private void plugins_Executed(object sender, PluginErrorEventArgs e){
-            if (e.HasErrors){
+		private void updateInteractionManager_UpdateAccepted(object sender, UpdateInfo update) {
 			this.InvokeAsyncSafe(() => {
-                    FormMessage.Error("Error Executing Plugins", "Failed to execute the following plugins:\n\n" + string.Join("\n\n", e.Errors), FormMessage.OK);
-                });
-            }
-        }
-
-        private void updates_CheckFinished(object sender, UpdateCheckEventArgs e){
-            e.Result.Handle(update => {
-                string tag = update.VersionTag;
-
-                if (tag != Program.VersionTag && tag != Config.DismissedUpdate){
-                    update.BeginSilentDownload();
-                    browser.ShowUpdateNotification(tag, update.ReleaseNotes);
-                }
-                else{
-                    updates.StartTimer();
-                }
-            }, ex => {
-                if (!ignoreUpdateCheckError){
-                    Program.Reporter.HandleException("Update Check Error", "An error occurred while checking for updates.", true, ex);
-                    updates.StartTimer();
-                }
-            });
-
-            ignoreUpdateCheckError = true;
-        }
-
-        private void updateBridge_UpdateAccepted(object sender, UpdateInfo update){
 				FormManager.CloseAllDialogs();
 
 				if (!string.IsNullOrEmpty(Config.DismissedUpdate)) {
@@ -316,7 +271,7 @@ namespace TweetDuck.Browser{
 						ForceClose();
 					}
 					else if (status != UpdateDownloadStatus.Canceled && FormMessage.Error("Update Has Failed", "Could not automatically download the update: " + (update.DownloadError?.Message ?? "unknown error") + "\n\nWould you like to open the website and try downloading the update manually?", FormMessage.Yes, FormMessage.No)) {
-                    BrowserUtils.OpenExternalBrowser(Program.Website);
+						App.SystemHandler.OpenBrowser(Program.Website);
 						ForceClose();
 					}
 					else {
@@ -346,15 +301,18 @@ namespace TweetDuck.Browser{
 
 					downloadForm.Show();
 				}
+			});
 		}
 
-        private void updateBridge_UpdateDismissed(object sender, UpdateInfo update){
+		private void updateInteractionManager_UpdateDismissed(object sender, UpdateInfo update) {
+			this.InvokeAsyncSafe(() => {
 				Config.DismissedUpdate = update.VersionTag;
 				Config.Save();
+			});
 		}
 
 		protected override void WndProc(ref Message m) {
-            if (isLoaded && m.Msg == Program.WindowRestoreMessage){
+			if (isLoaded && m.Msg == windowRestoreMessage) {
 				using Process me = Process.GetCurrentProcess();
 
 				if (me.Id == m.WParam.ToInt32()) {
@@ -365,12 +323,11 @@ namespace TweetDuck.Browser{
 			}
 
 			if (browser.Ready && m.Msg == NativeMethods.WM_PARENTNOTIFY && (m.WParam.ToInt32() & 0xFFFF) == NativeMethods.WM_XBUTTONDOWN) {
-                if (videoPlayer != null && videoPlayer.Running){
+				if (videoPlayer is { Running: true }) {
 					videoPlayer.Close();
 				}
 				else {
-                    browser.OnMouseClickExtra(m.WParam);
-                    AnalyticsFile.BrowserExtraMouseButtons.Trigger();
+					browser.Functions.OnMouseClickExtra((m.WParam.ToInt32() >> 16) & 0xFFFF);
 				}
 
 				return;
@@ -389,36 +346,17 @@ namespace TweetDuck.Browser{
 			notification.ResumeNotification();
 		}
 
-        public void ReinjectCustomCSS(string css){
-            browser.ReinjectCustomCSS(css);
-        }
-
 		public void ReloadToTweetDeck() {
-            Program.Resources.OnReloadTriggered();
-            ignoreUpdateCheckError = false;
+			#if DEBUG
+			Resources.ResourceHotSwap.Run();
+			resourceCache.ClearCache();
+			#else
+			if (ModifierKeys.HasFlag(Keys.Shift)) {
+				resourceCache.ClearCache();
+			}
+			#endif
+
 			browser.ReloadToTweetDeck();
-            AnalyticsFile.BrowserReloads.Trigger();
-        }
-
-        public void AddSearchColumn(string query){
-            browser.AddSearchColumn(query);
-        }
-
-        public void TriggerTweetScreenshot(){
-            browser.TriggerTweetScreenshot();
-        }
-
-        public void ReloadColumns(){
-            browser.ReloadColumns();
-        }
-
-        public void PlaySoundNotification(){
-            browser.PlaySoundNotification();
-        }
-
-        public void ApplyROT13(){
-            browser.ApplyROT13();
-            AnalyticsFile.UsedROT13.Trigger();
 		}
 
 		public void OpenDevTools() {
@@ -427,15 +365,10 @@ namespace TweetDuck.Browser{
 
 		// callback handlers
 
-        public void OnIntroductionClosed(bool showGuide, bool allowDataCollection){
+		private void OnIntroductionClosed(bool showGuide) {
 			if (Config.FirstRun) {
 				Config.FirstRun = false;
-                Config.AllowDataCollection = allowDataCollection;
 				Config.Save();
-
-                if (allowDataCollection && analytics == null){
-                    analytics = new AnalyticsManager(this, plugins, Program.AnalyticsFilePath);
-                }
 			}
 
 			if (showGuide) {
@@ -443,7 +376,7 @@ namespace TweetDuck.Browser{
 			}
 		}
 
-        public void OpenContextMenu(){
+		private void OpenContextMenu() {
 			contextMenu.Show(this, PointToClient(Cursor.Position));
 		}
 
@@ -455,7 +388,7 @@ namespace TweetDuck.Browser{
 			if (!FormManager.TryBringToFront<FormSettings>()) {
 				bool prevEnableUpdateCheck = Config.EnableUpdateCheck;
 
-                FormSettings form = new FormSettings(this, plugins, updates, analytics, startTab);
+				FormSettings form = new FormSettings(this, plugins, updates, browser.Functions, startTab);
 
 				form.FormClosed += (sender, args) => {
 					if (!prevEnableUpdateCheck && Config.EnableUpdateCheck) {
@@ -469,16 +402,6 @@ namespace TweetDuck.Browser{
 						trayIcon.HasNotifications = false;
 					}
 
-                    if (Config.AllowDataCollection){
-                        if (analytics == null){
-                            analytics = new AnalyticsManager(this, plugins, Program.AnalyticsFilePath);
-                        }
-                    }
-                    else if (analytics != null){
-                        analytics.Dispose();
-                        analytics = null;
-                    }
-
 					BrowserCache.RefreshTimer();
 
 					if (form.ShouldReloadBrowser) {
@@ -486,33 +409,30 @@ namespace TweetDuck.Browser{
 						plugins.Reload(); // also reloads the browser
 					}
 					else {
-                        browser.UpdateProperties();
+						Program.Config.User.TriggerOptionsDialogClosed();
 					}
 
 					notification.RequiresResize = true;
 					form.Dispose();
 				};
 
-                AnalyticsFile.OpenOptions.Trigger();
 				ShowChildForm(form);
 			}
 		}
 
 		public void OpenAbout() {
 			if (!FormManager.TryBringToFront<FormAbout>()) {
-                AnalyticsFile.OpenAbout.Trigger();
 				ShowChildForm(new FormAbout());
 			}
 		}
 
 		public void OpenPlugins() {
 			if (!FormManager.TryBringToFront<FormPlugins>()) {
-                AnalyticsFile.OpenPlugins.Trigger();
 				ShowChildForm(new FormPlugins(plugins));
 			}
 		}
 
-        public void OpenProfileImport(){
+		private void OpenProfileImport() {
 			FormManager.TryFind<FormSettings>()?.Close();
 
 			using DialogSettingsManage dialog = new DialogSettingsManage(plugins, true);
@@ -524,17 +444,25 @@ namespace TweetDuck.Browser{
 			}
 		}
 
-        public void OnTweetNotification(){ // may be called multiple times, once for each type of notification
+		private void ShowDesktopNotification(DesktopNotification notification) {
+			this.notification.ShowNotification(notification);
+		}
+
+		private void OnTweetNotification() { // may be called multiple times, once for each type of notification
 			if (Config.EnableTrayHighlight && !ContainsFocus) {
 				trayIcon.HasNotifications = true;
 			}
 		}
 
-        public void OnTweetSound(){
-            AnalyticsFile.SoundNotifications.Trigger();
+		public void SaveVideo(string url, string username) {
+			browser.SaveVideo(url, username);
+		}
+
+		private void PlayVideo(string videoUrl, string tweetUrl, string username, IJavascriptCallback callShowOverlay) {
+			if (Arguments.HasFlag(Arguments.ArgHttpVideo)) {
+				videoUrl = Regex.Replace(videoUrl, "^https://", "http://");
 			}
 
-        public void PlayVideo(string videoUrl, string tweetUrl, string username, IJavascriptCallback callShowOverlay){
 			string playerPath = Config.VideoPlayerPath;
 
 			if (playerPath == null || !File.Exists(playerPath)) {
@@ -557,49 +485,33 @@ namespace TweetDuck.Browser{
 				try {
 					using (Process.Start(playerPath, playerArgs)) {}
 				} catch (Exception e) {
-                    Program.Reporter.HandleException("Error Opening Video Player", "Could not open the video player.", true, e);
+					App.ErrorHandler.HandleException("Error Opening Video Player", "Could not open the video player.", true, e);
+				}
 			}
 		}
 
-            AnalyticsFile.VideoPlays.Trigger();
-        }
-
-        public void StopVideo(){
+		private void StopVideo() {
 			videoPlayer?.Close();
 		}
 
-        public bool ProcessBrowserKey(Keys key){
-            if (videoPlayer != null && videoPlayer.Running){
-                videoPlayer.SendKeyEvent(key);
-                return true;
-            }
-
-            return false;
-        }
-
-        public void ShowTweetDetail(string columnId, string chirpId, string fallbackUrl){
+		public bool ShowTweetDetail(string columnId, string chirpId, string fallbackUrl) {
 			Activate();
 
 			if (!browser.IsTweetDeckWebsite) {
 				FormMessage.Error("View Tweet Detail", "TweetDeck is not currently loaded.", FormMessage.OK);
-                return;
+				return false;
 			}
 
-            notification.FinishCurrentNotification();
-            browser.ShowTweetDetail(columnId, chirpId, fallbackUrl);
-            AnalyticsFile.TweetDetails.Trigger();
-        }
-
-        public void OnTweetScreenshotReady(string html, int width){
-            if (notificationScreenshotManager == null){
-                notificationScreenshotManager = new TweetScreenshotManager(this, plugins);
+			browser.Functions.ShowTweetDetail(columnId, chirpId, fallbackUrl);
+			return true;
 		}
 
+		private void OnTweetScreenshotReady(string html, int width) {
+			notificationScreenshotManager ??= new TweetScreenshotManager(this, plugins);
 			notificationScreenshotManager.Trigger(html, width);
-            AnalyticsFile.TweetScreenshots.Trigger();
 		}
 
-        public void DisplayTooltip(string text){
+		private void DisplayTooltip(string text) {
 			if (string.IsNullOrEmpty(text)) {
 				toolTip.Hide(this);
 			}
@@ -609,5 +521,88 @@ namespace TweetDuck.Browser{
 				toolTip.Show(text, this, position);
 			}
 		}
+
+		public FormNotificationExample CreateExampleNotification() {
+			return new FormNotificationExample(this, tweetDeckInterface, plugins);
+		}
+
+		bool CustomKeyboardHandler.IBrowserKeyHandler.HandleBrowserKey(Keys key) {
+			if (videoPlayer is { Running: true }) {
+				videoPlayer.SendKeyEvent(key);
+				return true;
+			}
+
+			return false;
+		}
+
+		private sealed class TweetDeckInterfaceImpl : ITweetDeckInterface {
+			private readonly FormBrowser form;
+
+			public TweetDeckInterfaceImpl(FormBrowser form) {
+				this.form = form;
+			}
+
+			public void Alert(string type, string contents) {
+				MessageBoxIcon icon = type switch {
+					"error"   => MessageBoxIcon.Error,
+					"warning" => MessageBoxIcon.Warning,
+					"info"    => MessageBoxIcon.Information,
+					_         => MessageBoxIcon.None
+				};
+
+				FormMessage.Show("TweetDuck Browser Message", contents, icon, FormMessage.OK);
+			}
+
+			public void DisplayTooltip(string text) {
+				form.InvokeAsyncSafe(() => form.DisplayTooltip(text));
+			}
+
+			public void FixClipboard() {
+				form.InvokeAsyncSafe(ClipboardManager.StripHtmlStyles);
+			}
+
+			public int GetIdleSeconds() {
+				return NativeMethods.GetIdleSeconds();
+			}
+
+			public void OnIntroductionClosed(bool showGuide) {
+				form.InvokeAsyncSafe(() => form.OnIntroductionClosed(showGuide));
+			}
+
+			public void OnSoundNotification() {
+				form.InvokeAsyncSafe(form.OnTweetNotification);
+			}
+
+			public void OpenContextMenu() {
+				form.InvokeAsyncSafe(form.OpenContextMenu);
+			}
+
+			public void OpenProfileImport() {
+				form.InvokeAsyncSafe(form.OpenProfileImport);
+			}
+
+			public void PlayVideo(string videoUrl, string tweetUrl, string username, object callShowOverlay) {
+				form.InvokeAsyncSafe(() => form.PlayVideo(videoUrl, tweetUrl, username, (IJavascriptCallback) callShowOverlay));
+			}
+
+			public void ScreenshotTweet(string html, int width) {
+				form.InvokeAsyncSafe(() => form.OnTweetScreenshotReady(html, width));
+			}
+
+			public void ShowDesktopNotification(DesktopNotification notification) {
+				form.InvokeAsyncSafe(() => {
+					form.OnTweetNotification();
+					form.ShowDesktopNotification(notification);
+				});
+			}
+
+			public void StopVideo() {
+				form.InvokeAsyncSafe(form.StopVideo);
+			}
+
+			public Task ExecuteCallback(object callback, params object[] parameters) {
+				return ((IJavascriptCallback) callback).ExecuteAsync(parameters);
+			}
+		}
 	}
 }

Browser/Handling/BrowserProcessHandler.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Threading.Tasks;
+using CefSharp;
+using TweetDuck.Configuration;
+
+namespace TweetDuck.Browser.Handling {
+	sealed class BrowserProcessHandler : IBrowserProcessHandler {
+		public static Task UpdatePrefs() {
+			return Cef.UIThreadTaskFactory.StartNew(UpdatePrefsInternal);
+		}
+
+		private static void UpdatePrefsInternal() {
+			UserConfig config = Program.Config.User;
+			using IRequestContext ctx = Cef.GetGlobalRequestContext();
+
+			ctx.SetPreference("browser.enable_spellchecking", config.EnableSpellCheck, out string _);
+			ctx.SetPreference("spellcheck.dictionary", config.SpellCheckLanguage, out string _);
+			ctx.SetPreference("settings.a11y.animation_policy", config.EnableAnimatedImages ? "allowed" : "none", out string _);
+		}
+
+		void IBrowserProcessHandler.OnContextInitialized() {
+			UpdatePrefsInternal();
+		}
+
+		void IBrowserProcessHandler.OnScheduleMessagePumpWork(long delay) {}
+		void IDisposable.Dispose() {}
+	}
+}

Browser/Handling/ContextMenuBase.cs

@@ -1,229 +1,94 @@
-using System;
-using System.Linq;
-using System.Text.RegularExpressions;
-using System.Windows.Forms;
+using System.Collections.Generic;
+using System.Drawing;
 using CefSharp;
 using TweetDuck.Browser.Adapters;
-using TweetDuck.Browser.Data;
-using TweetDuck.Browser.Notification;
 using TweetDuck.Configuration;
-using TweetDuck.Controls;
-using TweetDuck.Dialogs;
-using TweetDuck.Management;
-using TweetDuck.Management.Analytics;
 using TweetDuck.Utils;
-using TweetLib.Core.Features.Twitter;
-using TweetLib.Core.Utils;
+using TweetLib.Browser.Contexts;
 
 namespace TweetDuck.Browser.Handling {
 	abstract class ContextMenuBase : IContextMenuHandler {
-        public static ContextInfo CurrentInfo { get; } = new ContextInfo();
+		private const CefMenuCommand MenuOpenDevTools = (CefMenuCommand) 26500;
+
+		private static readonly HashSet<CefMenuCommand> AllowedCefCommands = new HashSet<CefMenuCommand> {
+			CefMenuCommand.NotFound,
+			CefMenuCommand.Undo,
+			CefMenuCommand.Redo,
+			CefMenuCommand.Cut,
+			CefMenuCommand.Copy,
+			CefMenuCommand.Paste,
+			CefMenuCommand.Delete,
+			CefMenuCommand.SelectAll,
+			CefMenuCommand.SpellCheckSuggestion0,
+			CefMenuCommand.SpellCheckSuggestion1,
+			CefMenuCommand.SpellCheckSuggestion2,
+			CefMenuCommand.SpellCheckSuggestion3,
+			CefMenuCommand.SpellCheckSuggestion4,
+			CefMenuCommand.SpellCheckNoSuggestions,
+			CefMenuCommand.AddToDictionary
+		};
 
 		protected static UserConfig Config => Program.Config.User;
-        private static ImageQuality ImageQuality => Config.TwitterImageQuality;
 
-        private const CefMenuCommand MenuOpenLinkUrl     = (CefMenuCommand)26500;
-        private const CefMenuCommand MenuCopyLinkUrl     = (CefMenuCommand)26501;
-        private const CefMenuCommand MenuCopyUsername    = (CefMenuCommand)26502;
-        private const CefMenuCommand MenuViewImage       = (CefMenuCommand)26503;
-        private const CefMenuCommand MenuOpenMediaUrl    = (CefMenuCommand)26504;
-        private const CefMenuCommand MenuCopyMediaUrl    = (CefMenuCommand)26505;
-        private const CefMenuCommand MenuCopyImage       = (CefMenuCommand)26506;
-        private const CefMenuCommand MenuSaveMedia       = (CefMenuCommand)26507;
-        private const CefMenuCommand MenuSaveTweetImages = (CefMenuCommand)26508;
-        private const CefMenuCommand MenuSearchInBrowser = (CefMenuCommand)26509;
-        private const CefMenuCommand MenuReadApplyROT13  = (CefMenuCommand)26510;
-        private const CefMenuCommand MenuOpenDevTools    = (CefMenuCommand)26599;
+		private readonly TweetLib.Browser.Interfaces.IContextMenuHandler handler;
+		private readonly CefContextMenuActionRegistry actionRegistry;
 
-        protected ContextInfo.ContextData Context { get; private set; }
+		protected ContextMenuBase(TweetLib.Browser.Interfaces.IContextMenuHandler handler) {
+			this.handler = handler;
+			this.actionRegistry = new CefContextMenuActionRegistry();
+		}
 
-        private readonly AnalyticsFile.IProvider analytics;
-
-        protected ContextMenuBase(AnalyticsFile.IProvider analytics){
-            this.analytics = analytics;
+		protected virtual Context CreateContext(IContextMenuParams parameters) {
+			return CefContextMenuModel.CreateContext(parameters, null, Config.TwitterImageQuality);
 		}
 
 		public virtual void OnBeforeContextMenu(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model) {
-            if (!TwitterUrls.IsTweetDeck(frame.Url) || browser.IsLoading){
-                Context = CurrentInfo.Reset();
+			for (int i = model.Count - 1; i >= 0; i--) {
+				CefMenuCommand command = model.GetCommandIdAt(i);
+
+				if (!AllowedCefCommands.Contains(command) && !(command >= CefMenuCommand.CustomFirst && command <= CefMenuCommand.CustomLast)) {
+					model.RemoveAt(i);
 				}
-            else{
-                Context = CurrentInfo.Create(parameters);
 			}
 
-            if (parameters.TypeFlags.HasFlag(ContextMenuType.Selection) && !parameters.TypeFlags.HasFlag(ContextMenuType.Editable)){
-                model.AddItem(MenuSearchInBrowser, "Search in browser");
-                model.AddSeparator();
-                model.AddItem(MenuReadApplyROT13, "Apply ROT13");
-                model.AddSeparator();
+			for (int i = model.Count - 2; i >= 0; i--) {
+				if (model.GetTypeAt(i) == MenuItemType.Separator && model.GetTypeAt(i + 1) == MenuItemType.Separator) {
+					model.RemoveAt(i);
+				}
 			}
 
-            static string TextOpen(string name) => "Open " + name + " in browser";
-            static string TextCopy(string name) => "Copy " + name + " address";
-            static string TextSave(string name) => "Save " + name + " as...";
-            
-            if (Context.Types.HasFlag(ContextInfo.ContextType.Link) && !Context.UnsafeLinkUrl.EndsWith("tweetdeck.twitter.com/#", StringComparison.Ordinal)){
-                if (TwitterUrls.RegexAccount.IsMatch(Context.UnsafeLinkUrl)){
-                    model.AddItem(MenuOpenLinkUrl, TextOpen("account"));
-                    model.AddItem(MenuCopyLinkUrl, TextCopy("account"));
-                    model.AddItem(MenuCopyUsername, "Copy account username");
-                }
-                else{
-                    model.AddItem(MenuOpenLinkUrl, TextOpen("link"));
-                    model.AddItem(MenuCopyLinkUrl, TextCopy("link"));
+			if (model.Count > 0 && model.GetTypeAt(0) == MenuItemType.Separator) {
+				model.RemoveAt(0);
 			}
 
-                model.AddSeparator();
-            }
-
-            if (Context.Types.HasFlag(ContextInfo.ContextType.Video)){
-                model.AddItem(MenuOpenMediaUrl, TextOpen("video"));
-                model.AddItem(MenuCopyMediaUrl, TextCopy("video"));
-                model.AddItem(MenuSaveMedia, TextSave("video"));
-                model.AddSeparator();
-            }
-            else if (Context.Types.HasFlag(ContextInfo.ContextType.Image) && Context.MediaUrl != FormNotificationBase.AppLogo.Url){
-                model.AddItem(MenuViewImage, "View image in photo viewer");
-                model.AddItem(MenuOpenMediaUrl, TextOpen("image"));
-                model.AddItem(MenuCopyMediaUrl, TextCopy("image"));
-                model.AddItem(MenuCopyImage, "Copy image");
-                model.AddItem(MenuSaveMedia, TextSave("image"));
-
-                if (Context.Chirp.Images.Length > 1){
-                    model.AddItem(MenuSaveTweetImages, TextSave("all images"));
-                }
-
-                model.AddSeparator();
-            }
+			AddSeparator(model);
+			handler.Show(new CefContextMenuModel(model, actionRegistry), CreateContext(parameters));
+			RemoveSeparatorIfLast(model);
 		}
 
 		public virtual bool OnContextMenuCommand(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, CefMenuCommand commandId, CefEventFlags eventFlags) {
-            Control control = browserControl.AsControl();
-
-            switch(commandId){
-                case MenuOpenLinkUrl:
-                    OpenBrowser(control, Context.LinkUrl);
-                    break;
-
-                case MenuCopyLinkUrl:
-                    SetClipboardText(control, Context.UnsafeLinkUrl);
-                    break;
-
-                case MenuCopyUsername: {
-                    string url = Context.UnsafeLinkUrl;
-                    Match match = TwitterUrls.RegexAccount.Match(url);
-
-                    SetClipboardText(control, match.Success ? match.Groups[1].Value : url);
-                    control.InvokeAsyncSafe(analytics.AnalyticsFile.CopiedUsernames.Trigger);
-                    break;
-                }
-
-                case MenuOpenMediaUrl:
-                    OpenBrowser(control, TwitterUrls.GetMediaLink(Context.MediaUrl, ImageQuality));
-                    break;
-
-                case MenuCopyMediaUrl:
-                    SetClipboardText(control, TwitterUrls.GetMediaLink(Context.MediaUrl, ImageQuality));
-                    break;
-
-                case MenuCopyImage: {
-                    string url = Context.MediaUrl;
-
-                    control.InvokeAsyncSafe(() => {
-                        TwitterUtils.CopyImage(url, ImageQuality);
-                    });
-                    
-                    break;
-                }
-
-                case MenuViewImage: {
-                    string url = Context.MediaUrl;
-
-                    control.InvokeAsyncSafe(() => {
-                        TwitterUtils.ViewImage(url, ImageQuality);
-                        analytics.AnalyticsFile.ViewedImages.Trigger();
-                    });
-                    
-                    break;
-                }
-
-                case MenuSaveMedia: {
-                    bool isVideo = Context.Types.HasFlag(ContextInfo.ContextType.Video);
-                    string url = Context.MediaUrl;
-                    string username = Context.Chirp.Authors.LastOrDefault();
-                    
-                    control.InvokeAsyncSafe(() => {
-                        if (isVideo){
-                            TwitterUtils.DownloadVideo(url, username);
-                            analytics.AnalyticsFile.DownloadedVideos.Trigger();
-                        }
-                        else{
-                            TwitterUtils.DownloadImage(url, username, ImageQuality);
-                            analytics.AnalyticsFile.DownloadedImages.Trigger();
-                        }
-                    });
-
-                    break;
-                }
-
-                case MenuSaveTweetImages: {
-                    string[] urls = Context.Chirp.Images;
-                    string username = Context.Chirp.Authors.LastOrDefault();
-                    
-                    control.InvokeAsyncSafe(() => {
-                        TwitterUtils.DownloadImages(urls, username, ImageQuality);
-                        analytics.AnalyticsFile.DownloadedImages.Trigger();
-                    });
-
-                    break;
-                }
-
-                case MenuReadApplyROT13:
-                    string selection = parameters.SelectionText;
-                    control.InvokeAsyncSafe(() => FormMessage.Information("ROT13", StringUtils.ConvertRot13(selection), FormMessage.OK));
-                    control.InvokeAsyncSafe(analytics.AnalyticsFile.UsedROT13.Trigger);
+			if (actionRegistry.Execute(commandId)) {
 				return true;
+			}
 
-                case MenuSearchInBrowser:
-                    string query = parameters.SelectionText;
-                    control.InvokeAsyncSafe(() => BrowserUtils.OpenExternalSearch(query));
-                    DeselectAll(frame);
-                    break;
-                    
-                case MenuOpenDevTools:
-                    browserControl.OpenDevToolsCustom();
-                    break;
+			if (commandId == MenuOpenDevTools) {
+				browserControl.OpenDevToolsCustom(new Point(parameters.XCoord, parameters.YCoord));
+				return true;
 			}
 
 			return false;
 		}
 
 		public virtual void OnContextMenuDismissed(IWebBrowser browserControl, IBrowser browser, IFrame frame) {
-            Context = CurrentInfo.Reset();
+			actionRegistry.Clear();
 		}
 
 		public virtual bool RunContextMenu(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model, IRunContextMenuCallback callback) {
 			return false;
 		}
 
-        protected static void DeselectAll(IFrame frame){
-            CefScriptExecutor.RunScript(frame, "window.getSelection().removeAllRanges()", "gen:deselect");
-        }
-
-        protected static void OpenBrowser(Control control, string url){
-            control.InvokeAsyncSafe(() => BrowserUtils.OpenExternalBrowser(url));
-        }
-
-        protected static void SetClipboardText(Control control, string text){
-            control.InvokeAsyncSafe(() => ClipboardManager.SetText(text, TextDataFormat.UnicodeText));
-        }
-
-        protected static void InsertSelectionSearchItem(IMenuModel model, CefMenuCommand insertCommand, string insertLabel){
-            model.InsertItemAt(model.GetIndexOf(MenuSearchInBrowser) + 1, insertCommand, insertLabel);
-        }
-        
 		protected static void AddDebugMenuItems(IMenuModel model) {
-            if (BrowserUtils.HasDevTools){
+			if (Config.DevToolsInContextMenu) {
 				AddSeparator(model);
 				model.AddItem(MenuOpenDevTools, "Open dev tools");
 			}

Browser/Handling/ContextMenuBrowser.cs

@@ -1,8 +1,12 @@
 using System.Windows.Forms;
 using CefSharp;
-using TweetDuck.Browser.Data;
+using TweetDuck.Browser.Adapters;
 using TweetDuck.Controls;
+using TweetLib.Browser.Contexts;
+using TweetLib.Core.Features.TweetDeck;
 using TweetLib.Core.Features.Twitter;
+using TweetLib.Core.Systems.Configuration;
+using IContextMenuHandler = TweetLib.Browser.Interfaces.IContextMenuHandler;
 
 namespace TweetDuck.Browser.Handling {
 	sealed class ContextMenuBrowser : ContextMenuBase {
@@ -12,14 +16,6 @@ namespace TweetDuck.Browser.Handling{
 		private const CefMenuCommand MenuPlugins  = (CefMenuCommand) 26003;
 		private const CefMenuCommand MenuAbout    = (CefMenuCommand) 26604;
 
-        private const CefMenuCommand MenuOpenTweetUrl       = (CefMenuCommand)26610;
-        private const CefMenuCommand MenuCopyTweetUrl       = (CefMenuCommand)26611;
-        private const CefMenuCommand MenuOpenQuotedTweetUrl = (CefMenuCommand)26612;
-        private const CefMenuCommand MenuCopyQuotedTweetUrl = (CefMenuCommand)26613;
-        private const CefMenuCommand MenuScreenshotTweet    = (CefMenuCommand)26614;
-        private const CefMenuCommand MenuWriteApplyROT13    = (CefMenuCommand)26615;
-        private const CefMenuCommand MenuSearchInColumn     = (CefMenuCommand)26616;
-
 		private const string TitleReloadBrowser = "Reload browser";
 		private const string TitleMuteNotifications = "Mute notifications";
 		private const string TitleSettings = "Options";
@@ -27,49 +23,26 @@ namespace TweetDuck.Browser.Handling{
 		private const string TitleAboutProgram = "About " + Program.BrandName;
 
 		private readonly FormBrowser form;
+		private readonly TweetDeckExtraContext extraContext;
 
-        public ContextMenuBrowser(FormBrowser form) : base(form){
+		public ContextMenuBrowser(FormBrowser form, IContextMenuHandler handler, TweetDeckExtraContext extraContext) : base(handler) {
 			this.form = form;
+			this.extraContext = extraContext;
+		}
+
+		protected override Context CreateContext(IContextMenuParams parameters) {
+			return CefContextMenuModel.CreateContext(parameters, extraContext, Config.TwitterImageQuality);
 		}
 
 		public override void OnBeforeContextMenu(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model) {
-            bool isSelecting = parameters.TypeFlags.HasFlag(ContextMenuType.Selection);
-            bool isEditing = parameters.TypeFlags.HasFlag(ContextMenuType.Editable);
-
-            model.Remove(CefMenuCommand.Back);
-            model.Remove(CefMenuCommand.Forward);
-            model.Remove(CefMenuCommand.Print);
-            model.Remove(CefMenuCommand.ViewSource);
-            RemoveSeparatorIfLast(model);
-
-            if (isSelecting){
-                if (isEditing){
-                    model.AddSeparator();
-                    model.AddItem(MenuWriteApplyROT13, "Apply ROT13");
-                }
-
-                model.AddSeparator();
+			if (!TwitterUrls.IsTweetDeck(frame.Url) || browser.IsLoading) {
+				extraContext.Reset();
 			}
 
 			base.OnBeforeContextMenu(browserControl, browser, frame, parameters, model);
 
-            if (isSelecting && !isEditing && TwitterUrls.IsTweetDeck(frame.Url)){
-                InsertSelectionSearchItem(model, MenuSearchInColumn, "Search in a column");
-            }
-
-            if (Context.Types.HasFlag(ContextInfo.ContextType.Chirp) && !isSelecting && !isEditing){
-                model.AddItem(MenuOpenTweetUrl, "Open tweet in browser");
-                model.AddItem(MenuCopyTweetUrl, "Copy tweet address");
-                model.AddItem(MenuScreenshotTweet, "Screenshot tweet to clipboard");
-
-                if (!string.IsNullOrEmpty(Context.Chirp.QuoteUrl)){
-                    model.AddSeparator();
-                    model.AddItem(MenuOpenQuotedTweetUrl, "Open quoted tweet in browser");
-                    model.AddItem(MenuCopyQuotedTweetUrl, "Copy quoted tweet address");
-                }
-
-                model.AddSeparator();
-            }
+			bool isSelecting = parameters.TypeFlags.HasFlag(ContextMenuType.Selection);
+			bool isEditing = parameters.TypeFlags.HasFlag(ContextMenuType.Editable);
 
 			if (!isSelecting && !isEditing) {
 				AddSeparator(model);
@@ -87,10 +60,6 @@ namespace TweetDuck.Browser.Handling{
 
 				AddDebugMenuItems(globalMenu);
 			}
-
-            RemoveSeparatorIfLast(model);
-            
-            form.InvokeAsyncSafe(form.AnalyticsFile.BrowserContextMenus.Trigger);
 		}
 
 		public override bool OnContextMenuCommand(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, CefMenuCommand commandId, CefEventFlags eventFlags) {
@@ -119,38 +88,14 @@ namespace TweetDuck.Browser.Handling{
 					form.InvokeAsyncSafe(ToggleMuteNotifications);
 					return true;
 
-                case MenuOpenTweetUrl:
-                    OpenBrowser(form, Context.Chirp.TweetUrl);
-                    return true;
-
-                case MenuCopyTweetUrl:
-                    SetClipboardText(form, Context.Chirp.TweetUrl);
-                    return true;
-
-                case MenuScreenshotTweet:
-                    form.InvokeAsyncSafe(form.TriggerTweetScreenshot);
-                    return true;
-
-                case MenuOpenQuotedTweetUrl:
-                    OpenBrowser(form, Context.Chirp.QuoteUrl);
-                    return true;
-
-                case MenuCopyQuotedTweetUrl:
-                    SetClipboardText(form, Context.Chirp.QuoteUrl);
-                    return true;
-
-                case MenuWriteApplyROT13:
-                    form.InvokeAsyncSafe(form.ApplyROT13);
-                    return true;
-
-                case MenuSearchInColumn:
-                    string query = parameters.SelectionText;
-                    form.InvokeAsyncSafe(() => form.AddSearchColumn(query));
-                    DeselectAll(frame);
-                    break;
+				default:
+					return false;
+			}
 		}
 
-            return false;
+		public override void OnContextMenuDismissed(IWebBrowser browserControl, IBrowser browser, IFrame frame) {
+			base.OnContextMenuDismissed(browserControl, browser, frame);
+			extraContext.Reset();
 		}
 
 		public static ContextMenu CreateMenu(FormBrowser form) {
@@ -165,7 +110,6 @@ namespace TweetDuck.Browser.Handling{
 
 			menu.Popup += (sender, args) => {
 				menu.MenuItems[1].Checked = Config.MuteNotifications;
-                form.AnalyticsFile.BrowserContextMenus.Trigger();
 			};
 
 			return menu;

Browser/Handling/ContextMenuGuide.cs

@@ -1,12 +1,11 @@
 using CefSharp;
-using TweetDuck.Management.Analytics;
+using IContextMenuHandler = TweetLib.Browser.Interfaces.IContextMenuHandler;
 
 namespace TweetDuck.Browser.Handling {
 	sealed class ContextMenuGuide : ContextMenuBase {
-        public ContextMenuGuide(AnalyticsFile.IProvider analytics) : base(analytics){}
+		public ContextMenuGuide(IContextMenuHandler handler) : base(handler) {}
 
 		public override void OnBeforeContextMenu(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model) {
-            model.Clear();
 			base.OnBeforeContextMenu(browserControl, browser, frame, parameters, model);
 			AddDebugMenuItems(model);
 		}

Browser/Handling/ContextMenuNotification.cs

@@ -1,89 +1,27 @@
 using CefSharp;
 using TweetDuck.Browser.Notification;
 using TweetDuck.Controls;
+using TweetLib.Browser.Contexts;
+using IContextMenuHandler = TweetLib.Browser.Interfaces.IContextMenuHandler;
 
 namespace TweetDuck.Browser.Handling {
 	sealed class ContextMenuNotification : ContextMenuBase {
-        private const CefMenuCommand MenuViewDetail         = (CefMenuCommand)26600;
-        private const CefMenuCommand MenuSkipTweet          = (CefMenuCommand)26601;
-        private const CefMenuCommand MenuFreeze             = (CefMenuCommand)26602;
-        private const CefMenuCommand MenuCopyTweetUrl       = (CefMenuCommand)26603;
-        private const CefMenuCommand MenuCopyQuotedTweetUrl = (CefMenuCommand)26604;
-
 		private readonly FormNotificationBase form;
-        private readonly bool enableCustomMenu;
 
-        public ContextMenuNotification(FormNotificationBase form, bool enableCustomMenu) : base(form){
+		public ContextMenuNotification(FormNotificationBase form, IContextMenuHandler handler) : base(handler) {
 			this.form = form;
-            this.enableCustomMenu = enableCustomMenu;
+		}
+
+		protected override Context CreateContext(IContextMenuParams parameters) {
+			Context context = base.CreateContext(parameters);
+			context.Notification = new TweetLib.Browser.Contexts.Notification(form.CurrentTweetUrl, form.CurrentQuoteUrl);
+			return context;
 		}
 
 		public override void OnBeforeContextMenu(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model) {
-            model.Clear();
-
-            if (parameters.TypeFlags.HasFlag(ContextMenuType.Selection)){
-                model.AddItem(CefMenuCommand.Copy, "Copy");
-                model.AddSeparator();
-            }
-
 			base.OnBeforeContextMenu(browserControl, browser, frame, parameters, model);
-
-            if (enableCustomMenu){
-                if (form.CanViewDetail){
-                    model.AddItem(MenuViewDetail, "View detail");
-                }
-
-                model.AddItem(MenuSkipTweet, "Skip tweet");
-                model.AddCheckItem(MenuFreeze, "Freeze");
-                model.SetChecked(MenuFreeze, form.FreezeTimer);
-
-                if (!string.IsNullOrEmpty(form.CurrentTweetUrl)){
-                    model.AddSeparator();
-                    model.AddItem(MenuCopyTweetUrl, "Copy tweet address");
-
-                    if (!string.IsNullOrEmpty(form.CurrentQuoteUrl)){
-                        model.AddItem(MenuCopyQuotedTweetUrl, "Copy quoted tweet address");
-                    }
-                }
-            }
-            
 			AddDebugMenuItems(model);
-            RemoveSeparatorIfLast(model);
-
-            form.InvokeAsyncSafe(() => {
-                form.ContextMenuOpen = true;
-                form.AnalyticsFile.NotificationContextMenus.Trigger();
-            });
-        }
-
-        public override bool OnContextMenuCommand(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, CefMenuCommand commandId, CefEventFlags eventFlags){
-            if (base.OnContextMenuCommand(browserControl, browser, frame, parameters, commandId, eventFlags)){
-                return true;
-            }
-
-            switch(commandId){
-                case MenuSkipTweet:
-                    form.InvokeAsyncSafe(form.FinishCurrentNotification);
-                    return true;
-
-                case MenuFreeze:
-                    form.InvokeAsyncSafe(() => form.FreezeTimer = !form.FreezeTimer);
-                    return true;
-
-                case MenuViewDetail:
-                    form.InvokeSafe(form.ShowTweetDetail);
-                    return true;
-
-                case MenuCopyTweetUrl:
-                    SetClipboardText(form, form.CurrentTweetUrl);
-                    return true;
-
-                case MenuCopyQuotedTweetUrl:
-                    SetClipboardText(form, form.CurrentQuoteUrl);
-                    return true;
-            }
-
-            return false;
+			form.InvokeAsyncSafe(() => form.ContextMenuOpen = true);
 		}
 
 		public override void OnContextMenuDismissed(IWebBrowser browserControl, IBrowser browser, IFrame frame) {

Browser/Handling/CustomKeyboardHandler.cs

@@ -0,0 +1,43 @@
+using System.Windows.Forms;
+using CefSharp;
+using TweetDuck.Utils;
+using TweetLib.Utils.Static;
+
+namespace TweetDuck.Browser.Handling {
+	sealed class CustomKeyboardHandler : IKeyboardHandler {
+		private readonly IBrowserKeyHandler handler;
+
+		public CustomKeyboardHandler(IBrowserKeyHandler handler) {
+			this.handler = handler;
+		}
+
+		bool IKeyboardHandler.OnPreKeyEvent(IWebBrowser browserControl, IBrowser browser, KeyType type, int windowsKeyCode, int nativeKeyCode, CefEventFlags modifiers, bool isSystemKey, ref bool isKeyboardShortcut) {
+			if (type != KeyType.RawKeyDown) {
+				return false;
+			}
+
+			using (var frame = browser.FocusedFrame) {
+				if (frame.Url.StartsWithOrdinal("devtools://")) {
+					return false;
+				}
+			}
+
+			Keys key = (Keys) windowsKeyCode;
+
+			if (modifiers == (CefEventFlags.ControlDown | CefEventFlags.ShiftDown) && key == Keys.I) {
+				browserControl.OpenDevToolsCustom();
+				return true;
+			}
+
+			return handler != null && handler.HandleBrowserKey(key);
+		}
+
+		bool IKeyboardHandler.OnKeyEvent(IWebBrowser browserControl, IBrowser browser, KeyType type, int windowsKeyCode, int nativeKeyCode, CefEventFlags modifiers, bool isSystemKey) {
+			return false;
+		}
+
+		public interface IBrowserKeyHandler {
+			bool HandleBrowserKey(Keys key);
+		}
+	}
+}

Browser/Handling/CustomLifeSpanHandler.cs

@@ -0,0 +1,37 @@
+using CefSharp;
+using CefSharp.Handler;
+using TweetLib.Core;
+using TweetLib.Utils.Static;
+
+namespace TweetDuck.Browser.Handling {
+	sealed class CustomLifeSpanHandler : LifeSpanHandler {
+		private static bool IsPopupAllowed(string url) {
+			return url.StartsWithOrdinal("https://twitter.com/teams/authorize?") ||
+			       url.StartsWithOrdinal("https://accounts.google.com/") ||
+			       url.StartsWithOrdinal("https://appleid.apple.com/");
+		}
+
+		public static bool HandleLinkClick(WindowOpenDisposition targetDisposition, string targetUrl) {
+			switch (targetDisposition) {
+				case WindowOpenDisposition.NewBackgroundTab:
+				case WindowOpenDisposition.NewForegroundTab:
+				case WindowOpenDisposition.NewPopup when !IsPopupAllowed(targetUrl):
+				case WindowOpenDisposition.NewWindow:
+					App.SystemHandler.OpenBrowser(targetUrl);
+					return true;
+
+				default:
+					return false;
+			}
+		}
+
+		protected override bool OnBeforePopup(IWebBrowser browserControl, IBrowser browser, IFrame frame, string targetUrl, string targetFrameName, WindowOpenDisposition targetDisposition, bool userGesture, IPopupFeatures popupFeatures, IWindowInfo windowInfo, IBrowserSettings browserSettings, ref bool noJavascriptAccess, out IWebBrowser newBrowser) {
+			newBrowser = null;
+			return HandleLinkClick(targetDisposition, targetUrl);
+		}
+
+		protected override bool DoClose(IWebBrowser browserControl, IBrowser browser) {
+			return false;
+		}
+	}
+}

Browser/Handling/DragHandlerBrowser.cs

@@ -12,7 +12,7 @@ namespace TweetDuck.Browser.Handling{
 
 		public bool OnDragEnter(IWebBrowser browserControl, IBrowser browser, IDragData dragData, DragOperationsMask mask) {
 			void TriggerDragStart(string type, string data = null) {
-                browserControl.ExecuteScriptAsync("window.TDGF_onGlobalDragStart", type, data);
+				browserControl.BrowserCore.ExecuteScriptAsync("window.TDGF_onGlobalDragStart", type, data);
 			}
 
 			requestHandler.BlockNextUserNavUrl = dragData.LinkUrl; // empty if not a link

Browser/Handling/FileDialogHandler.cs

@@ -0,0 +1,68 @@
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Windows.Forms;
+using CefSharp;
+using TweetLib.Core;
+using TweetLib.Utils.Static;
+
+namespace TweetDuck.Browser.Handling {
+	sealed class FileDialogHandler : IDialogHandler {
+		public bool OnFileDialog(IWebBrowser browserControl, IBrowser browser, CefFileDialogMode mode, CefFileDialogFlags flags, string title, string defaultFilePath, List<string> acceptFilters, int selectedAcceptFilter, IFileDialogCallback callback) {
+			if (mode == CefFileDialogMode.Open || mode == CefFileDialogMode.OpenMultiple) {
+				string allFilters = string.Join(";", acceptFilters.SelectMany(ParseFileType).Where(filter => !string.IsNullOrEmpty(filter)).Select(filter => "*" + filter));
+
+				using OpenFileDialog dialog = new OpenFileDialog {
+					AutoUpgradeEnabled = true,
+					DereferenceLinks = true,
+					Multiselect = mode == CefFileDialogMode.OpenMultiple,
+					Title = "Open Files",
+					Filter = $"All Supported Formats ({allFilters})|{allFilters}|All Files (*.*)|*.*"
+				};
+
+				if (dialog.ShowDialog() == DialogResult.OK) {
+					string ext = Path.GetExtension(dialog.FileName)?.ToLower();
+					callback.Continue(acceptFilters.FindIndex(filter => ParseFileType(filter).Contains(ext)), dialog.FileNames.ToList());
+				}
+				else {
+					callback.Cancel();
+				}
+
+				callback.Dispose();
+				return true;
+			}
+			else {
+				callback.Dispose();
+				return false;
+			}
+		}
+
+		private static IEnumerable<string> ParseFileType(string type) {
+			if (string.IsNullOrEmpty(type)) {
+				return StringUtils.EmptyArray;
+			}
+
+			if (type[0] == '.') {
+				return new string[] { type };
+			}
+
+			string[] extensions = type switch {
+				"image/jpeg"      => new string[] { ".jpg", ".jpeg" },
+				"image/png"       => new string[] { ".png" },
+				"image/gif"       => new string[] { ".gif" },
+				"image/webp"      => new string[] { ".webp" },
+				"video/mp4"       => new string[] { ".mp4" },
+				"video/quicktime" => new string[] { ".mov", ".qt" },
+				_                 => StringUtils.EmptyArray
+			};
+
+			if (extensions.Length == 0) {
+				App.Logger.Warn("Unknown file type: " + type);
+				Debugger.Break();
+			}
+
+			return extensions;
+		}
+	}
+}

Browser/Handling/Filters/ResponseFilterBase.cs

@@ -1,72 +0,0 @@
-using System;
-using System.IO;
-using System.Text;
-using CefSharp;
-
-namespace TweetDuck.Browser.Handling.Filters{
-    abstract class ResponseFilterBase : IResponseFilter{
-        private enum State{
-            Reading, Writing, Done
-        }
-
-        private readonly Encoding encoding;
-        private byte[] responseData;
-
-        private State state;
-        private int offset;
-
-        protected ResponseFilterBase(int totalBytes, Encoding encoding){
-            this.responseData = new byte[totalBytes];
-            this.encoding = encoding;
-            this.state = State.Reading;
-        }
-        
-        FilterStatus IResponseFilter.Filter(Stream dataIn, out long dataInRead, Stream dataOut, out long dataOutWritten){
-            int responseLength = responseData.Length;
-
-            if (state == State.Reading){
-                int bytesToRead = Math.Min(responseLength - offset, (int)Math.Min(dataIn?.Length ?? 0, int.MaxValue));
-                
-                dataIn?.Read(responseData, offset, bytesToRead);
-                offset += bytesToRead;
-                
-                dataInRead = bytesToRead;
-                dataOutWritten = 0;
-                
-                if (offset >= responseLength){
-                    responseData = encoding.GetBytes(ProcessResponse(encoding.GetString(responseData)));
-                    state = State.Writing;
-                    offset = 0;
-                }
-
-                return FilterStatus.NeedMoreData;
-            }
-            else if (state == State.Writing){
-                int bytesToWrite = Math.Min(responseLength - offset, (int)Math.Min(dataOut.Length, int.MaxValue));
-
-                if (bytesToWrite > 0){
-                    dataOut.Write(responseData, offset, bytesToWrite);
-                    offset += bytesToWrite;
-                }
-
-                dataOutWritten = bytesToWrite;
-                dataInRead = 0;
-
-                if (offset < responseLength){
-                    return FilterStatus.NeedMoreData;
-                }
-                else{
-                    state = State.Done;
-                    return FilterStatus.Done;
-                }
-            }
-            else{
-                throw new InvalidOperationException("This resource filter cannot be reused.");
-            }
-        }
-        
-        public abstract bool InitFilter();
-        protected abstract string ProcessResponse(string text);
-        public abstract void Dispose();
-    }
-}

Browser/Handling/Filters/ResponseFilterVendor.cs

@@ -1,20 +0,0 @@
-using System.Text;
-using System.Text.RegularExpressions;
-
-namespace TweetDuck.Browser.Handling.Filters{
-    sealed class ResponseFilterVendor : ResponseFilterBase{
-        private static readonly Regex RegexRestoreJQuery = new Regex(@"(\w+)\.fn=\1\.prototype", RegexOptions.Compiled);
-
-        public ResponseFilterVendor(int totalBytes) : base(totalBytes, Encoding.UTF8){}
-
-        public override bool InitFilter(){
-            return true;
-        }
-        
-        protected override string ProcessResponse(string text){
-            return RegexRestoreJQuery.Replace(text, "window.$$=$1;$&", 1);
-        }
-
-        public override void Dispose(){}
-    }
-}

Browser/Handling/General/BrowserProcessHandler.cs

@@ -1,28 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using CefSharp;
-using TweetDuck.Configuration;
-
-namespace TweetDuck.Browser.Handling.General{
-    sealed class BrowserProcessHandler : IBrowserProcessHandler{
-        public static Task UpdatePrefs(){
-            return Cef.UIThreadTaskFactory.StartNew(UpdatePrefsInternal);
-        }
-
-        private static void UpdatePrefsInternal(){
-            UserConfig config = Program.Config.User;
-            using IRequestContext ctx = Cef.GetGlobalRequestContext();
-
-            ctx.SetPreference("browser.enable_spellchecking", config.EnableSpellCheck, out string _);
-            ctx.SetPreference("spellcheck.dictionary", config.SpellCheckLanguage, out string _);
-            ctx.SetPreference("settings.a11y.animation_policy", config.EnableAnimatedImages ? "allowed" : "none", out string _);
-        }
-
-        void IBrowserProcessHandler.OnContextInitialized(){
-            UpdatePrefsInternal();
-        }
-
-        void IBrowserProcessHandler.OnScheduleMessagePumpWork(long delay){}
-        void IDisposable.Dispose(){}
-    }
-}

Browser/Handling/General/FileDialogHandler.cs

@@ -1,61 +0,0 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Windows.Forms;
-using CefSharp;
-
-namespace TweetDuck.Browser.Handling.General{
-    sealed class FileDialogHandler : IDialogHandler{
-        public bool OnFileDialog(IWebBrowser browserControl, IBrowser browser, CefFileDialogMode mode, CefFileDialogFlags flags, string title, string defaultFilePath, List<string> acceptFilters, int selectedAcceptFilter, IFileDialogCallback callback){
-            if (mode == CefFileDialogMode.Open || mode == CefFileDialogMode.OpenMultiple){
-                string allFilters = string.Join(";", acceptFilters.SelectMany(ParseFileType).Where(filter => !string.IsNullOrEmpty(filter)).Select(filter => "*" + filter));
-
-                using(OpenFileDialog dialog = new OpenFileDialog{
-                    AutoUpgradeEnabled = true,
-                    DereferenceLinks = true,
-                    Multiselect = mode == CefFileDialogMode.OpenMultiple,
-                    Title = "Open Files",
-                    Filter = $"All Supported Formats ({allFilters})|{allFilters}|All Files (*.*)|*.*"
-                }){
-                    if (dialog.ShowDialog() == DialogResult.OK){
-                        string ext = Path.GetExtension(dialog.FileName)?.ToLower();
-                        callback.Continue(acceptFilters.FindIndex(filter => ParseFileType(filter).Contains(ext)), dialog.FileNames.ToList());
-                    }
-                    else{
-                        callback.Cancel();
-                    }
-
-                    callback.Dispose();
-                }
-
-                return true;
-            }
-            else{
-                callback.Dispose();
-                return false;
-            }
-        }
-
-        private static IEnumerable<string> ParseFileType(string type){
-            if (string.IsNullOrEmpty(type)){
-                return new string[0];
-            }
-            
-            if (type[0] == '.'){
-                return new string[]{ type };
-            }
-
-            switch(type){
-                case "image/jpeg": return new string[]{ ".jpg", ".jpeg" };
-                case "image/png": return new string[]{ ".png" };
-                case "image/gif": return new string[]{ ".gif" };
-                case "image/webp": return new string[]{ ".webp" };
-                case "video/mp4": return new string[]{ ".mp4" };
-                case "video/quicktime": return new string[]{ ".mov", ".qt" };
-            }
-
-            System.Diagnostics.Debugger.Break();
-            return new string[0];
-        }
-    }
-}

Browser/Handling/General/JavaScriptDialogHandler.cs

@@ -1,93 +0,0 @@
-using System.Drawing;
-using System.Windows.Forms;
-using CefSharp;
-using TweetDuck.Controls;
-using TweetDuck.Dialogs;
-using TweetDuck.Utils;
-
-namespace TweetDuck.Browser.Handling.General{
-    sealed class JavaScriptDialogHandler : IJsDialogHandler{
-        private static FormMessage CreateMessageForm(string caption, string text){
-            MessageBoxIcon icon = MessageBoxIcon.None;
-            int pipe = text.IndexOf('|');
-
-            if (pipe != -1){
-                icon = text.Substring(0, pipe) switch{
-                    "error"    => MessageBoxIcon.Error,
-                    "warning"  => MessageBoxIcon.Warning,
-                    "info"     => MessageBoxIcon.Information,
-                    "question" => MessageBoxIcon.Question,
-                    _          => MessageBoxIcon.None
-                };
-
-                if (icon != MessageBoxIcon.None){
-                    text = text.Substring(pipe + 1);
-                }
-            }
-
-            return new FormMessage(caption, text, icon);
-        }
-
-        bool IJsDialogHandler.OnJSDialog(IWebBrowser browserControl, IBrowser browser, string originUrl, CefJsDialogType dialogType, string messageText, string defaultPromptText, IJsDialogCallback callback, ref bool suppressMessage){
-            browserControl.AsControl().InvokeSafe(() => {
-                FormMessage form;
-                TextBox input = null;
-
-                if (dialogType == CefJsDialogType.Alert){
-                    form = CreateMessageForm("Browser Message", messageText);
-                    form.AddButton(FormMessage.OK, ControlType.Accept | ControlType.Focused);
-                }
-                else if (dialogType == CefJsDialogType.Confirm){
-                    form = CreateMessageForm("Browser Confirmation", messageText);
-                    form.AddButton(FormMessage.No, DialogResult.No, ControlType.Cancel);
-                    form.AddButton(FormMessage.Yes, ControlType.Focused);
-                }
-                else if (dialogType == CefJsDialogType.Prompt){
-                    form = CreateMessageForm("Browser Prompt", messageText);
-                    form.AddButton(FormMessage.Cancel, DialogResult.Cancel, ControlType.Cancel);
-                    form.AddButton(FormMessage.OK, ControlType.Accept | ControlType.Focused);
-
-                    float dpiScale = form.GetDPIScale();
-                    int inputPad = form.HasIcon ? 43 : 0;
-
-                    input = new TextBox{
-                        Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Bottom,
-                        Font = SystemFonts.MessageBoxFont,
-                        Location = new Point(BrowserUtils.Scale(22 + inputPad, dpiScale), form.ActionPanelY - BrowserUtils.Scale(46, dpiScale)),
-                        Size = new Size(form.ClientSize.Width - BrowserUtils.Scale(44 + inputPad, dpiScale), BrowserUtils.Scale(23, dpiScale))
-                    };
-
-                    form.Controls.Add(input);
-                    form.ActiveControl = input;
-                    form.Height += input.Size.Height + input.Margin.Vertical;
-                }
-                else{
-                    callback.Continue(false);
-                    return;
-                }
-
-                bool success = form.ShowDialog() == DialogResult.OK;
-
-                if (input == null){
-                    callback.Continue(success);
-                }
-                else{
-                    callback.Continue(success, input.Text);
-                    input.Dispose();
-                }
-
-                form.Dispose();
-            });
-
-            return true;
-        }
-
-        bool IJsDialogHandler.OnBeforeUnloadDialog(IWebBrowser browserControl, IBrowser browser, string messageText, bool isReload, IJsDialogCallback callback){
-            callback.Dispose();
-            return false;
-        }
-
-        void IJsDialogHandler.OnResetDialogState(IWebBrowser browserControl, IBrowser browser){}
-        void IJsDialogHandler.OnDialogClosed(IWebBrowser browserControl, IBrowser browser){}
-    }
-}

Browser/Handling/General/LifeSpanHandler.cs

@@ -1,38 +0,0 @@
-using CefSharp;
-using TweetDuck.Controls;
-using TweetDuck.Utils;
-
-namespace TweetDuck.Browser.Handling.General{
-    sealed class LifeSpanHandler : ILifeSpanHandler{
-        private static bool IsPopupAllowed(string url){
-            return url.StartsWith("https://twitter.com/teams/authorize?");
-        }
-
-        public static bool HandleLinkClick(IWebBrowser browserControl, WindowOpenDisposition targetDisposition, string targetUrl){
-            switch(targetDisposition){
-                case WindowOpenDisposition.NewBackgroundTab:
-                case WindowOpenDisposition.NewForegroundTab:
-                case WindowOpenDisposition.NewPopup when !IsPopupAllowed(targetUrl):
-                case WindowOpenDisposition.NewWindow:
-                    browserControl.AsControl().InvokeAsyncSafe(() => BrowserUtils.OpenExternalBrowser(targetUrl));
-                    return true;
-
-                default:
-                    return false;
-            }
-        }
-
-        public bool OnBeforePopup(IWebBrowser browserControl, IBrowser browser, IFrame frame, string targetUrl, string targetFrameName, WindowOpenDisposition targetDisposition, bool userGesture, IPopupFeatures popupFeatures, IWindowInfo windowInfo, IBrowserSettings browserSettings, ref bool noJavascriptAccess, out IWebBrowser newBrowser){
-            newBrowser = null;
-            return HandleLinkClick(browserControl, targetDisposition, targetUrl);
-        }
-
-        public void OnAfterCreated(IWebBrowser browserControl, IBrowser browser){}
-
-        public bool DoClose(IWebBrowser browserControl, IBrowser browser){
-            return false;
-        }
-
-        public void OnBeforeClose(IWebBrowser browserControl, IBrowser browser){}
-    }
-}

Browser/Handling/JavaScriptDialogHandler.cs

@@ -0,0 +1,96 @@
+using System.Drawing;
+using System.Windows.Forms;
+using CefSharp;
+using CefSharp.WinForms;
+using TweetDuck.Controls;
+using TweetDuck.Dialogs;
+using TweetDuck.Utils;
+
+namespace TweetDuck.Browser.Handling {
+	sealed class JavaScriptDialogHandler : IJsDialogHandler {
+		private static FormMessage CreateMessageForm(string caption, string text) {
+			MessageBoxIcon icon = MessageBoxIcon.None;
+			int pipe = text.IndexOf('|');
+
+			if (pipe != -1) {
+				icon = text.Substring(0, pipe) switch {
+					"error"    => MessageBoxIcon.Error,
+					"warning"  => MessageBoxIcon.Warning,
+					"info"     => MessageBoxIcon.Information,
+					"question" => MessageBoxIcon.Question,
+					_          => MessageBoxIcon.None
+				};
+
+				if (icon != MessageBoxIcon.None) {
+					text = text.Substring(pipe + 1);
+				}
+			}
+
+			return new FormMessage(caption, text, icon);
+		}
+
+		bool IJsDialogHandler.OnJSDialog(IWebBrowser browserControl, IBrowser browser, string originUrl, CefJsDialogType dialogType, string messageText, string defaultPromptText, IJsDialogCallback callback, ref bool suppressMessage) {
+			var control = (ChromiumWebBrowser) browserControl;
+
+			control.InvokeSafe(() => {
+				FormMessage form;
+				TextBox input = null;
+
+				if (dialogType == CefJsDialogType.Alert) {
+					form = CreateMessageForm("Browser Message", messageText);
+					form.AddButton(FormMessage.OK, ControlType.Accept | ControlType.Focused);
+				}
+				else if (dialogType == CefJsDialogType.Confirm) {
+					form = CreateMessageForm("Browser Confirmation", messageText);
+					form.AddButton(FormMessage.No, DialogResult.No, ControlType.Cancel);
+					form.AddButton(FormMessage.Yes, ControlType.Focused);
+				}
+				else if (dialogType == CefJsDialogType.Prompt) {
+					form = CreateMessageForm("Browser Prompt", messageText);
+					form.AddButton(FormMessage.Cancel, DialogResult.Cancel, ControlType.Cancel);
+					form.AddButton(FormMessage.OK, ControlType.Accept | ControlType.Focused);
+
+					float dpiScale = form.GetDPIScale();
+					int inputPad = form.HasIcon ? 43 : 0;
+
+					input = new TextBox {
+						Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Bottom,
+						Font = SystemFonts.MessageBoxFont,
+						Location = new Point(BrowserUtils.Scale(22 + inputPad, dpiScale), form.ActionPanelY - BrowserUtils.Scale(46, dpiScale)),
+						Size = new Size(form.ClientSize.Width - BrowserUtils.Scale(44 + inputPad, dpiScale), BrowserUtils.Scale(23, dpiScale))
+					};
+
+					form.Controls.Add(input);
+					form.ActiveControl = input;
+					form.Height += input.Size.Height + input.Margin.Vertical;
+				}
+				else {
+					callback.Continue(false);
+					return;
+				}
+
+				bool success = form.ShowDialog() == DialogResult.OK;
+
+				if (input == null) {
+					callback.Continue(success);
+				}
+				else {
+					callback.Continue(success, input.Text);
+					input.Dispose();
+				}
+
+				form.Dispose();
+			});
+
+			return true;
+		}
+
+		bool IJsDialogHandler.OnBeforeUnloadDialog(IWebBrowser browserControl, IBrowser browser, string messageText, bool isReload, IJsDialogCallback callback) {
+			callback.Dispose();
+			return false;
+		}
+
+		void IJsDialogHandler.OnResetDialogState(IWebBrowser browserControl, IBrowser browser) {}
+		void IJsDialogHandler.OnDialogClosed(IWebBrowser browserControl, IBrowser browser) {}
+	}
+}

Browser/Handling/KeyboardHandlerBase.cs

@@ -1,47 +0,0 @@
-using System.Windows.Forms;
-using CefSharp;
-using TweetDuck.Controls;
-using TweetDuck.Dialogs;
-using TweetDuck.Utils;
-
-namespace TweetDuck.Browser.Handling{
-    class KeyboardHandlerBase : IKeyboardHandler{
-        protected virtual bool HandleRawKey(IWebBrowser browserControl, IBrowser browser, Keys key, CefEventFlags modifiers){
-            if (modifiers == (CefEventFlags.ControlDown | CefEventFlags.ShiftDown) && key == Keys.I){
-                if (BrowserUtils.HasDevTools){
-                    browserControl.OpenDevToolsCustom();
-                }
-                else{
-                    browserControl.AsControl().InvokeSafe(() => {
-                        string extraMessage;
-                        
-                        if (Program.IsPortable){
-                            extraMessage = "Please download the portable installer, select the folder with your current installation of TweetDuck Portable, and tick 'Install dev tools' during the installation process.";
-                        }
-                        else{
-                            extraMessage = "Please download the installer, and tick 'Install dev tools' during the installation process. The installer will automatically find and update your current installation of TweetDuck.";
-                        }
-
-                        FormMessage.Information("Dev Tools", "You do not have dev tools installed. " + extraMessage, FormMessage.OK);
-                    });
-                }
-
-                return true;
-            }
-
-            return false;
-        }
-
-        bool IKeyboardHandler.OnPreKeyEvent(IWebBrowser browserControl, IBrowser browser, KeyType type, int windowsKeyCode, int nativeKeyCode, CefEventFlags modifiers, bool isSystemKey, ref bool isKeyboardShortcut){
-            if (type == KeyType.RawKeyDown && !browser.FocusedFrame.Url.StartsWith("devtools://")){
-                return HandleRawKey(browserControl, browser, (Keys)windowsKeyCode, modifiers);
-            }
-
-            return false;
-        }
-
-        bool IKeyboardHandler.OnKeyEvent(IWebBrowser browserControl, IBrowser browser, KeyType type, int windowsKeyCode, int nativeKeyCode, CefEventFlags modifiers, bool isSystemKey){
-            return false;
-        }
-    }
-}

Browser/Handling/KeyboardHandlerBrowser.cs

@@ -1,20 +0,0 @@
-using System.Windows.Forms;
-using CefSharp;
-
-namespace TweetDuck.Browser.Handling{
-    sealed class KeyboardHandlerBrowser : KeyboardHandlerBase{
-        private readonly FormBrowser form;
-
-        public KeyboardHandlerBrowser(FormBrowser form){
-            this.form = form;
-        }
-
-        protected override bool HandleRawKey(IWebBrowser browserControl, IBrowser browser, Keys key, CefEventFlags modifiers){
-            if (base.HandleRawKey(browserControl, browser, key, modifiers)){
-                return true;
-            }
-
-            return form.ProcessBrowserKey(key);
-        }
-    }
-}

Browser/Handling/KeyboardHandlerNotification.cs

@@ -1,44 +0,0 @@
-using System.Windows.Forms;
-using CefSharp;
-using TweetDuck.Browser.Notification;
-using TweetDuck.Controls;
-
-namespace TweetDuck.Browser.Handling{
-    sealed class KeyboardHandlerNotification : KeyboardHandlerBase{
-        private readonly FormNotificationBase notification;
-
-        public KeyboardHandlerNotification(FormNotificationBase notification){
-            this.notification = notification;
-        }
-
-        private void TriggerKeyboardShortcutAnalytics(){
-            notification.InvokeAsyncSafe(notification.AnalyticsFile.NotificationKeyboardShortcuts.Trigger);
-        }
-
-        protected override bool HandleRawKey(IWebBrowser browserControl, IBrowser browser, Keys key, CefEventFlags modifiers){
-            if (base.HandleRawKey(browserControl, browser, key, modifiers)){
-                return true;
-            }
-
-            switch(key){
-                case Keys.Enter:
-                    notification.InvokeAsyncSafe(notification.FinishCurrentNotification);
-                    TriggerKeyboardShortcutAnalytics();
-                    return true;
-
-                case Keys.Escape:
-                    notification.InvokeAsyncSafe(notification.HideNotification);
-                    TriggerKeyboardShortcutAnalytics();
-                    return true;
-
-                case Keys.Space:
-                    notification.InvokeAsyncSafe(() => notification.FreezeTimer = !notification.FreezeTimer);
-                    TriggerKeyboardShortcutAnalytics();
-                    return true;
-
-                default:
-                    return false;
-            }
-        }
-    }
-}

Browser/Handling/RequestHandlerBase.cs

@@ -1,6 +1,5 @@
 using CefSharp;
 using CefSharp.Handler;
-using TweetDuck.Browser.Handling.General;
 
 namespace TweetDuck.Browser.Handling {
 	class RequestHandlerBase : RequestHandler {
@@ -11,7 +10,7 @@ namespace TweetDuck.Browser.Handling{
 		}
 
 		protected override bool OnOpenUrlFromTab(IWebBrowser browserControl, IBrowser browser, IFrame frame, string targetUrl, WindowOpenDisposition targetDisposition, bool userGesture) {
-            return LifeSpanHandler.HandleLinkClick(browserControl, targetDisposition, targetUrl);
+			return CustomLifeSpanHandler.HandleLinkClick(targetDisposition, targetUrl);
 		}
 
 		protected override void OnRenderProcessTerminated(IWebBrowser browserControl, IBrowser browser, CefTerminationStatus status) {

Browser/Handling/ResourceRequestHandler.cs

@@ -1,35 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-using CefSharp;
-using TweetDuck.Browser.Data;
-
-namespace TweetDuck.Browser.Handling{
-    abstract class ResourceRequestHandler : CefSharp.Handler.ResourceRequestHandler{
-        private class SelfFactoryImpl : IResourceRequestHandlerFactory{
-            private readonly ResourceRequestHandler me;
-
-            public SelfFactoryImpl(ResourceRequestHandler me){
-                this.me = me;
-            }
-
-            bool IResourceRequestHandlerFactory.HasHandlers { get; } = true;
-
-            [SuppressMessage("ReSharper", "RedundantAssignment")]
-            IResourceRequestHandler IResourceRequestHandlerFactory.GetResourceRequestHandler(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, bool isNavigation, bool isDownload, string requestInitiator, ref bool disableDefaultHandling){
-                disableDefaultHandling = me.ResourceHandlers.HasHandler(request);
-                return me;
-            }
-        }
-
-        public IResourceRequestHandlerFactory SelfFactory { get; }
-        public ResourceHandlers ResourceHandlers { get; }
-
-        protected ResourceRequestHandler(){
-            this.SelfFactory = new SelfFactoryImpl(this);
-            this.ResourceHandlers = new ResourceHandlers();
-        }
-
-        protected override IResourceHandler GetResourceHandler(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request){
-            return ResourceHandlers.GetHandler(request);
-        }
-    }
-}

Browser/Handling/ResourceRequestHandlerBase.cs

@@ -1,69 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Linq;
-using System.Text.RegularExpressions;
-using CefSharp;
-using TweetDuck.Utils;
-using TweetLib.Core.Utils;
-
-namespace TweetDuck.Browser.Handling{
-    class ResourceRequestHandlerBase : ResourceRequestHandler{
-        private static readonly Regex TweetDeckResourceUrl = new Regex(@"/dist/(.*?)\.(.*?)\.(css|js)$");
-        private static readonly SortedList<string, string> TweetDeckHashes = new SortedList<string, string>(4);
-
-        public static void LoadResourceRewriteRules(string rules){
-            if (string.IsNullOrEmpty(rules)){
-                return;
-            }
-
-            TweetDeckHashes.Clear();
-
-            foreach(string rule in rules.Replace(" ", "").ToLower().Split(',')){
-                var (key, hash) = StringUtils.SplitInTwo(rule, '=') ?? throw new ArgumentException("A rule must have one '=' character: " + rule);
-
-                if (hash.All(chr => char.IsDigit(chr) || (chr >= 'a' && chr <= 'f'))){
-                    TweetDeckHashes.Add(key, hash);
-                }
-                else{
-                    throw new ArgumentException("Invalid hash characters: " + rule);
-                }
-            }
-        }
-
-        protected override CefReturnValue OnBeforeResourceLoad(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IRequestCallback callback){
-            if (request.ResourceType == ResourceType.CspReport){
-                callback.Dispose();
-                return CefReturnValue.Cancel;
-            }
-
-            if (BrowserUtils.HasDevTools){
-                NameValueCollection headers = request.Headers;
-                headers.Remove("x-devtools-emulate-network-conditions-client-id");
-                request.Headers = headers;
-            }
-
-            return base.OnBeforeResourceLoad(browserControl, browser, frame, request, callback);
-        }
-
-        protected override bool OnResourceResponse(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IResponse response){
-            if ((request.ResourceType == ResourceType.Script || request.ResourceType == ResourceType.Stylesheet) && TweetDeckHashes.Count > 0){
-                string url = request.Url;
-                Match match = TweetDeckResourceUrl.Match(url);
-
-                if (match.Success && TweetDeckHashes.TryGetValue($"{match.Groups[1]}.{match.Groups[3]}", out string hash)){
-                    if (match.Groups[2].Value == hash){
-                        Program.Reporter.LogVerbose("[RequestHandlerBase] Accepting " + url);
-                    }
-                    else{
-                        Program.Reporter.LogVerbose("[RequestHandlerBase] Replacing " + url + " hash with " + hash);
-                        request.Url = TweetDeckResourceUrl.Replace(url, $"/dist/$1.{hash}.$3");
-                        return true;
-                    }
-                }
-            }
-
-            return base.OnResourceResponse(browserControl, browser, frame, request, response);
-        }
-    }
-}

Browser/Handling/ResourceRequestHandlerBrowser.cs

@@ -1,52 +0,0 @@
-using CefSharp;
-using TweetDuck.Browser.Handling.Filters;
-using TweetDuck.Utils;
-using TweetLib.Core.Features.Twitter;
-
-namespace TweetDuck.Browser.Handling{
-    class ResourceRequestHandlerBrowser : ResourceRequestHandlerBase{
-        private const string UrlVendorResource = "/dist/vendor";
-        private const string UrlLoadingSpinner = "/backgrounds/spinner_blue";
-        private const string UrlVersionCheck = "/web/dist/version.json";
-
-        protected override CefReturnValue OnBeforeResourceLoad(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IRequestCallback callback){
-            if (request.ResourceType == ResourceType.MainFrame){
-                if (request.Url.EndsWith("//twitter.com/")){
-                    request.Url = TwitterUrls.TweetDeck; // redirect plain twitter.com requests, fixes bugs with login 2FA
-                }
-            }
-            else if (request.ResourceType == ResourceType.Image){
-                if (request.Url.Contains(UrlLoadingSpinner)){
-                    request.Url = TwitterUtils.LoadingSpinner.Url;
-                }
-            }
-            else if (request.ResourceType == ResourceType.Script){
-                string url = request.Url;
-
-                if (url.Contains("analytics.")){
-                    callback.Dispose();
-                    return CefReturnValue.Cancel;
-                }
-                else if (url.Contains(UrlVendorResource)){
-                    request.SetHeaderByName("Accept-Encoding", "identity", overwrite: true);
-                }
-            }
-            else if (request.ResourceType == ResourceType.Xhr){
-                if (request.Url.Contains(UrlVersionCheck)){
-                    callback.Dispose();
-                    return CefReturnValue.Cancel;
-                }
-            }
-
-            return base.OnBeforeResourceLoad(browserControl, browser, frame, request, callback);
-        }
-
-        protected override IResponseFilter GetResourceResponseFilter(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IResponse response){
-            if (request.ResourceType == ResourceType.Script && request.Url.Contains(UrlVendorResource) && int.TryParse(response.Headers["Content-Length"], out int totalBytes)){
-                return new ResponseFilterVendor(totalBytes);
-            }
-
-            return base.GetResourceResponseFilter(browserControl, browser, frame, request, response);
-        }
-    }
-}

Browser/Handling/ResponseFilter.cs

@@ -0,0 +1,76 @@
+using System;
+using System.IO;
+using CefSharp;
+using TweetLib.Browser.Interfaces;
+
+namespace TweetDuck.Browser.Handling {
+	sealed class ResponseFilter : IResponseFilter {
+		private enum State {
+			Reading,
+			Writing,
+			Done
+		}
+
+		private readonly IResponseProcessor processor;
+		private byte[] responseData;
+
+		private State state;
+		private int offset;
+
+		public ResponseFilter(IResponseProcessor processor, int totalBytes) {
+			this.processor = processor;
+			this.responseData = new byte[totalBytes];
+			this.state = State.Reading;
+		}
+
+		public bool InitFilter() {
+			return true;
+		}
+
+		FilterStatus IResponseFilter.Filter(Stream dataIn, out long dataInRead, Stream dataOut, out long dataOutWritten) {
+			int responseLength = responseData.Length;
+
+			if (state == State.Reading) {
+				int bytesToRead = Math.Min(responseLength - offset, (int) Math.Min(dataIn?.Length ?? 0, int.MaxValue));
+
+				dataIn?.Read(responseData, offset, bytesToRead);
+				offset += bytesToRead;
+
+				dataInRead = bytesToRead;
+				dataOutWritten = 0;
+
+				if (offset >= responseLength) {
+					responseData = processor.Process(responseData);
+					state = State.Writing;
+					offset = 0;
+				}
+
+				return FilterStatus.NeedMoreData;
+			}
+			else if (state == State.Writing) {
+				int bytesToWrite = Math.Min(responseLength - offset, (int) Math.Min(dataOut.Length, int.MaxValue));
+
+				if (bytesToWrite > 0) {
+					dataOut.Write(responseData, offset, bytesToWrite);
+					offset += bytesToWrite;
+				}
+
+				dataOutWritten = bytesToWrite;
+				dataInRead = 0;
+
+				if (offset < responseLength) {
+					return FilterStatus.NeedMoreData;
+				}
+				else {
+					state = State.Done;
+					return FilterStatus.Done;
+				}
+			}
+			else {
+				throw new InvalidOperationException("This resource filter cannot be reused.");
+			}
+		}
+
+		public void Dispose() {}
+	}
+}

Browser/Notification/Example/FormNotificationExample.cs

@@ -1,68 +0,0 @@
-using System;
-using System.Windows.Forms;
-using CefSharp;
-using TweetDuck.Controls;
-using TweetLib.Core.Features.Notifications;
-using TweetLib.Core.Features.Plugins;
-
-namespace TweetDuck.Browser.Notification.Example{
-    sealed class FormNotificationExample : FormNotificationMain{
-        public override bool RequiresResize => true;
-        protected override bool CanDragWindow => Config.NotificationPosition == DesktopNotification.Position.Custom;
-
-        protected override FormBorderStyle NotificationBorderStyle{
-            get{
-                if (Config.NotificationSize == DesktopNotification.Size.Custom){
-                    switch(base.NotificationBorderStyle){
-                        case FormBorderStyle.FixedSingle: return FormBorderStyle.Sizable;
-                        case FormBorderStyle.FixedToolWindow: return FormBorderStyle.SizableToolWindow;
-                    }
-                }
-
-                return base.NotificationBorderStyle;
-            }
-        }
-
-        protected override string BodyClasses => base.BodyClasses + " td-example";
-
-        public event EventHandler Ready;
-
-        private readonly DesktopNotification exampleNotification;
-
-        public FormNotificationExample(FormBrowser owner, PluginManager pluginManager) : base(owner, pluginManager, false){
-            browser.LoadingStateChanged += browser_LoadingStateChanged;
-
-            string exampleTweetHTML = Program.Resources.LoadSilent("pages/example.html")?.Replace("{avatar}", AppLogo.Url) ?? string.Empty;
-
-            #if DEBUG
-            exampleTweetHTML = exampleTweetHTML.Replace("</p>", @"</p><div style='margin-top:256px'>Scrollbar test padding...</div>");
-            #endif
-
-            exampleNotification = new DesktopNotification(string.Empty, string.Empty, "Home", exampleTweetHTML, 176, string.Empty, string.Empty);
-        }
-
-        private void browser_LoadingStateChanged(object sender, LoadingStateChangedEventArgs e){
-            if (!e.IsLoading){
-                Ready?.Invoke(this, EventArgs.Empty);
-                browser.LoadingStateChanged -= browser_LoadingStateChanged;
-            }
-        }
-
-        public override void HideNotification(){
-            Location = ControlExtensions.InvisibleLocation;
-        }
-
-        public override void FinishCurrentNotification(){}
-
-        public void ShowExampleNotification(bool reset){
-            if (reset){
-                LoadTweet(exampleNotification);
-            }
-            else{
-                PrepareAndDisplayWindow();
-            }
-
-            UpdateTitle();
-        }
-    }
-}

Browser/Notification/FormNotificationBase.cs

@@ -1,36 +1,21 @@
 using System.Drawing;
 using System.Windows.Forms;
 using CefSharp.WinForms;
-using TweetDuck.Browser.Data;
+using TweetDuck.Browser.Adapters;
 using TweetDuck.Browser.Handling;
-using TweetDuck.Browser.Handling.General;
 using TweetDuck.Configuration;
 using TweetDuck.Controls;
-using TweetDuck.Management.Analytics;
 using TweetDuck.Utils;
+using TweetLib.Browser.Interfaces;
 using TweetLib.Core.Features.Notifications;
 using TweetLib.Core.Features.Twitter;
+using TweetLib.Core.Systems.Configuration;
 
 namespace TweetDuck.Browser.Notification {
-    abstract partial class FormNotificationBase : Form, AnalyticsFile.IProvider{
-        public static readonly ResourceLink AppLogo = new ResourceLink("https://ton.twimg.com/tduck/avatar", ResourceHandlers.ForBytes(Properties.Resources.avatar, "image/png"));
-
-        protected const string BlankURL = TwitterUrls.TweetDeck + "/?blank";
-
-        public static string FontSize = null;
-        public static string HeadLayout = null;
-
+	abstract partial class FormNotificationBase : Form {
 		protected static UserConfig Config => Program.Config.User;
 
-        protected static int FontSizeLevel{
-            get => FontSize switch{
-                "largest"  => 4,
-                "large"    => 3,
-                "small"    => 1,
-                "smallest" => 0,
-                _          => 2
-            };
-        }
+		protected delegate NotificationBrowser CreateBrowserImplFunc(FormNotificationBase form, IBrowserComponent browserComponent);
 
 		protected virtual Point PrimaryLocation {
 			get {
@@ -96,14 +81,15 @@ namespace TweetDuck.Browser.Notification{
 			}
 		}
 
-        public AnalyticsFile AnalyticsFile => owner.AnalyticsFile;
-        
 		protected override bool ShowWithoutActivation => true;
 
 		protected float DpiScale { get; }
 		protected double SizeScale => DpiScale * Config.ZoomLevel / 100.0;
 
-        protected readonly FormBrowser owner;
+		private readonly FormBrowser owner;
+
+		protected readonly IBrowserComponent browserComponent;
+		private readonly NotificationBrowser browserImpl;
 
 		#pragma warning disable IDE0069 // Disposable fields should be disposed
 		protected readonly ChromiumWebBrowser browser;
@@ -117,43 +103,33 @@ namespace TweetDuck.Browser.Notification{
 		public string CurrentTweetUrl => currentNotification?.TweetUrl;
 		public string CurrentQuoteUrl => currentNotification?.QuoteUrl;
 
-        public bool CanViewDetail => currentNotification != null && !string.IsNullOrEmpty(currentNotification.ColumnId) && !string.IsNullOrEmpty(currentNotification.ChirpId);
-
 		protected bool IsPaused => pauseCounter > 0;
-        protected bool IsCursorOverBrowser => browser.Bounds.Contains(PointToClient(Cursor.Position));
+		protected internal bool IsCursorOverBrowser => browser.Bounds.Contains(PointToClient(Cursor.Position));
 
 		public bool FreezeTimer { get; set; }
 		public bool ContextMenuOpen { get; set; }
 
-        protected FormNotificationBase(FormBrowser owner, bool enableContextMenu){
+		protected FormNotificationBase(FormBrowser owner, CreateBrowserImplFunc createBrowserImpl) {
 			InitializeComponent();
 
 			this.owner = owner;
 			this.owner.FormClosed += owner_FormClosed;
 
-            var resourceRequestHandler = new ResourceRequestHandlerBase();
-            var resourceHandlers = resourceRequestHandler.ResourceHandlers;
-
-            resourceHandlers.Register(BlankURL, ResourceHandlers.ForString(string.Empty));
-            resourceHandlers.Register(TwitterUrls.TweetDeck, () => this.resourceHandler);
-            resourceHandlers.Register(AppLogo);
-
-            this.browser = new ChromiumWebBrowser(BlankURL){
-                MenuHandler = new ContextMenuNotification(this, enableContextMenu),
-                JsDialogHandler = new JavaScriptDialogHandler(),
-                LifeSpanHandler = new LifeSpanHandler(),
-                RequestHandler = new RequestHandlerBase(false),
-                ResourceRequestHandlerFactory = resourceRequestHandler.SelfFactory
+			this.browser = new ChromiumWebBrowser(NotificationBrowser.BlankURL) {
+				RequestHandler = new RequestHandlerBase(false)
 			};
 
+			this.browserComponent = new ComponentImpl(browser, this);
+			this.browserImpl = createBrowserImpl(this, browserComponent);
+
 			this.browser.Dock = DockStyle.None;
 			this.browser.ClientSize = ClientSize;
-            this.browser.SetupZoomEvents();
 
 			Controls.Add(browser);
 
 			Disposed += (sender, args) => {
 				this.owner.FormClosed -= owner_FormClosed;
+				this.browserImpl.Dispose();
 				this.browser.Dispose();
 			};
 
@@ -163,6 +139,25 @@ namespace TweetDuck.Browser.Notification{
 			UpdateTitle();
 		}
 
+		protected sealed class ComponentImpl : CefBrowserComponent {
+			private readonly FormNotificationBase owner;
+
+			public ComponentImpl(ChromiumWebBrowser browser, FormNotificationBase owner) : base(browser) {
+				this.owner = owner;
+			}
+
+			protected override ContextMenuBase SetupContextMenu(IContextMenuHandler handler) {
+				return new ContextMenuNotification(owner, handler);
+			}
+
+			protected override CefResourceHandlerFactory SetupResourceHandlerFactory(IResourceRequestHandler handler) {
+				var registry = new CefResourceHandlerRegistry();
+				registry.RegisterStatic(NotificationBrowser.BlankURL, string.Empty);
+				registry.RegisterDynamic(TwitterUrls.TweetDeck, owner.resourceHandler);
+				return new CefResourceHandlerFactory(handler, registry);
+			}
+		}
+
 		protected override void Dispose(bool disposing) {
 			if (disposing) {
 				components?.Dispose();
@@ -189,7 +184,7 @@ namespace TweetDuck.Browser.Notification{
 		// notification methods
 
 		public virtual void HideNotification() {
-            browser.Load(BlankURL);
+			browser.Load(NotificationBrowser.BlankURL);
 			DisplayTooltip(null);
 
 			Location = ControlExtensions.InvisibleLocation;
@@ -210,11 +205,9 @@ namespace TweetDuck.Browser.Notification{
 			}
 		}
 
-        protected abstract string GetTweetHTML(DesktopNotification tweet);
-
 		protected virtual void LoadTweet(DesktopNotification tweet) {
 			currentNotification = tweet;
-            resourceHandler.SetHTML(GetTweetHTML(tweet));
+			resourceHandler.SetHTML(browserImpl.GetTweetHTML(tweet));
 
 			browser.Load(TwitterUrls.TweetDeck);
 			DisplayTooltip(null);
@@ -230,8 +223,8 @@ namespace TweetDuck.Browser.Notification{
 		}
 
 		public void ShowTweetDetail() {
-            if (currentNotification != null){
-                owner.ShowTweetDetail(currentNotification.ColumnId, currentNotification.ChirpId, currentNotification.TweetUrl);
+			if (currentNotification != null && owner.ShowTweetDetail(currentNotification.ColumnId, currentNotification.ChirpId, currentNotification.TweetUrl)) {
+				FinishCurrentNotification();
 			}
 		}
 

Browser/Notification/FormNotificationExample.cs

@@ -0,0 +1,62 @@
+using System;
+using System.Windows.Forms;
+using TweetDuck.Controls;
+using TweetLib.Browser.Interfaces;
+using TweetLib.Core.Features.Notifications;
+using TweetLib.Core.Features.Plugins;
+using TweetLib.Core.Features.TweetDeck;
+using TweetLib.Core.Resources;
+
+namespace TweetDuck.Browser.Notification {
+	sealed class FormNotificationExample : FormNotificationMain {
+		private static NotificationBrowser CreateBrowserImpl(IBrowserComponent browserComponent, INotificationInterface notificationInterface, ITweetDeckInterface tweetDeckInterface, PluginManager pluginManager) {
+			return new NotificationBrowser.Example(browserComponent, notificationInterface, tweetDeckInterface, pluginManager);
+		}
+
+		public override bool RequiresResize => true;
+		protected override bool CanDragWindow => Config.NotificationPosition == DesktopNotification.Position.Custom;
+
+		protected override FormBorderStyle NotificationBorderStyle {
+			get {
+				if (Config.NotificationSize == DesktopNotification.Size.Custom) {
+					switch (base.NotificationBorderStyle) {
+						case FormBorderStyle.FixedSingle: return FormBorderStyle.Sizable;
+						case FormBorderStyle.FixedToolWindow: return FormBorderStyle.SizableToolWindow;
+					}
+				}
+
+				return base.NotificationBorderStyle;
+			}
+		}
+
+		public event EventHandler Ready;
+
+		private readonly DesktopNotification exampleNotification;
+
+		public FormNotificationExample(FormBrowser owner, ITweetDeckInterface tweetDeckInterface, PluginManager pluginManager) : base(owner, (form, browserComponent) => CreateBrowserImpl(browserComponent, new NotificationInterfaceImpl(form), tweetDeckInterface, pluginManager)) {
+			browserComponent.BrowserLoaded += (sender, args) => {
+				Ready?.Invoke(this, EventArgs.Empty);
+			};
+
+			string exampleTweetHTML = ResourceUtils.ReadFileOrNull("notification/example/example.html") ?? string.Empty;
+			exampleNotification = new DesktopNotification(string.Empty, string.Empty, "Home", exampleTweetHTML, 176, string.Empty, string.Empty);
+		}
+
+		public override void HideNotification() {
+			Location = ControlExtensions.InvisibleLocation;
+		}
+
+		public override void FinishCurrentNotification() {}
+
+		public void ShowExampleNotification(bool reset) {
+			if (reset) {
+				LoadTweet(exampleNotification);
+			}
+			else {
+				PrepareAndDisplayWindow();
+			}
+
+			UpdateTitle();
+		}
+	}
+}

Browser/Notification/FormNotificationMain.cs

@@ -2,21 +2,50 @@
 using System.Drawing;
 using System.Windows.Forms;
 using CefSharp;
-using TweetDuck.Browser.Adapters;
-using TweetDuck.Browser.Bridge;
 using TweetDuck.Browser.Handling;
 using TweetDuck.Controls;
-using TweetDuck.Plugins;
 using TweetDuck.Utils;
-using TweetLib.Core.Data;
 using TweetLib.Core.Features.Notifications;
-using TweetLib.Core.Features.Plugins;
-using TweetLib.Core.Features.Plugins.Enums;
-using TweetLib.Core.Features.Twitter;
 
 namespace TweetDuck.Browser.Notification {
-    abstract partial class FormNotificationMain : FormNotificationBase{
-        private readonly PluginManager plugins;
+	abstract partial class FormNotificationMain : FormNotificationBase, CustomKeyboardHandler.IBrowserKeyHandler {
+		protected sealed class NotificationInterfaceImpl : INotificationInterface {
+			public bool FreezeTimer {
+				get => notification.FreezeTimer;
+				set => notification.FreezeTimer = value;
+			}
+
+			public bool IsHovered => notification.IsCursorOverBrowser;
+
+			private readonly FormNotificationBase notification;
+
+			public NotificationInterfaceImpl(FormNotificationBase notification) {
+				this.notification = notification;
+			}
+
+			public void DisplayTooltip(string text) {
+				notification.InvokeAsyncSafe(() => notification.DisplayTooltip(text));
+			}
+
+			public void FinishCurrentNotification() {
+				notification.InvokeAsyncSafe(notification.FinishCurrentNotification);
+			}
+
+			public void ShowTweetDetail() {
+				notification.InvokeAsyncSafe(notification.ShowTweetDetail);
+			}
+		}
+
+		private static int FontSizeLevel {
+			get => NotificationBrowser.FontSize switch {
+				"largest"  => 4,
+				"large"    => 3,
+				"small"    => 1,
+				"smallest" => 0,
+				_          => 2
+			};
+		}
+
 		private readonly int timerBarHeight;
 
 		protected int timeLeft, totalTime;
@@ -62,30 +91,21 @@ namespace TweetDuck.Browser.Notification{
 			};
 		}
 
-        protected virtual string BodyClasses => IsCursorOverBrowser ? "td-notification td-hover" : "td-notification";
-        
 		public Size BrowserSize => Config.DisplayNotificationTimer ? new Size(ClientSize.Width, ClientSize.Height - timerBarHeight) : ClientSize;
 
-        protected FormNotificationMain(FormBrowser owner, PluginManager pluginManager, bool enableContextMenu) : base(owner, enableContextMenu){
+		protected FormNotificationMain(FormBrowser owner, CreateBrowserImplFunc createBrowserImpl) : base(owner, createBrowserImpl) {
 			InitializeComponent();
 
-            this.plugins = pluginManager;
 			this.timerBarHeight = BrowserUtils.Scale(4, DpiScale);
 
-            browser.KeyboardHandler = new KeyboardHandlerNotification(this);
-            browser.RegisterJsBridge("$TD", new TweetDeckBridge.Notification(owner, this));
+			browser.KeyboardHandler = new CustomKeyboardHandler(this);
 
 			browser.LoadingStateChanged += Browser_LoadingStateChanged;
-            browser.FrameLoadEnd += Browser_FrameLoadEnd;
-
-            plugins.Register(PluginEnvironment.Notification, new PluginDispatcher(browser, url => TwitterUrls.IsTweetDeck(url) && url != BlankURL));
 
 			mouseHookDelegate = MouseHookProc;
 			Disposed += (sender, args) => StopMouseHook(true);
 		}
 
-        // helpers
-
 		private void SetOpacity(int opacity) {
 			if (currentOpacity != opacity) {
 				currentOpacity = opacity;
@@ -117,7 +137,7 @@ namespace TweetDuck.Browser.Notification{
 					int delta = BrowserUtils.Scale(NativeMethods.GetMouseHookData(lParam), Config.NotificationScrollSpeed * 0.01);
 
 					if (Config.EnableSmoothScrolling) {
-                        browser.ExecuteScriptAsync("window.TDGF_scrollSmoothly", (int)Math.Round(-delta / 0.6));
+						browser.BrowserCore.ExecuteScriptAsync("window.TDGF_scrollSmoothly", (int) Math.Round(-delta / 0.6));
 					}
 					else {
 						browser.SendMouseWheelEvent(0, 0, 0, delta, CefEventFlags.None);
@@ -136,7 +156,6 @@ namespace TweetDuck.Browser.Notification{
 					}
 
 					blockXButtonUp = true;
-                    this.InvokeAsyncSafe(AnalyticsFile.NotificationExtraMouseButtons.Trigger);
 					return NativeMethods.HOOK_HANDLED;
 				}
 				else if (eventType == NativeMethods.WM_XBUTTONUP && blockXButtonUp) {
@@ -163,7 +182,7 @@ namespace TweetDuck.Browser.Notification{
 		}
 
 		private void Browser_LoadingStateChanged(object sender, LoadingStateChangedEventArgs e) {
-            if (!e.IsLoading && browser.Address != BlankURL){
+			if (!e.IsLoading && browser.Address != NotificationBrowser.BlankURL) {
 				this.InvokeSafe(() => {
 					Visible = true; // ensures repaint before moving the window to a visible location
 					timerDisplayDelay.Start();
@@ -171,15 +190,6 @@ namespace TweetDuck.Browser.Notification{
 			}
 		}
 
-        private void Browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e){
-            IFrame frame = e.Frame;
-
-            if (frame.IsMain && browser.Address != BlankURL){
-                frame.ExecuteJavaScriptAsync(PropertyBridge.GenerateScript(PropertyBridge.Environment.Notification));
-                CefScriptExecutor.RunFile(frame, "notification.js");
-            }
-        }
-
 		private void timerDisplayDelay_Tick(object sender, EventArgs e) {
 			OnNotificationReady();
 			timerDisplayDelay.Stop();
@@ -250,16 +260,6 @@ namespace TweetDuck.Browser.Notification{
 			}
 		}
 
-        protected override string GetTweetHTML(DesktopNotification tweet){
-            string html = tweet.GenerateHtml(BodyClasses, HeadLayout, Config.CustomNotificationCSS);
-
-            foreach(InjectedHTML injection in plugins.NotificationInjections){
-                html = injection.InjectInto(html);
-            }
-
-            return html;
-        }
-
 		protected override void LoadTweet(DesktopNotification tweet) {
 			timerProgress.Stop();
 			totalTime = timeLeft = tweet.GetDisplayDuration(Config.NotificationDurationValue);
@@ -295,5 +295,24 @@ namespace TweetDuck.Browser.Notification{
 			PrepareAndDisplayWindow();
 			timerProgress.Start();
 		}
+
+		bool CustomKeyboardHandler.IBrowserKeyHandler.HandleBrowserKey(Keys key) {
+			switch (key) {
+				case Keys.Enter:
+					this.InvokeAsyncSafe(FinishCurrentNotification);
+					return true;
+
+				case Keys.Escape:
+					this.InvokeAsyncSafe(HideNotification);
+					return true;
+
+				case Keys.Space:
+					this.InvokeAsyncSafe(() => FreezeTimer = !FreezeTimer);
+					return true;
+
+				default:
+					return false;
+			}
+		}
 	}
 }

Browser/Notification/FormNotificationTweet.cs

@@ -3,11 +3,17 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
 using TweetDuck.Utils;
+using TweetLib.Browser.Interfaces;
 using TweetLib.Core.Features.Notifications;
 using TweetLib.Core.Features.Plugins;
+using TweetLib.Core.Features.TweetDeck;
 
 namespace TweetDuck.Browser.Notification {
 	sealed partial class FormNotificationTweet : FormNotificationMain {
+		private static NotificationBrowser CreateBrowserImpl(IBrowserComponent browserComponent, INotificationInterface notificationInterface, ITweetDeckInterface tweetDeckInterface, PluginManager pluginManager) {
+			return new NotificationBrowser.Tweet(browserComponent, notificationInterface, tweetDeckInterface, pluginManager);
+		}
+
 		private const int NonIntrusiveIdleLimit = 30;
 		private const int TrimMinimum = 32;
 
@@ -30,7 +36,7 @@ namespace TweetDuck.Browser.Notification{
 		private bool needsTrim;
 		private bool hasTemporarilyMoved;
 
-        public FormNotificationTweet(FormBrowser owner, PluginManager pluginManager) : base(owner, pluginManager, true){
+		public FormNotificationTweet(FormBrowser owner, ITweetDeckInterface tweetDeckInterface, PluginManager pluginManager) : base(owner, (form, browserComponent) => CreateBrowserImpl(browserComponent, new NotificationInterfaceImpl(form), tweetDeckInterface, pluginManager)) {
 			InitializeComponent();
 
 			Config.MuteToggled += Config_MuteToggled;
@@ -94,7 +100,6 @@ namespace TweetDuck.Browser.Notification{
 			}
 
 			needsTrim |= tweetQueue.Count >= TrimMinimum;
-            AnalyticsFile.DesktopNotifications.Trigger();
 		}
 
 		public override void HideNotification() {

Browser/Notification/Screenshot/FormNotificationScreenshotable.cs

@@ -1,98 +1,84 @@
 using System;
 using System.Drawing;
-using System.Drawing.Imaging;
-using System.Windows.Forms;
+using System.IO;
+using System.Threading.Tasks;
 using CefSharp;
-using TweetDuck.Browser.Adapters;
+using CefSharp.DevTools.Page;
 using TweetDuck.Controls;
 using TweetDuck.Dialogs;
 using TweetDuck.Utils;
-using TweetLib.Core.Data;
+using TweetLib.Browser.Interfaces;
 using TweetLib.Core.Features.Notifications;
 using TweetLib.Core.Features.Plugins;
+using TweetLib.Core.Resources;
 
 namespace TweetDuck.Browser.Notification.Screenshot {
 	sealed class FormNotificationScreenshotable : FormNotificationBase {
-        protected override bool CanDragWindow => false;
-
-        private readonly PluginManager plugins;
-        private int height;
-
-        public FormNotificationScreenshotable(Action callback, FormBrowser owner, PluginManager pluginManager, string html, int width) : base(owner, false){
-            this.plugins = pluginManager;
-
-            int realWidth = BrowserUtils.Scale(width, DpiScale);
-
-            browser.RegisterJsBridge("$TD_NotificationScreenshot", new ScreenshotBridge(this, SetScreenshotHeight, callback));
-
-            browser.LoadingStateChanged += (sender, args) => {
-                if (args.IsLoading){
-                    return;
+		private static NotificationBrowser CreateBrowserImpl( IBrowserComponent browserComponent, PluginManager pluginManager) {
+			return new NotificationBrowser.Screenshot(browserComponent, pluginManager.NotificationInjections);
 		}
 
-                string script = Program.Resources.LoadSilent("screenshot.js");
+		protected override bool CanDragWindow => false;
+
+		private int height;
+
+		public FormNotificationScreenshotable(Action callback, FormBrowser owner, PluginManager pluginManager, string html, int width) : base(owner, (_, browserComponent) => CreateBrowserImpl(browserComponent, pluginManager)) {
+			int realWidth = BrowserUtils.Scale(width, DpiScale);
+
+			browserComponent.AttachBridgeObject("$TD_NotificationScreenshot", new ScreenshotBridge(this, SetScreenshotHeight, callback));
+
+			browserComponent.BrowserLoaded += (sender, args) => {
+				string script = ResourceUtils.ReadFileOrNull("notification/screenshot/screenshot.js");
 
 				if (script == null) {
 					this.InvokeAsyncSafe(callback);
 					return;
 				}
 
-                using IFrame frame = args.Browser.MainFrame;
-                CefScriptExecutor.RunScript(frame, script.Replace("{width}", realWidth.ToString()).Replace("{frames}", TweetScreenshotManager.WaitFrames.ToString()), "gen:screenshot");
+				string substituted = script.Replace("{width}", realWidth.ToString()).Replace("1/*FRAMES*/", TweetScreenshotManager.WaitFrames.ToString());
+				browserComponent.RunScript("gen:screenshot", substituted);
 			};
 
 			SetNotificationSize(realWidth, 1024);
 			LoadTweet(new DesktopNotification(string.Empty, string.Empty, string.Empty, html, 0, string.Empty, string.Empty));
 		}
 
-        protected override string GetTweetHTML(DesktopNotification tweet){
-            string html = tweet.GenerateHtml("td-screenshot", HeadLayout, Config.CustomNotificationCSS);
-
-            foreach(InjectedHTML injection in plugins.NotificationInjections){
-                html = injection.InjectInto(html);
-            }
-
-            return html;
-        }
-
 		private void SetScreenshotHeight(int browserHeight) {
 			this.height = BrowserUtils.Scale(browserHeight, SizeScale);
 		}
 
-        public bool TakeScreenshot(bool ignoreHeightError = false){
+		public Task<Image> TakeScreenshot(bool ignoreHeightError = false) {
 			if (!ignoreHeightError) {
 				if (height == 0) {
 					FormMessage.Error("Screenshot Failed", "Could not detect screenshot size.", FormMessage.OK);
-                    return false;
+					return null;
 				}
 				else if (height > ClientSize.Height) {
 					FormMessage.Error("Screenshot Failed", $"Screenshot is too large: {height}px > {ClientSize.Height}px", FormMessage.OK);
-                    return false;
+					return null;
 				}
 			}
 
-            if (!WindowsUtils.IsAeroEnabled){
-                MoveToVisibleLocation(); // TODO make this look nicer I guess
+			return Task.Run(TakeScreenshotImpl);
 		}
 
-            IntPtr context = NativeMethods.GetDC(this.Handle);
-
-            if (context == IntPtr.Zero){
-                FormMessage.Error("Screenshot Failed", "Could not retrieve a graphics context handle for the notification window to take the screenshot.", FormMessage.OK);
-                return false;
-            }
-            else{
-                using Bitmap bmp = new Bitmap(ClientSize.Width, Math.Max(1, height), PixelFormat.Format32bppRgb);
-
-                try{
-                    NativeMethods.RenderSourceIntoBitmap(context, bmp);
-                }finally{
-                    NativeMethods.ReleaseDC(this.Handle, context);
+		private async Task<Image> TakeScreenshotImpl() {
+			if (this.height == 0) {
+				return null;
 			}
 
-                Clipboard.SetImage(bmp);
-                return true;
-            }
+			Viewport viewport = new Viewport {
+				Width = this.ClientSize.Width,
+				Height = this.height,
+				Scale = 1
+			};
+
+			byte[] data;
+			using (var devToolsClient = browser.GetDevToolsClient()) {
+				data = (await devToolsClient.Page.CaptureScreenshotAsync(CaptureScreenshotFormat.Png, clip: viewport)).Data;
+			}
+
+			return Image.FromStream(new MemoryStream(data));
 		}
 	}
 }

Browser/Notification/Screenshot/TweetScreenshotManager.cs

@@ -7,14 +7,16 @@
 #endif
 
 using System;
+using System.Drawing;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 using TweetDuck.Controls;
+using TweetLib.Core;
 using TweetLib.Core.Features.Plugins;
-
 #if GEN_SCREENSHOT_FRAMES
 using System.Drawing.Imaging;
 using System.IO;
-using TweetDuck.Core.Utils;
+using TweetDuck.Utils;
 #endif
 
 namespace TweetDuck.Browser.Notification.Screenshot {
@@ -86,8 +88,15 @@ namespace TweetDuck.Browser.Notification.Screenshot{
 			}
 
 			timeout.Stop();
-            screenshot.TakeScreenshot();
+			screenshot.TakeScreenshot().ContinueWith(HandleResult, TaskScheduler.FromCurrentSynchronizationContext());
+		}
 
+		private void HandleResult(Task<Image> task) {
+			if (task.IsFaulted) {
+				App.ErrorHandler.HandleException("Screenshot Failed", "An error occurred while taking a screenshot.", true, task.Exception!.InnerException);
+			}
+			else if (task.IsCompleted) {
+				Clipboard.SetImage(task.Result);
 				#if !NO_HIDE_SCREENSHOTS
 				OnFinished();
 				#else
@@ -95,6 +104,7 @@ namespace TweetDuck.Browser.Notification.Screenshot{
 				screenshot.FormClosed += (sender, args) => disposer.Start();
 				#endif
 			}
+		}
 
 		private void OnFinished() {
 			#if GEN_SCREENSHOT_FRAMES
@@ -132,17 +142,23 @@ namespace TweetDuck.Browser.Notification.Screenshot{
 		}
 
 		private void debugger_Tick(object sender, EventArgs e) {
-            if (frameCounter < 63 && screenshot.TakeScreenshot(true)){
-                try{
-                    Clipboard.GetImage()?.Save(Path.Combine(DebugScreenshotPath, "frame_" + (++frameCounter) + ".png"), ImageFormat.Png);
-                }catch{
-                    System.Diagnostics.Debug.WriteLine("Failed generating frame " + frameCounter);
-                }
+			if (frameCounter < 63) {
+				int frame = ++frameCounter;
+				screenshot.TakeScreenshot(true).ContinueWith(task => SaveDebugFrame(task, frame), TaskScheduler.FromCurrentSynchronizationContext());
 			}
 			else {
 				debugger.Stop();
 			}
 		}
+
+		private static void SaveDebugFrame(Task<Image> task, int frame) {
+			if (task.IsFaulted) {
+				System.Diagnostics.Debug.WriteLine("Failed generating frame " + frame + ": " + task.Exception!.InnerException);
+			}
+			else if (task.IsCompleted) {
+				task.Result?.Save(Path.Combine(DebugScreenshotPath, "frame_" + (++frame) + ".png"), ImageFormat.Png);
+			}
+		}
 		#endif
 	}
 }

Browser/Notification/SoundNotification.cs

@@ -1,19 +1,36 @@
-using System;
-using System.Drawing;
+using System.Drawing;
 using System.IO;
 using System.Windows.Forms;
-using CefSharp;
-using TweetDuck.Browser.Data;
+using TweetDuck.Browser.Adapters;
 using TweetDuck.Controls;
 using TweetDuck.Dialogs;
 using TweetDuck.Dialogs.Settings;
 using TweetDuck.Management;
+using TweetLib.Core.Features.TweetDeck;
 
 namespace TweetDuck.Browser.Notification {
-    static class SoundNotification{
+	sealed class SoundNotification : ISoundNotificationHandler {
 		public const string SupportedFormats = "*.wav;*.ogg;*.mp3;*.flac;*.opus;*.weba;*.webm";
 
-        public static Func<IResourceHandler> CreateFileHandler(string path){
+		private readonly CefResourceHandlerRegistry registry;
+
+		public SoundNotification(CefResourceHandlerRegistry registry) {
+			this.registry = registry;
+		}
+
+		public void Unregister(string url) {
+			registry.Unregister(url);
+		}
+
+		public void Register(string url, string path) {
+			var fileHandler = CreateFileHandler(path);
+			if (fileHandler.HasValue) {
+				var (data, mimeType) = fileHandler.Value;
+				registry.RegisterStatic(url, data, mimeType);
+			}
+		}
+
+		private static (byte[] data, string mimeType)? CreateFileHandler(string path) {
 			string mimeType = Path.GetExtension(path) switch {
 				".weba" => "audio/webm",
 				".webm" => "audio/webm",
@@ -26,7 +43,7 @@ namespace TweetDuck.Browser.Notification{
 			};
 
 			try {
-                return ResourceHandlers.ForBytes(File.ReadAllBytes(path), mimeType);
+				return (File.ReadAllBytes(path), mimeType);
 			} catch {
 				FormBrowser browser = FormManager.TryFind<FormBrowser>();
 

Browser/TrayIcon.cs

@@ -2,12 +2,17 @@
 using System.ComponentModel;
 using System.Windows.Forms;
 using TweetDuck.Configuration;
+using TweetLib.Core.Systems.Configuration;
 using Res = TweetDuck.Properties.Resources;
 
 namespace TweetDuck.Browser {
 	sealed partial class TrayIcon : Component {
 		public enum Behavior { // keep order
-            Disabled, DisplayOnly, MinimizeToTray, CloseToTray, Combined
+			Disabled,
+			DisplayOnly,
+			MinimizeToTray,
+			CloseToTray,
+			Combined
 		}
 
 		private static UserConfig Config => Program.Config.User;
@@ -74,7 +79,7 @@ namespace TweetDuck.Browser{
 
 		private void UpdateIcon() {
 			if (Visible) {
-                notifyIcon.Icon = hasNotifications ? Res.icon_tray_new : Config.MuteNotifications ? Res.icon_tray_muted : Res.icon_tray;
+				notifyIcon.Icon = HasNotifications ? Res.icon_tray_new : Config.MuteNotifications ? Res.icon_tray_muted : Res.icon_tray;
 			}
 		}
 

Browser/TweetDeckBrowser.cs

@@ -1,32 +1,25 @@
 using System;
 using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
 using CefSharp;
 using CefSharp.WinForms;
 using TweetDuck.Browser.Adapters;
-using TweetDuck.Browser.Bridge;
-using TweetDuck.Browser.Data;
 using TweetDuck.Browser.Handling;
-using TweetDuck.Browser.Handling.General;
 using TweetDuck.Browser.Notification;
 using TweetDuck.Configuration;
-using TweetDuck.Controls;
-using TweetDuck.Plugins;
 using TweetDuck.Utils;
 using TweetLib.Core.Features.Plugins;
-using TweetLib.Core.Features.Plugins.Enums;
+using TweetLib.Core.Features.TweetDeck;
 using TweetLib.Core.Features.Twitter;
-using TweetLib.Core.Utils;
+using TweetLib.Core.Systems.Updates;
+using IContextMenuHandler = TweetLib.Browser.Interfaces.IContextMenuHandler;
+using IResourceRequestHandler = TweetLib.Browser.Interfaces.IResourceRequestHandler;
+using TweetDeckBrowserImpl = TweetLib.Core.Features.TweetDeck.TweetDeckBrowser;
 
 namespace TweetDuck.Browser {
 	sealed class TweetDeckBrowser : IDisposable {
-        private static UserConfig Config => Program.Config.User;
+		public static readonly Color BackgroundColor = Color.FromArgb(28, 99, 153);
 
-        private const string ErrorUrl = "http://td/error";
-        private const string TwitterStyleUrl = "https://abs.twimg.com/tduck/css";
-
-        public bool Ready { get; private set; }
+		public bool Ready => browserComponent.Ready;
 
 		public bool Enabled {
 			get => browser.Enabled;
@@ -44,52 +37,62 @@ namespace TweetDuck.Browser{
 			}
 		}
 
+		public TweetDeckFunctions Functions => browserImpl.Functions;
+
+		private readonly CefBrowserComponent browserComponent;
+		private readonly TweetDeckBrowserImpl browserImpl;
 		private readonly ChromiumWebBrowser browser;
-        private readonly ResourceHandlers resourceHandlers;
-
-        private string prevSoundNotificationPath = null;
-
-        public TweetDeckBrowser(FormBrowser owner, PluginManager plugins, TweetDeckBridge tdBridge, UpdateBridge updateBridge){
-            var resourceRequestHandler = new ResourceRequestHandlerBrowser();
-            resourceHandlers = resourceRequestHandler.ResourceHandlers;
-
-            resourceHandlers.Register(FormNotificationBase.AppLogo);
-            resourceHandlers.Register(TwitterUtils.LoadingSpinner);
 
+		public TweetDeckBrowser(FormBrowser owner, PluginManager pluginManager, ITweetDeckInterface tweetDeckInterface, UpdateChecker updateChecker) {
 			RequestHandlerBrowser requestHandler = new RequestHandlerBrowser();
 
 			this.browser = new ChromiumWebBrowser(TwitterUrls.TweetDeck) {
 				DialogHandler = new FileDialogHandler(),
 				DragHandler = new DragHandlerBrowser(requestHandler),
-                MenuHandler = new ContextMenuBrowser(owner),
-                JsDialogHandler = new JavaScriptDialogHandler(),
-                KeyboardHandler = new KeyboardHandlerBrowser(owner),
-                LifeSpanHandler = new LifeSpanHandler(),
-                RequestHandler = requestHandler,
-                ResourceRequestHandlerFactory = resourceRequestHandler.SelfFactory
+				KeyboardHandler = new CustomKeyboardHandler(owner),
+				RequestHandler = requestHandler
 			};
 
-            this.browser.LoadingStateChanged += browser_LoadingStateChanged;
-            this.browser.FrameLoadStart += browser_FrameLoadStart;
-            this.browser.FrameLoadEnd += browser_FrameLoadEnd;
-            this.browser.LoadError += browser_LoadError;
+			// ReSharper disable once PossiblyImpureMethodCallOnReadonlyVariable
+			this.browser.BrowserSettings.BackgroundColor = (uint) BackgroundColor.ToArgb();
 
-            this.browser.RegisterJsBridge("$TD", tdBridge);
-            this.browser.RegisterJsBridge("$TDU", updateBridge);
+			var extraContext = new TweetDeckExtraContext();
+			var resourceHandlerRegistry = new CefResourceHandlerRegistry();
+			var soundNotificationHandler = new SoundNotification(resourceHandlerRegistry);
 
-            this.browser.BrowserSettings.BackgroundColor = (uint)TwitterUtils.BackgroundColor.ToArgb();
-            this.browser.Dock = DockStyle.None;
-            this.browser.Location = ControlExtensions.InvisibleLocation;
-            this.browser.SetupZoomEvents();
+			this.browserComponent = new ComponentImpl(browser, owner, extraContext, resourceHandlerRegistry);
+			this.browserImpl = new TweetDeckBrowserImpl(browserComponent, tweetDeckInterface, extraContext, soundNotificationHandler, pluginManager, updateChecker);
 
-            owner.Controls.Add(browser);
-            plugins.Register(PluginEnvironment.Browser, new PluginDispatcher(browser, TwitterUrls.IsTweetDeck));
-            
-            Config.MuteToggled += Config_MuteToggled;
-            Config.SoundNotificationChanged += Config_SoundNotificationInfoChanged;
+			if (Arguments.HasFlag(Arguments.ArgIgnoreGDPR)) {
+				browserComponent.PageLoadEnd += (sender, args) => {
+					if (TwitterUrls.IsTweetDeck(args.Url)) {
+						browserComponent.RunScript("gen:gdpr", "TD.storage.Account.prototype.requiresConsent = function() { return false; }");
+					}
+				};
 			}
 
-        // setup and management
+			owner.Controls.Add(browser);
+		}
+
+		private sealed class ComponentImpl : CefBrowserComponent {
+			private readonly FormBrowser owner;
+			private readonly TweetDeckExtraContext extraContext;
+			private readonly CefResourceHandlerRegistry registry;
+
+			public ComponentImpl(ChromiumWebBrowser browser, FormBrowser owner, TweetDeckExtraContext extraContext, CefResourceHandlerRegistry registry) : base(browser) {
+				this.owner = owner;
+				this.extraContext = extraContext;
+				this.registry = registry;
+			}
+
+			protected override ContextMenuBase SetupContextMenu(IContextMenuHandler handler) {
+				return new ContextMenuBrowser(owner, handler, extraContext);
+			}
+
+			protected override CefResourceHandlerFactory SetupResourceHandlerFactory(IResourceRequestHandler handler) {
+				return new CefResourceHandlerFactory(handler, registry);
+			}
+		}
 
 		public void PrepareSize(Size size) {
 			if (!Ready) {
@@ -97,193 +100,33 @@ namespace TweetDuck.Browser{
 			}
 		}
 
-        private void OnBrowserReady(){
-            if (!Ready){
-                browser.Location = Point.Empty;
-                browser.Dock = DockStyle.Fill;
-                Ready = true;
-            }
+		public void Dispose() {
+			browserImpl.Dispose();
+			browser.Dispose();
 		}
 
 		public void Focus() {
 			browser.Focus();
 		}
 
-        public void Dispose(){
-            Config.MuteToggled -= Config_MuteToggled;
-            Config.SoundNotificationChanged -= Config_SoundNotificationInfoChanged;
-            
-            browser.Dispose();
+		public void OpenDevTools() {
+			browser.OpenDevToolsCustom();
 		}
 
-        // event handlers
-
-        private void browser_LoadingStateChanged(object sender, LoadingStateChangedEventArgs e){
-            if (!e.IsLoading){
-                foreach(string word in TwitterUtils.DictionaryWords){
-                    browser.AddWordToDictionary(word);
+		public void ReloadToTweetDeck() {
+			browserImpl.ReloadToTweetDeck();
 		}
 
-                browser.BeginInvoke(new Action(OnBrowserReady));
-                browser.LoadingStateChanged -= browser_LoadingStateChanged;
+		public void SaveVideo(string url, string username) {
+			browserImpl.FileDownloadManager.SaveVideo(url, username);
 		}
-        }
-
-        private void browser_FrameLoadStart(object sender, FrameLoadStartEventArgs e){
-            IFrame frame = e.Frame;
-
-            if (frame.IsMain){
-                string url = frame.Url;
-
-                if (TwitterUrls.IsTwitter(url)){
-                    string css = Program.Resources.Load("styles/twitter.css");
-                    resourceHandlers.Register(TwitterStyleUrl, ResourceHandlers.ForString(css, "text/css"));
-
-                    CefScriptExecutor.RunFile(frame, "twitter.js");
-                }
-                
-                if (!TwitterUrls.IsTwitterLogin2Factor(url)){
-                    frame.ExecuteJavaScriptAsync(TwitterUtils.BackgroundColorOverride);
-                }
-            }
-        }
-
-        private void browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e){
-            IFrame frame = e.Frame;
-            string url = frame.Url;
-
-            if (frame.IsMain){
-                if (TwitterUrls.IsTweetDeck(url)){
-                    UpdateProperties();
-                    CefScriptExecutor.RunFile(frame, "code.js");
-
-                    InjectBrowserCSS();
-                    ReinjectCustomCSS(Config.CustomBrowserCSS);
-                    Config_SoundNotificationInfoChanged(null, EventArgs.Empty);
-
-                    TweetDeckBridge.ResetStaticProperties();
-
-                    if (Arguments.HasFlag(Arguments.ArgIgnoreGDPR)){
-                        CefScriptExecutor.RunScript(frame, "TD.storage.Account.prototype.requiresConsent = function(){ return false; }", "gen:gdpr");
-                    }
-
-                    if (Config.FirstRun){
-                        CefScriptExecutor.RunFile(frame, "introduction.js");
-                    }
-                }
-
-                CefScriptExecutor.RunFile(frame, "update.js");
-            }
-
-            if (url == ErrorUrl){
-                resourceHandlers.Unregister(ErrorUrl);
-            }
-        }
-
-        private void browser_LoadError(object sender, LoadErrorEventArgs e){
-            if (e.ErrorCode == CefErrorCode.Aborted){
-                return;
-            }
-
-            if (!e.FailedUrl.StartsWith("http://td/", StringComparison.Ordinal)){
-                string errorPage = Program.Resources.LoadSilent("pages/error.html");
-
-                if (errorPage != null){
-                    string errorName = Enum.GetName(typeof(CefErrorCode), e.ErrorCode);
-                    string errorTitle = StringUtils.ConvertPascalCaseToScreamingSnakeCase(errorName ?? string.Empty);
-
-                    resourceHandlers.Register(ErrorUrl, ResourceHandlers.ForString(errorPage.Replace("{err}", errorTitle)));
-                    browser.Load(ErrorUrl);
-                }
-            }
-        }
-
-        private void Config_MuteToggled(object sender, EventArgs e){
-            UpdateProperties();
-        }
-
-        private void Config_SoundNotificationInfoChanged(object sender, EventArgs e){
-            const string soundUrl = "https://ton.twimg.com/tduck/updatesnd";
-
-            bool hasCustomSound = Config.IsCustomSoundNotificationSet;
-            string newNotificationPath = Config.NotificationSoundPath;
-            
-            if (prevSoundNotificationPath != newNotificationPath){
-                prevSoundNotificationPath = newNotificationPath;
-
-                if (hasCustomSound){
-                    resourceHandlers.Register(soundUrl, SoundNotification.CreateFileHandler(newNotificationPath));
-                }
-                else{
-                    resourceHandlers.Unregister(soundUrl);
-                }
-            }
-
-            browser.ExecuteScriptAsync("TDGF_setSoundNotificationData", hasCustomSound, Config.NotificationSoundVolume);
-        }
-
-        // external handling
 
 		public void HideVideoOverlay(bool focus) {
 			if (focus) {
 				browser.GetBrowser().GetHost().SendFocusEvent(true);
 			}
 
-            browser.ExecuteScriptAsync("$('#td-video-player-overlay').remove()");
-        }
-
-        // javascript calls
-
-        public void ReloadToTweetDeck(){
-            browser.ExecuteScriptAsync($"if(window.TDGF_reload)window.TDGF_reload();else window.location.href='{TwitterUrls.TweetDeck}'");
-        }
-
-        public void UpdateProperties(){
-            browser.ExecuteScriptAsync(PropertyBridge.GenerateScript(PropertyBridge.Environment.Browser));
-        }
-
-        public void InjectBrowserCSS(){
-            browser.ExecuteScriptAsync("TDGF_injectBrowserCSS", Program.Resources.Load("styles/browser.css")?.TrimEnd() ?? string.Empty);
-        }
-
-        public void ReinjectCustomCSS(string css){
-            browser.ExecuteScriptAsync("TDGF_reinjectCustomCSS", css?.Replace(Environment.NewLine, " ") ?? string.Empty);
-        }
-
-        public void OnMouseClickExtra(IntPtr param){
-            browser.ExecuteScriptAsync("TDGF_onMouseClickExtra", (param.ToInt32() >> 16) & 0xFFFF);
-        }
-
-        public void ShowTweetDetail(string columnId, string chirpId, string fallbackUrl){
-            browser.ExecuteScriptAsync("TDGF_showTweetDetail", columnId, chirpId, fallbackUrl);
-        }
-
-        public void AddSearchColumn(string query){
-            browser.ExecuteScriptAsync("TDGF_performSearch", query);
-        }
-
-        public void TriggerTweetScreenshot(){
-            browser.ExecuteScriptAsync("TDGF_triggerScreenshot()");
-        }
-
-        public void ReloadColumns(){
-            browser.ExecuteScriptAsync("TDGF_reloadColumns()");
-        }
-
-        public void PlaySoundNotification(){
-            browser.ExecuteScriptAsync("TDGF_playSoundNotification()");
-        }
-
-        public void ApplyROT13(){
-            browser.ExecuteScriptAsync("TDGF_applyROT13()");
-        }
-
-        public void ShowUpdateNotification(string versionTag, string releaseNotes){
-            browser.ExecuteScriptAsync("TDUF_displayNotification", versionTag, Convert.ToBase64String(Encoding.GetEncoding("iso-8859-1").GetBytes(releaseNotes)));
-        }
-
-        public void OpenDevTools(){
-            browser.OpenDevToolsCustom();
+			browserComponent.RunScript("gen:hidevideo", "$('#td-video-player-overlay').remove()");
 		}
 	}
 }

Configuration/Arguments.cs

@@ -1,5 +1,5 @@
 using System;
-using TweetLib.Core.Collections;
+using TweetLib.Utils.Collections;
 
 namespace TweetDuck.Configuration {
 	static class Arguments {
@@ -7,6 +7,7 @@ namespace TweetDuck.Configuration{
 		public const string ArgDataFolder = "-datafolder";
 		public const string ArgLogging = "-log";
 		public const string ArgIgnoreGDPR = "-nogdpr";
+		public const string ArgHttpVideo = "-httpvideo";
 		public const string ArgFreeze = "-freeze";
 
 		// internal args

Configuration/ConfigManager.cs

@@ -1,82 +0,0 @@
-using System;
-using System.Drawing;
-using TweetDuck.Browser.Data;
-using TweetLib.Core.Features.Plugins.Config;
-using TweetLib.Core.Serialization.Converters;
-using TweetLib.Core.Systems.Configuration;
-using TweetLib.Core.Utils;
-
-namespace TweetDuck.Configuration{
-    sealed class ConfigManager : IConfigManager{
-        public UserConfig User { get; }
-        public SystemConfig System { get; }
-        public PluginConfig Plugins { get; }
-        
-        public event EventHandler ProgramRestartRequested;
-
-        private readonly FileConfigInstance<UserConfig> infoUser;
-        private readonly FileConfigInstance<SystemConfig> infoSystem;
-        private readonly PluginConfigInstance<PluginConfig> infoPlugins;
-
-        private readonly IConfigInstance<BaseConfig>[] infoList;
-
-        public ConfigManager(){
-            User = new UserConfig(this);
-            System = new SystemConfig(this);
-            Plugins = new PluginConfig(this);
-            
-            infoList = new IConfigInstance<BaseConfig>[]{
-                infoUser = new FileConfigInstance<UserConfig>(Program.UserConfigFilePath, User, "program options"),
-                infoSystem = new FileConfigInstance<SystemConfig>(Program.SystemConfigFilePath, System, "system options"),
-                infoPlugins = new PluginConfigInstance<PluginConfig>(Program.PluginConfigFilePath, Plugins)
-            };
-
-            // TODO refactor further
-
-            infoUser.Serializer.RegisterTypeConverter(typeof(WindowState), WindowState.Converter);
-
-            infoUser.Serializer.RegisterTypeConverter(typeof(Point), new SingleTypeConverter<Point>{
-                ConvertToString = value => $"{value.X} {value.Y}",
-                ConvertToObject = value => {
-                    int[] elements = StringUtils.ParseInts(value, ' ');
-                    return new Point(elements[0], elements[1]);
-                }
-            });
-            
-            infoUser.Serializer.RegisterTypeConverter(typeof(Size), new SingleTypeConverter<Size>{
-                ConvertToString = value => $"{value.Width} {value.Height}",
-                ConvertToObject = value => {
-                    int[] elements = StringUtils.ParseInts(value, ' ');
-                    return new Size(elements[0], elements[1]);
-                }
-            });
-        }
-
-        public void LoadAll(){
-            infoUser.Load();
-            infoSystem.Load();
-            infoPlugins.Load();
-        }
-
-        public void SaveAll(){
-            infoUser.Save();
-            infoSystem.Save();
-            infoPlugins.Save();
-        }
-
-        public void ReloadAll(){
-            infoUser.Reload();
-            infoSystem.Reload();
-            infoPlugins.Reload();
-        }
-
-        void IConfigManager.TriggerProgramRestartRequested(){
-            ProgramRestartRequested?.Invoke(this, EventArgs.Empty);
-        }
-
-        IConfigInstance<BaseConfig> IConfigManager.GetInstanceInfo(BaseConfig instance){
-            Type instanceType = instance.GetType();
-            return Array.Find(infoList, info => info.Instance.GetType() == instanceType); // TODO handle null
-        }
-    }
-}

Configuration/PluginConfig.cs

@@ -1,51 +0,0 @@
-using System;
-using System.Collections.Generic;
-using TweetLib.Core.Features.Plugins;
-using TweetLib.Core.Features.Plugins.Config;
-using TweetLib.Core.Features.Plugins.Events;
-using TweetLib.Core.Systems.Configuration;
-
-namespace TweetDuck.Configuration{
-    sealed class PluginConfig : BaseConfig, IPluginConfig{
-        private static readonly string[] DefaultDisabled = {
-            "official/clear-columns",
-            "official/reply-account"
-        };
-
-        // CONFIGURATION DATA
-
-        private readonly HashSet<string> disabled = new HashSet<string>(DefaultDisabled);
-
-        // EVENTS
-        
-        public event EventHandler<PluginChangedStateEventArgs> PluginChangedState;
-        
-        // END OF CONFIG
-
-        public PluginConfig(IConfigManager configManager) : base(configManager){}
-
-        protected override BaseConfig ConstructWithDefaults(IConfigManager configManager){
-            return new PluginConfig(configManager);
-        }
-
-        // INTERFACE IMPLEMENTATION
-
-        IEnumerable<string> IPluginConfig.DisabledPlugins => disabled;
-
-        void IPluginConfig.Reset(IEnumerable<string> newDisabledPlugins){
-            disabled.Clear();
-            disabled.UnionWith(newDisabledPlugins);
-        }
-
-        public void SetEnabled(Plugin plugin, bool enabled){
-            if ((enabled && disabled.Remove(plugin.Identifier)) || (!enabled && disabled.Add(plugin.Identifier))){
-                PluginChangedState?.Invoke(this, new PluginChangedStateEventArgs(plugin, enabled));
-                Save();
-            }
-        }
-
-        public bool IsEnabled(Plugin plugin){
-            return !disabled.Contains(plugin.Identifier);
-        }
-    }
-}

Configuration/SystemConfig.cs

@@ -1,11 +1,17 @@
-using TweetLib.Core.Systems.Configuration;
+using System.Diagnostics.CodeAnalysis;
+using TweetLib.Core;
+using TweetLib.Core.Application;
+using TweetLib.Core.Systems.Configuration;
 
 namespace TweetDuck.Configuration {
-    sealed class SystemConfig : BaseConfig{
+	sealed class SystemConfig : BaseConfig<SystemConfig>, IAppSystemConfiguration {
+		[SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+		public int MigrationVersion { get; set; } = 0;
 
-        // CONFIGURATION DATA
-        
-        public bool _hardwareAcceleration = true;
+		private bool _hardwareAcceleration = true;
+		private bool _enableTouchAdjustment = false;
+		private bool _enableColorProfileDetection = false;
+		private bool _useSystemProxyForAllConnections = false;
 
 		public bool ClearCacheAutomatically { get; set; } = true;
 		public int ClearCacheThreshold      { get; set; } = 250;
@@ -14,15 +20,50 @@ namespace TweetDuck.Configuration{
 
 		public bool HardwareAcceleration {
 			get => _hardwareAcceleration;
-            set => UpdatePropertyWithRestartRequest(ref _hardwareAcceleration, value);
+			set => UpdatePropertyWithCallback(ref _hardwareAcceleration, value, App.ConfigManager.TriggerProgramRestartRequested);
+		}
+
+		public bool EnableTouchAdjustment {
+			get => _enableTouchAdjustment;
+			set => UpdatePropertyWithCallback(ref _enableTouchAdjustment, value, App.ConfigManager.TriggerProgramRestartRequested);
+		}
+
+		public bool EnableColorProfileDetection {
+			get => _enableColorProfileDetection;
+			set => UpdatePropertyWithCallback(ref _enableColorProfileDetection, value, App.ConfigManager.TriggerProgramRestartRequested);
+		}
+
+		public bool UseSystemProxyForAllConnections {
+			get => _useSystemProxyForAllConnections;
+			set => UpdatePropertyWithCallback(ref _useSystemProxyForAllConnections, value, App.ConfigManager.TriggerProgramRestartRequested);
 		}
 
 		// END OF CONFIG
 
-        public SystemConfig(IConfigManager configManager) : base(configManager){}
+		#pragma warning disable CS0618
 
-        protected override BaseConfig ConstructWithDefaults(IConfigManager configManager){
-            return new SystemConfig(configManager);
+		public bool Migrate() {
+			bool hasChanged = false;
+
+			if (MigrationVersion < 1) {
+				MigrationVersion = 1;
+				hasChanged = true;
+
+				var userConfig = Program.Config.User;
+				_enableTouchAdjustment = userConfig.EnableTouchAdjustment;
+				_enableColorProfileDetection = userConfig.EnableColorProfileDetection;
+				_useSystemProxyForAllConnections = userConfig.UseSystemProxyForAllConnections;
+			}
+
+			return hasChanged;
+		}
+
+		#pragma warning restore CS0618
+
+		public override SystemConfig ConstructWithDefaults() {
+			return new SystemConfig {
+				MigrationVersion = 1
+			};
 		}
 	}
 }

Configuration/UserConfig.cs

@@ -1,18 +1,20 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Drawing;
 using TweetDuck.Browser;
-using TweetDuck.Browser.Data;
 using TweetDuck.Controls;
+using TweetLib.Core;
+using TweetLib.Core.Application;
 using TweetLib.Core.Features.Notifications;
 using TweetLib.Core.Features.Twitter;
 using TweetLib.Core.Systems.Configuration;
+using TweetLib.Utils.Data;
 
 namespace TweetDuck.Configuration {
-    sealed class UserConfig : BaseConfig{
-        
-        // CONFIGURATION DATA
-
+	sealed class UserConfig : BaseConfig<UserConfig>, IAppUserConfiguration {
 		public bool FirstRun { get; set; } = true;
+
+		[SuppressMessage("ReSharper", "UnusedMember.Global")]
 		public bool AllowDataCollection { get; set; } = false;
 
 		public WindowState BrowserWindow { get; set; } = new WindowState();
@@ -26,7 +28,6 @@ namespace TweetDuck.Configuration{
 		public bool EnableAnimatedImages      { get; set; } = true;
 
 		private bool _enableSmoothScrolling = true;
-        private bool _enableTouchAdjustment = false;
 		private string _customCefArgs       = null;
 
 		public string BrowserPath            { get; set; } = null;
@@ -79,6 +80,7 @@ namespace TweetDuck.Configuration{
 		public string CustomBrowserCSS      { get; set; } = null;
 		public string CustomNotificationCSS { get; set; } = null;
 
+		public bool DevToolsInContextMenu { get; set; } = false;
 		public bool DevToolsWindowOnTop   { get; set; } = true;
 
 		// SPECIAL PROPERTIES
@@ -116,37 +118,49 @@ namespace TweetDuck.Configuration{
 
 		public bool EnableSmoothScrolling {
 			get => _enableSmoothScrolling;
-            set => UpdatePropertyWithRestartRequest(ref _enableSmoothScrolling, value);
-        }
-
-        public bool EnableTouchAdjustment{
-            get => _enableTouchAdjustment;
-            set => UpdatePropertyWithRestartRequest(ref _enableTouchAdjustment, value);
+			set => UpdatePropertyWithCallback(ref _enableSmoothScrolling, value, App.ConfigManager.TriggerProgramRestartRequested);
 		}
 
 		public string CustomCefArgs {
 			get => _customCefArgs;
-            set => UpdatePropertyWithRestartRequest(ref _customCefArgs, value);
+			set => UpdatePropertyWithCallback(ref _customCefArgs, value, App.ConfigManager.TriggerProgramRestartRequested);
 		}
 
 		public string SpellCheckLanguage {
 			get => _spellCheckLanguage;
-            set => UpdatePropertyWithRestartRequest(ref _spellCheckLanguage, value);
+			set => UpdatePropertyWithCallback(ref _spellCheckLanguage, value, App.ConfigManager.TriggerProgramRestartRequested);
 		}
 
+		// DEPRECATED
+
+		[Obsolete("Moved to SystemConfig")]
+		[SuppressMessage("ReSharper", "UnusedAutoPropertyAccessor.Global")]
+		public bool EnableTouchAdjustment { get; set; }
+
+		[Obsolete("Moved to SystemConfig")]
+		[SuppressMessage("ReSharper", "UnusedAutoPropertyAccessor.Global")]
+		public bool EnableColorProfileDetection { get; set; }
+
+		[Obsolete("Moved to SystemConfig")]
+		[SuppressMessage("ReSharper", "UnusedAutoPropertyAccessor.Global")]
+		public bool UseSystemProxyForAllConnections { get; set; }
+
 		// EVENTS
 
 		public event EventHandler MuteToggled;
 		public event EventHandler ZoomLevelChanged;
 		public event EventHandler TrayBehaviorChanged;
 		public event EventHandler SoundNotificationChanged;
+		public event EventHandler OptionsDialogClosed;
+
+		public void TriggerOptionsDialogClosed() {
+			OptionsDialogClosed?.Invoke(this, EventArgs.Empty);
+		}
 
 		// END OF CONFIG
 
-        public UserConfig(IConfigManager configManager) : base(configManager){}
-
-        protected override BaseConfig ConstructWithDefaults(IConfigManager configManager){
-            return new UserConfig(configManager);
+		public override UserConfig ConstructWithDefaults() {
+			return new UserConfig();
 		}
 	}
 }

Controls/ControlExtensions.cs

@@ -2,6 +2,7 @@ using System;
 using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
+using TweetLib.Utils.Data;
 
 namespace TweetDuck.Controls {
 	static class ControlExtensions {
@@ -17,8 +18,13 @@ namespace TweetDuck.Controls{
 		}
 
 		public static void InvokeAsyncSafe(this Control control, Action func) {
+			if (control.InvokeRequired) {
 				control.BeginInvoke(func);
 			}
+			else {
+				func();
+			}
+		}
 
 		public static float GetDPIScale(this Control control) {
 			using Graphics graphics = control.CreateGraphics();
@@ -75,5 +81,23 @@ namespace TweetDuck.Controls{
 				}
 			};
 		}
+
+		public static void Save(this WindowState state, Form form) {
+			state.Bounds = form.WindowState == FormWindowState.Normal ? form.DesktopBounds : form.RestoreBounds;
+			state.IsMaximized = form.WindowState == FormWindowState.Maximized;
+		}
+
+		public static void Restore(this WindowState state, Form form, bool firstTimeFullscreen) {
+			if (state.Bounds != Rectangle.Empty) {
+				form.DesktopBounds = state.Bounds;
+				form.WindowState = state.IsMaximized ? FormWindowState.Maximized : FormWindowState.Normal;
+			}
+
+			if ((state.Bounds == Rectangle.Empty && firstTimeFullscreen) || form.IsFullyOutsideView()) {
+				form.DesktopBounds = Screen.PrimaryScreen.WorkingArea;
+				form.WindowState = FormWindowState.Maximized;
+				state.Save(form);
+			}
+		}
 	}
 }

Dialogs/FormAbout.cs

@@ -1,14 +1,14 @@
-using System.ComponentModel;
+using System;
+using System.ComponentModel;
 using System.Drawing;
 using System.IO;
 using System.Windows.Forms;
 using TweetDuck.Management;
-using TweetDuck.Utils;
+using TweetLib.Core;
 
 namespace TweetDuck.Dialogs {
 	sealed partial class FormAbout : Form, FormManager.IAppDialog {
 		private const string TipsLink = "https://github.com/chylex/TweetDuck/wiki";
-        private const string IssuesLink = "https://github.com/chylex/TweetDuck/issues";
 
 		public FormAbout() {
 			InitializeComponent();
@@ -19,15 +19,17 @@ namespace TweetDuck.Dialogs{
 
 			labelWebsite.Links.Add(new LinkLabel.Link(0, labelWebsite.Text.Length, Program.Website));
 			labelTips.Links.Add(new LinkLabel.Link(0, labelTips.Text.Length, TipsLink));
-            labelIssues.Links.Add(new LinkLabel.Link(0, labelIssues.Text.Length, IssuesLink));
+			labelIssues.Links.Add(new LinkLabel.Link(0, labelIssues.Text.Length, Lib.IssueTrackerUrl));
 
-            MemoryStream logoStream = new MemoryStream(Properties.Resources.avatar);
-            pictureLogo.Image = Image.FromStream(logoStream);
-            Disposed += (sender, args) => logoStream.Dispose();
+			try {
+				pictureLogo.Image = Image.FromFile(Path.Combine(App.ResourcesPath, "images/logo.png"));
+			} catch (Exception) {
+				// ignore
+			}
 		}
 
 		private void OnLinkClicked(object sender, LinkLabelLinkClickedEventArgs e) {
-            BrowserUtils.OpenExternalBrowser(e.Link.LinkData as string);
+			App.SystemHandler.OpenBrowser(e.Link.LinkData as string);
 		}
 
 		private void FormAbout_HelpRequested(object sender, HelpEventArgs hlpevent) {

Dialogs/FormGuide.cs

@@ -1,52 +1,27 @@
 using System.Drawing;
-using System.Text.RegularExpressions;
 using System.Windows.Forms;
-using CefSharp;
 using CefSharp.WinForms;
 using TweetDuck.Browser;
 using TweetDuck.Browser.Adapters;
-using TweetDuck.Browser.Data;
 using TweetDuck.Browser.Handling;
-using TweetDuck.Browser.Handling.General;
 using TweetDuck.Controls;
 using TweetDuck.Management;
 using TweetDuck.Utils;
+using TweetLib.Browser.Interfaces;
+using TweetLib.Core.Features;
 
 namespace TweetDuck.Dialogs {
 	sealed partial class FormGuide : Form, FormManager.IAppDialog {
-        private const string GuideUrl = "https://tweetduck.chylex.com/guide/v2/";
-        private const string GuidePathRegex = @"^guide(?:/v\d+)?(?:/(#.*))?";
-        
-        private static readonly ResourceLink DummyPage = new ResourceLink("http://td/dummy", ResourceHandlers.ForString(string.Empty));
-
-        public static bool CheckGuideUrl(string url, out string hash){
-            if (!url.Contains("//tweetduck.chylex.com/guide")){
-                hash = null;
-                return false;
-            }
-
-            string path = url.Substring(url.IndexOf("/guide")+1);
-            Match match = Regex.Match(path, GuidePathRegex);
-
-            if (match.Success){
-                hash = match.Groups[1].Value;
-                return true;
-            }
-            else{
-                hash = null;
-                return false;
-            }
-        }
+		private const string GuideUrl = "td://guide/index.html";
 
 		public static void Show(string hash = null) {
-            string url = GuideUrl + (hash ?? string.Empty);
+			string url = GuideUrl + (string.IsNullOrEmpty(hash) ? string.Empty : "#" + hash);
 			FormGuide guide = FormManager.TryFind<FormGuide>();
 
 			if (guide == null) {
 				FormBrowser owner = FormManager.TryFind<FormBrowser>();
 
 				if (owner != null) {
-                    owner.AnalyticsFile.OpenGuide.Trigger();
 					new FormGuide(url, owner).Show(owner);
 				}
 			}
@@ -60,37 +35,43 @@ namespace TweetDuck.Dialogs{
 		private readonly ChromiumWebBrowser browser;
 		#pragma warning restore IDE0069 // Disposable fields should be disposed
 
-        private string nextUrl;
-
-        private FormGuide(string url, FormBrowser owner){
+		private FormGuide(string url, Form owner) {
 			InitializeComponent();
 
 			Text = Program.BrandName + " Guide";
 			Size = new Size(owner.Size.Width * 3 / 4, owner.Size.Height * 3 / 4);
 			VisibleChanged += (sender, args) => this.MoveToCenter(owner);
 
-            var resourceRequestHandler = new ResourceRequestHandlerBase();
-            resourceRequestHandler.ResourceHandlers.Register(DummyPage);
-            
-            this.browser = new ChromiumWebBrowser(url){
-                MenuHandler = new ContextMenuGuide(owner),
-                JsDialogHandler = new JavaScriptDialogHandler(),
-                KeyboardHandler = new KeyboardHandlerBase(),
-                LifeSpanHandler = new LifeSpanHandler(),
-                RequestHandler = new RequestHandlerBase(true),
-                ResourceRequestHandlerFactory = resourceRequestHandler.SelfFactory
+			browser = new ChromiumWebBrowser(url) {
+				KeyboardHandler = new CustomKeyboardHandler(null),
+				RequestHandler = new RequestHandlerBase(true)
 			};
 
-            browser.LoadingStateChanged += browser_LoadingStateChanged;
-            browser.FrameLoadEnd += browser_FrameLoadEnd;
-            
 			browser.BrowserSettings.BackgroundColor = (uint) BackColor.ToArgb();
-            browser.Dock = DockStyle.None;
-            browser.Location = ControlExtensions.InvisibleLocation;
-            browser.SetupZoomEvents();
+
+			var browserComponent = new ComponentImpl(browser);
+			var browserImpl = new BaseBrowser(browserComponent);
+
+			BrowserUtils.SetupDockOnLoad(browserComponent, browser);
 
 			Controls.Add(browser);
-            Disposed += (sender, args) => browser.Dispose();
+
+			Disposed += (sender, args) => {
+				browserImpl.Dispose();
+				browser.Dispose();
+			};
+		}
+
+		private sealed class ComponentImpl : CefBrowserComponent {
+			public ComponentImpl(ChromiumWebBrowser browser) : base(browser) {}
+
+			protected override ContextMenuBase SetupContextMenu(IContextMenuHandler handler) {
+				return new ContextMenuGuide(handler);
+			}
+
+			protected override CefResourceHandlerFactory SetupResourceHandlerFactory(IResourceRequestHandler handler) {
+				return new CefResourceHandlerFactory(handler, null);
+			}
 		}
 
 		protected override void Dispose(bool disposing) {
@@ -102,31 +83,7 @@ namespace TweetDuck.Dialogs{
 		}
 
 		private void Reload(string url) {
-            nextUrl = url;
-            browser.LoadingStateChanged += browser_LoadingStateChanged;
-            browser.Dock = DockStyle.None;
-            browser.Location = ControlExtensions.InvisibleLocation;
-            browser.Load(DummyPage.Url);
-        }
-
-        private void browser_LoadingStateChanged(object sender, LoadingStateChangedEventArgs e){
-            if (!e.IsLoading){
-                if (browser.Address == DummyPage.Url){
-                    browser.Load(nextUrl);
-                }
-                else{
-                    this.InvokeAsyncSafe(() => {
-                        browser.Location = Point.Empty;
-                        browser.Dock = DockStyle.Fill;
-                    });
-
-                    browser.LoadingStateChanged -= browser_LoadingStateChanged;
-                }
-            }
-        }
-
-        private void browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e){
-            CefScriptExecutor.RunScript(e.Frame, "Array.prototype.forEach.call(document.getElementsByTagName('A'), ele => ele.addEventListener('click', e => { e.preventDefault(); window.open(ele.getAttribute('href')); }))", "gen:links");
+			browser.Load(url);
 		}
 	}
 }

Dialogs/FormMessage.cs

@@ -38,11 +38,7 @@ namespace TweetDuck.Dialogs{
 			return Show(caption, text, MessageBoxIcon.Question, buttonAccept, buttonCancel);
 		}
 
-        public static bool Show(string caption, string text, MessageBoxIcon icon, string button){
-            return Show(caption, text, icon, button, null);
-        }
-
-        public static bool Show(string caption, string text, MessageBoxIcon icon, string buttonAccept, string buttonCancel){
+		public static bool Show(string caption, string text, MessageBoxIcon icon, string buttonAccept, string buttonCancel = null) {
 			using FormMessage message = new FormMessage(caption, text, icon);
 
 			if (buttonCancel == null) {

Dialogs/FormPlugins.cs

@@ -7,6 +7,8 @@ using TweetDuck.Management;
 using TweetDuck.Plugins;
 using TweetLib.Core;
 using TweetLib.Core.Features.Plugins;
+using TweetLib.Core.Features.Plugins.Enums;
+using TweetLib.Core.Systems.Configuration;
 
 namespace TweetDuck.Dialogs {
 	sealed partial class FormPlugins : Form, FormManager.IAppDialog {
@@ -74,7 +76,7 @@ namespace TweetDuck.Dialogs{
 			Padding = new Padding(Padding.Left, Padding.Top, Padding.Right - 1, Padding.Bottom - 1);
 		}
 
-        public void flowLayoutPlugins_Resize(object sender, EventArgs e){
+		private void flowLayoutPlugins_Resize(object sender, EventArgs e) {
 			Control lastPlugin = flowLayoutPlugins.Controls.OfType<PluginControl>().LastOrDefault();
 
 			if (lastPlugin == null) {
@@ -96,7 +98,7 @@ namespace TweetDuck.Dialogs{
 		}
 
 		private void btnOpenFolder_Click(object sender, EventArgs e) {
-            App.SystemHandler.OpenFileExplorer(pluginManager.PathCustomPlugins);
+			App.SystemHandler.OpenFileExplorer(pluginManager.GetPluginFolder(PluginGroup.Custom));
 		}
 
 		private void btnReload_Click(object sender, EventArgs e) {

Dialogs/FormSettings.cs

@@ -3,15 +3,15 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
 using TweetDuck.Browser;
-using TweetDuck.Browser.Handling.General;
-using TweetDuck.Browser.Notification.Example;
+using TweetDuck.Browser.Handling;
 using TweetDuck.Configuration;
 using TweetDuck.Controls;
 using TweetDuck.Dialogs.Settings;
 using TweetDuck.Management;
-using TweetDuck.Management.Analytics;
 using TweetDuck.Utils;
+using TweetLib.Core;
 using TweetLib.Core.Features.Plugins;
+using TweetLib.Core.Features.TweetDeck;
 using TweetLib.Core.Systems.Updates;
 
 namespace TweetDuck.Dialogs {
@@ -26,7 +26,7 @@ namespace TweetDuck.Dialogs{
 		private readonly Dictionary<Type, SettingsTab> tabs = new Dictionary<Type, SettingsTab>(8);
 		private SettingsTab currentTab;
 
-        public FormSettings(FormBrowser browser, PluginManager plugins, UpdateHandler updates, AnalyticsManager analytics, Type startTab){
+		public FormSettings(FormBrowser browser, PluginManager plugins, UpdateChecker updates, TweetDeckFunctions tweetDeckFunctions, Type startTab) {
 			InitializeComponent();
 
 			Text = Program.BrandName + " Options";
@@ -40,25 +40,25 @@ namespace TweetDuck.Dialogs{
 
 			PrepareLoad();
 
-            AddButton("General", () => new TabSettingsGeneral(this.browser.ReloadColumns, updates));
-            AddButton("Notifications", () => new TabSettingsNotifications(new FormNotificationExample(this.browser, this.plugins)));
-            AddButton("Sounds", () => new TabSettingsSounds(this.browser.PlaySoundNotification));
+			AddButton("General", () => new TabSettingsGeneral(tweetDeckFunctions.ReloadColumns, updates));
+			AddButton("Notifications", () => new TabSettingsNotifications(this.browser.CreateExampleNotification()));
+			AddButton("Sounds", () => new TabSettingsSounds(() => tweetDeckFunctions.PlaySoundNotification(true)));
 			AddButton("Tray", () => new TabSettingsTray());
-            AddButton("Feedback", () => new TabSettingsFeedback(analytics, AnalyticsReportGenerator.ExternalInfo.From(this.browser), this.plugins));
-            AddButton("Advanced", () => new TabSettingsAdvanced(this.browser.ReinjectCustomCSS, this.browser.OpenDevTools));
+			AddButton("Feedback", () => new TabSettingsFeedback());
+			AddButton("Advanced", () => new TabSettingsAdvanced(tweetDeckFunctions.ReinjectCustomCSS, this.browser.OpenDevTools));
 
 			SelectTab(tabs[startTab ?? typeof(TabSettingsGeneral)]);
 		}
 
 		private void PrepareLoad() {
-            Program.Config.ProgramRestartRequested += Config_ProgramRestartRequested;
+			App.ConfigManager.ProgramRestartRequested += Config_ProgramRestartRequested;
 		}
 
 		private void PrepareUnload() { // TODO refactor this further later
 			currentTab.Control.OnClosing();
 
-            Program.Config.ProgramRestartRequested -= Config_ProgramRestartRequested;
-            Program.Config.SaveAll();
+			App.ConfigManager.ProgramRestartRequested -= Config_ProgramRestartRequested;
+			App.ConfigManager.SaveAll();
 		}
 
 		private void Config_ProgramRestartRequested(object sender, EventArgs e) {
@@ -182,7 +182,7 @@ namespace TweetDuck.Dialogs{
 		}
 
 		private void control_MouseLeave(object sender, EventArgs e) {
-            if (sender is ComboBox cb && cb.DroppedDown){
+			if (sender is ComboBox { DroppedDown: true } ) {
 				return; // prevents comboboxes from closing when MouseLeave event triggers during opening animation
 			}
 
@@ -209,7 +209,7 @@ namespace TweetDuck.Dialogs{
 			}
 		}
 
-        internal abstract class BaseTab : UserControl{
+		internal class BaseTab : UserControl {
 			protected static UserConfig Config => Program.Config.User;
 			protected static SystemConfig SysConfig => Program.Config.System;
 

Dialogs/Settings/DialogSettingsAnalytics.Designer.cs

@@ -1,94 +0,0 @@
-namespace TweetDuck.Dialogs.Settings {
-    partial class DialogSettingsAnalytics {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing) {
-            if (disposing && (components != null)) {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent() {
-            this.textBoxReport = new System.Windows.Forms.TextBox();
-            this.btnClose = new System.Windows.Forms.Button();
-            this.labelInfo = new System.Windows.Forms.Label();
-            this.SuspendLayout();
-            // 
-            // textBoxReport
-            // 
-            this.textBoxReport.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.textBoxReport.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular);
-            this.textBoxReport.Location = new System.Drawing.Point(12, 45);
-            this.textBoxReport.Multiline = true;
-            this.textBoxReport.Name = "textBoxReport";
-            this.textBoxReport.ReadOnly = true;
-            this.textBoxReport.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.textBoxReport.Size = new System.Drawing.Size(435, 474);
-            this.textBoxReport.TabIndex = 1;
-            // 
-            // btnClose
-            // 
-            this.btnClose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnClose.AutoSize = true;
-            this.btnClose.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular);
-            this.btnClose.Location = new System.Drawing.Point(397, 525);
-            this.btnClose.Name = "btnClose";
-            this.btnClose.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.btnClose.Size = new System.Drawing.Size(50, 25);
-            this.btnClose.TabIndex = 2;
-            this.btnClose.Text = "Close";
-            this.btnClose.UseVisualStyleBackColor = true;
-            this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
-            // 
-            // labelInfo
-            // 
-            this.labelInfo.AutoSize = true;
-            this.labelInfo.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular);
-            this.labelInfo.Location = new System.Drawing.Point(12, 9);
-            this.labelInfo.Margin = new System.Windows.Forms.Padding(3, 0, 3, 3);
-            this.labelInfo.Name = "labelInfo";
-            this.labelInfo.Size = new System.Drawing.Size(434, 30);
-            this.labelInfo.TabIndex = 0;
-            this.labelInfo.Text = "When enabled, this data will be sent over a secure network roughly every 14 days." +
-    "\r\nSome numbers in the report were made imprecise on purpose.";
-            // 
-            // DialogSettingsAnalytics
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(459, 562);
-            this.Controls.Add(this.labelInfo);
-            this.Controls.Add(this.btnClose);
-            this.Controls.Add(this.textBoxReport);
-            this.MinimumSize = new System.Drawing.Size(475, 340);
-            this.Name = "DialogSettingsAnalytics";
-            this.ShowIcon = false;
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.TextBox textBoxReport;
-        private System.Windows.Forms.Button btnClose;
-        private System.Windows.Forms.Label labelInfo;
-    }
-}

Dialogs/Settings/DialogSettingsAnalytics.cs

@@ -1,22 +0,0 @@
-using System;
-using System.Windows.Forms;
-using TweetDuck.Controls;
-using TweetDuck.Management.Analytics;
-
-namespace TweetDuck.Dialogs.Settings{
-    sealed partial class DialogSettingsAnalytics : Form{
-        public DialogSettingsAnalytics(AnalyticsReport report){
-            InitializeComponent();
-            
-            Text = Program.BrandName + " Options - Analytics Report";
-            
-            textBoxReport.EnableMultilineShortcuts();
-            textBoxReport.Text = report.ToString().TrimEnd();
-            textBoxReport.Select(0, 0);
-        }
-
-        private void btnClose_Click(object sender, EventArgs e){
-            Close();
-        }
-    }
-}

Dialogs/Settings/DialogSettingsCSS.cs

@@ -3,7 +3,6 @@ using System.Linq;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using TweetDuck.Controls;
-using TweetDuck.Utils;
 
 namespace TweetDuck.Dialogs.Settings {
 	sealed partial class DialogSettingsCSS : Form {
@@ -27,10 +26,6 @@ namespace TweetDuck.Dialogs.Settings{
 			textBoxNotificationCSS.EnableMultilineShortcuts();
 			textBoxNotificationCSS.Text = notificationCSS ?? "";
 
-            if (!BrowserUtils.HasDevTools){
-                btnOpenDevTools.Enabled = false;
-            }
-
 			ActiveControl = textBoxBrowserCSS;
 			textBoxBrowserCSS.Select(textBoxBrowserCSS.TextLength, 0);
 		}

Dialogs/Settings/DialogSettingsCefArgs.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Windows.Forms;
 using TweetDuck.Controls;
-using TweetDuck.Utils;
-using TweetLib.Core.Collections;
+using TweetLib.Core;
+using TweetLib.Core.Features.Chromium;
 
 namespace TweetDuck.Dialogs.Settings {
 	sealed partial class DialogSettingsCefArgs : Form {
@@ -21,7 +21,7 @@ namespace TweetDuck.Dialogs.Settings{
 		}
 
 		private void btnHelp_Click(object sender, EventArgs e) {
-            BrowserUtils.OpenExternalBrowser("http://peter.sh/experiments/chromium-command-line-switches/");
+			App.SystemHandler.OpenBrowser("http://peter.sh/experiments/chromium-command-line-switches/");
 		}
 
 		private void btnApply_Click(object sender, EventArgs e) {
@@ -31,7 +31,7 @@ namespace TweetDuck.Dialogs.Settings{
 				return;
 			}
 
-            int count = CommandLineArgs.ReadCefArguments(CefArgs).Count;
+			int count = CefUtils.ParseCommandLineArguments(CefArgs).Count;
 			string prompt = count == 0 && !string.IsNullOrWhiteSpace(initialArgs) ? "All current arguments will be removed. Continue?" : count + (count == 1 ? " argument was" : " arguments were") + " detected. Continue?";
 
 			if (FormMessage.Question("Confirm CEF Arguments", prompt, FormMessage.OK, FormMessage.Cancel)) {

Dialogs/Settings/DialogSettingsExternalProgram.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Windows.Forms;
-using TweetLib.Core.Utils;
+using TweetLib.Utils.Static;
 using IOPath = System.IO.Path;
 
 namespace TweetDuck.Dialogs.Settings {

Dialogs/Settings/DialogSettingsManage.Designer.cs

@@ -121,7 +121,7 @@
             this.cbSystemConfig.Size = new System.Drawing.Size(109, 19);
             this.cbSystemConfig.TabIndex = 1;
             this.cbSystemConfig.Text = "System Options";
-            this.toolTip.SetToolTip(this.cbSystemConfig, "Hardware acceleration and cache options.");
+            this.toolTip.SetToolTip(this.cbSystemConfig, "Options related to the current system and hardware,\r\nsuch as hardware acceleration, proxy, and cache settings.");
             this.cbSystemConfig.UseVisualStyleBackColor = true;
             this.cbSystemConfig.CheckedChanged += new System.EventHandler(this.checkBoxSelection_CheckedChanged);
             // 

Dialogs/Settings/DialogSettingsManage.cs

@@ -4,13 +4,18 @@ using System.IO;
 using System.Windows.Forms;
 using TweetDuck.Configuration;
 using TweetDuck.Management;
+using TweetLib.Core;
 using TweetLib.Core.Features.Plugins;
-using TweetLib.Core.Utils;
+using TweetLib.Core.Systems.Configuration;
+using TweetLib.Utils.Static;
 
 namespace TweetDuck.Dialogs.Settings {
 	sealed partial class DialogSettingsManage : Form {
 		private enum State {
-            Deciding, Reset, Import, Export
+			Deciding,
+			Reset,
+			Import,
+			Export
 		}
 
 		private ProfileManager.Items SelectedItems {
@@ -129,7 +134,7 @@ namespace TweetDuck.Dialogs.Settings{
 
 				case State.Reset:
 					if (FormMessage.Warning("Reset TweetDuck Options", "This will reset the selected items. Are you sure you want to proceed?", FormMessage.Yes, FormMessage.No)) {
-                        Program.Config.ProgramRestartRequested += Config_ProgramRestartRequested;
+						App.ConfigManager.ProgramRestartRequested += Config_ProgramRestartRequested;
 
 						if (SelectedItems.HasFlag(ProfileManager.Items.UserConfig)) {
 							Program.Config.User.Reset();
@@ -139,15 +144,15 @@ namespace TweetDuck.Dialogs.Settings{
 							Program.Config.System.Reset();
 						}
 
-                        Program.Config.ProgramRestartRequested -= Config_ProgramRestartRequested;
+						App.ConfigManager.ProgramRestartRequested -= Config_ProgramRestartRequested;
 
 						if (SelectedItems.HasFlag(ProfileManager.Items.PluginData)) {
 							Program.Config.Plugins.Reset();
 
 							try {
-                                Directory.Delete(Program.PluginDataPath, true);
+								Directory.Delete(plugins.PluginDataFolder, true);
 							} catch (Exception ex) {
-                                Program.Reporter.HandleException("Profile Reset", "Could not delete plugin data.", true, ex);
+								App.ErrorHandler.HandleException("Profile Reset", "Could not delete plugin data.", true, ex);
 							}
 						}
 
@@ -170,9 +175,10 @@ namespace TweetDuck.Dialogs.Settings{
 
 				case State.Import:
 					if (importManager.Import(SelectedItems)) {
-                        Program.Config.ProgramRestartRequested += Config_ProgramRestartRequested;
-                        Program.Config.ReloadAll();
-                        Program.Config.ProgramRestartRequested -= Config_ProgramRestartRequested;
+						App.ConfigManager.ProgramRestartRequested += Config_ProgramRestartRequested;
+						App.ConfigManager.ReloadAll();
+						App.ConfigManager.SaveAll();
+						App.ConfigManager.ProgramRestartRequested -= Config_ProgramRestartRequested;
 
 						if (SelectedItemsForceRestart) {
 							RestartProgram(SelectedItems.HasFlag(ProfileManager.Items.Session) ? new string[] { Arguments.ArgImportCookies } : StringUtils.EmptyArray);

Dialogs/Settings/DialogSettingsRestart.cs

@@ -1,7 +1,8 @@
 using System;
 using System.Windows.Forms;
 using TweetDuck.Configuration;
-using TweetLib.Core.Collections;
+using TweetLib.Core;
+using TweetLib.Utils.Collections;
 
 namespace TweetDuck.Dialogs.Settings {
 	sealed partial class DialogSettingsRestart : Form {
@@ -13,7 +14,7 @@ namespace TweetDuck.Dialogs.Settings{
 			cbLogging.Checked = currentArgs.HasFlag(Arguments.ArgLogging);
 			cbLogging.CheckedChanged += control_Change;
 
-            if (Program.IsPortable){
+			if (App.IsPortable) {
 				tbDataFolder.Text = "Not available in portable version";
 				tbDataFolder.Enabled = false;
 			}

Dialogs/Settings/TabSettingsAdvanced.Designer.cs

@@ -41,7 +41,10 @@
             this.panelConfiguration = new System.Windows.Forms.Panel();
             this.labelConfiguration = new System.Windows.Forms.Label();
             this.flowPanel = new System.Windows.Forms.FlowLayoutPanel();
+            this.labelProxy = new System.Windows.Forms.Label();
+            this.checkUseSystemProxyForAllConnections = new System.Windows.Forms.CheckBox();
             this.labelDevTools = new System.Windows.Forms.Label();
+            this.checkDevToolsInContextMenu = new System.Windows.Forms.CheckBox();
             this.checkDevToolsWindowOnTop = new System.Windows.Forms.CheckBox();
             ((System.ComponentModel.ISupportInitialize)(this.numClearCacheThreshold)).BeginInit();
             this.panelAppButtons.SuspendLayout();
@@ -242,7 +245,10 @@
             this.flowPanel.Controls.Add(this.panelClearCacheAuto);
             this.flowPanel.Controls.Add(this.labelConfiguration);
             this.flowPanel.Controls.Add(this.panelConfiguration);
+            this.flowPanel.Controls.Add(this.labelProxy);
+            this.flowPanel.Controls.Add(this.checkUseSystemProxyForAllConnections);
             this.flowPanel.Controls.Add(this.labelDevTools);
+            this.flowPanel.Controls.Add(this.checkDevToolsInContextMenu);
             this.flowPanel.Controls.Add(this.checkDevToolsWindowOnTop);
             this.flowPanel.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
             this.flowPanel.Location = new System.Drawing.Point(9, 9);
@@ -251,26 +257,61 @@
             this.flowPanel.TabIndex = 0;
             this.flowPanel.WrapContents = false;
             // 
+            // labelProxy
+            // 
+            this.labelProxy.AutoSize = true;
+            this.labelProxy.Font = new System.Drawing.Font("Segoe UI Semibold", 10.5F, System.Drawing.FontStyle.Bold);
+            this.labelProxy.Location = new System.Drawing.Point(0, 302);
+            this.labelProxy.Margin = new System.Windows.Forms.Padding(0, 30, 0, 1);
+            this.labelProxy.Name = "labelProxy";
+            this.labelProxy.Size = new System.Drawing.Size(54, 19);
+            this.labelProxy.TabIndex = 7;
+            this.labelProxy.Text = "PROXY";
+            // 
+            // checkUseSystemProxyForAllConnections
+            // 
+            this.checkUseSystemProxyForAllConnections.AutoSize = true;
+            this.checkUseSystemProxyForAllConnections.Font = new System.Drawing.Font("Segoe UI", 9F);
+            this.checkUseSystemProxyForAllConnections.Location = new System.Drawing.Point(6, 328);
+            this.checkUseSystemProxyForAllConnections.Margin = new System.Windows.Forms.Padding(6, 6, 3, 2);
+            this.checkUseSystemProxyForAllConnections.Name = "checkUseSystemProxyForAllConnections";
+            this.checkUseSystemProxyForAllConnections.Size = new System.Drawing.Size(223, 19);
+            this.checkUseSystemProxyForAllConnections.TabIndex = 8;
+            this.checkUseSystemProxyForAllConnections.Text = "Use System Proxy for All Connections";
+            this.checkUseSystemProxyForAllConnections.UseVisualStyleBackColor = true;
+            // 
             // labelDevTools
             // 
             this.labelDevTools.AutoSize = true;
             this.labelDevTools.Font = new System.Drawing.Font("Segoe UI Semibold", 10.5F, System.Drawing.FontStyle.Bold);
-            this.labelDevTools.Location = new System.Drawing.Point(0, 302);
+            this.labelDevTools.Location = new System.Drawing.Point(0, 379);
             this.labelDevTools.Margin = new System.Windows.Forms.Padding(0, 30, 0, 1);
             this.labelDevTools.Name = "labelDevTools";
             this.labelDevTools.Size = new System.Drawing.Size(156, 19);
-            this.labelDevTools.TabIndex = 7;
+            this.labelDevTools.TabIndex = 9;
             this.labelDevTools.Text = "DEVELOPMENT TOOLS";
             // 
+            // checkDevToolsInContextMenu
+            // 
+            this.checkDevToolsInContextMenu.AutoSize = true;
+            this.checkDevToolsInContextMenu.Font = new System.Drawing.Font("Segoe UI", 9F);
+            this.checkDevToolsInContextMenu.Location = new System.Drawing.Point(6, 405);
+            this.checkDevToolsInContextMenu.Margin = new System.Windows.Forms.Padding(6, 6, 3, 2);
+            this.checkDevToolsInContextMenu.Name = "checkDevToolsInContextMenu";
+            this.checkDevToolsInContextMenu.Size = new System.Drawing.Size(201, 19);
+            this.checkDevToolsInContextMenu.TabIndex = 10;
+            this.checkDevToolsInContextMenu.Text = "Show Dev Tools in Context Menu";
+            this.checkDevToolsInContextMenu.UseVisualStyleBackColor = true;
+            // 
             // checkDevToolsWindowOnTop
             // 
             this.checkDevToolsWindowOnTop.AutoSize = true;
             this.checkDevToolsWindowOnTop.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.checkDevToolsWindowOnTop.Location = new System.Drawing.Point(6, 328);
-            this.checkDevToolsWindowOnTop.Margin = new System.Windows.Forms.Padding(6, 6, 0, 2);
+            this.checkDevToolsWindowOnTop.Location = new System.Drawing.Point(6, 429);
+            this.checkDevToolsWindowOnTop.Margin = new System.Windows.Forms.Padding(6, 3, 3, 2);
             this.checkDevToolsWindowOnTop.Name = "checkDevToolsWindowOnTop";
             this.checkDevToolsWindowOnTop.Size = new System.Drawing.Size(168, 19);
-            this.checkDevToolsWindowOnTop.TabIndex = 8;
+            this.checkDevToolsWindowOnTop.TabIndex = 11;
             this.checkDevToolsWindowOnTop.Text = "Dev Tools Window On Top";
             this.checkDevToolsWindowOnTop.UseVisualStyleBackColor = true;
             // 
@@ -312,6 +353,9 @@
         private System.Windows.Forms.CheckBox checkClearCacheAuto;
         private System.Windows.Forms.FlowLayoutPanel flowPanel;
         private System.Windows.Forms.Label labelDevTools;
+        private System.Windows.Forms.CheckBox checkDevToolsInContextMenu;
         private System.Windows.Forms.CheckBox checkDevToolsWindowOnTop;
+        private System.Windows.Forms.Label labelProxy;
+        private System.Windows.Forms.CheckBox checkUseSystemProxyForAllConnections;
     }
 }

Dialogs/Settings/TabSettingsAdvanced.cs

@@ -44,15 +44,19 @@ namespace TweetDuck.Dialogs.Settings{
 			toolTip.SetToolTip(btnEditCefArgs, "Set custom command line arguments for Chromium Embedded Framework.");
 			toolTip.SetToolTip(btnEditCSS, "Set custom CSS for browser and notification windows.");
 
+			// proxy
+
+			toolTip.SetToolTip(checkUseSystemProxyForAllConnections, "Sets whether all connections should automatically detect and use the system proxy.\r\nBy default, only the browser component uses the system proxy, while other parts (such as update checks) ignore it.\r\nDisabled by default because Windows' proxy detection can be really slow.");
+
+			checkUseSystemProxyForAllConnections.Checked = SysConfig.UseSystemProxyForAllConnections;
+
 			// development tools
 
+			toolTip.SetToolTip(checkDevToolsInContextMenu, "Sets whether all context menus include an option to open dev tools.");
 			toolTip.SetToolTip(checkDevToolsWindowOnTop, "Sets whether dev tool windows appears on top of other windows.");
 
+			checkDevToolsInContextMenu.Checked = Config.DevToolsInContextMenu;
 			checkDevToolsWindowOnTop.Checked = Config.DevToolsWindowOnTop;
-
-            if (!BrowserUtils.HasDevTools){
-                checkDevToolsWindowOnTop.Enabled = false;
-            }
 		}
 
 		public override void OnReady() {
@@ -67,7 +71,10 @@ namespace TweetDuck.Dialogs.Settings{
 			btnEditCefArgs.Click += btnEditCefArgs_Click;
 			btnEditCSS.Click += btnEditCSS_Click;
 
+			checkUseSystemProxyForAllConnections.CheckedChanged += checkUseSystemProxyForAllConnections_CheckedChanged;
+
 			checkDevToolsWindowOnTop.CheckedChanged += checkDevToolsWindowOnTop_CheckedChanged;
+			checkDevToolsInContextMenu.CheckedChanged += checkDevToolsInContextMenuOnCheckedChanged;
 		}
 
 		public override void OnClosing() {
@@ -78,11 +85,11 @@ namespace TweetDuck.Dialogs.Settings{
 		#region Application
 
 		private void btnOpenAppFolder_Click(object sender, EventArgs e) {
-            App.SystemHandler.OpenFileExplorer(Program.ProgramPath);
+			App.SystemHandler.OpenFileExplorer(App.ProgramPath);
 		}
 
 		private void btnOpenDataFolder_Click(object sender, EventArgs e) {
-            App.SystemHandler.OpenFileExplorer(Program.StoragePath);
+			App.SystemHandler.OpenFileExplorer(App.StoragePath);
 		}
 
 		private void btnRestart_Click(object sender, EventArgs e) {
@@ -98,6 +105,7 @@ namespace TweetDuck.Dialogs.Settings{
 		}
 
 		#endregion
+
 		#region Browser Cache
 
 		private void btnClearCache_Click(object sender, EventArgs e) {
@@ -111,6 +119,7 @@ namespace TweetDuck.Dialogs.Settings{
 		}
 
 		#endregion
+
 		#region Configuration
 
 		private void btnEditCefArgs_Click(object sender, EventArgs e) {
@@ -164,8 +173,21 @@ namespace TweetDuck.Dialogs.Settings{
 		}
 
 		#endregion
+
+		#region Proxy
+
+		private void checkUseSystemProxyForAllConnections_CheckedChanged(object sender, EventArgs e) {
+			SysConfig.UseSystemProxyForAllConnections = checkUseSystemProxyForAllConnections.Checked;
+		}
+
+		#endregion
+
 		#region Development Tools
 
+		private void checkDevToolsInContextMenuOnCheckedChanged(object sender, EventArgs e) {
+			Config.DevToolsInContextMenu = checkDevToolsInContextMenu.Checked;
+		}
+
 		private void checkDevToolsWindowOnTop_CheckedChanged(object sender, EventArgs e) {
 			Config.DevToolsWindowOnTop = checkDevToolsWindowOnTop.Checked;
 		}

Dialogs/Settings/TabSettingsFeedback.Designer.cs

@@ -24,80 +24,13 @@
         /// </summary>
         private void InitializeComponent() {
 	        this.components = new System.ComponentModel.Container();
-            this.panelDataCollection = new System.Windows.Forms.Panel();
-            this.labelDataCollectionLink = new System.Windows.Forms.LinkLabel();
-            this.checkDataCollection = new System.Windows.Forms.CheckBox();
-            this.labelDataCollectionMessage = new System.Windows.Forms.Label();
-            this.btnViewReport = new System.Windows.Forms.Button();
 	        this.btnSendFeedback = new System.Windows.Forms.Button();
-            this.labelDataCollection = new System.Windows.Forms.Label();
-            this.labelFeedback = new System.Windows.Forms.Label();
 	        this.toolTip = new System.Windows.Forms.ToolTip(this.components);
 	        this.flowPanel = new System.Windows.Forms.FlowLayoutPanel();
-            this.panelDataCollection.SuspendLayout();
+	        this.labelFeedback = new System.Windows.Forms.Label();
 	        this.flowPanel.SuspendLayout();
 	        this.SuspendLayout();
 	        //
-            // panelDataCollection
-            // 
-            this.panelDataCollection.Controls.Add(this.labelDataCollectionLink);
-            this.panelDataCollection.Controls.Add(this.checkDataCollection);
-            this.panelDataCollection.Location = new System.Drawing.Point(0, 78);
-            this.panelDataCollection.Margin = new System.Windows.Forms.Padding(0);
-            this.panelDataCollection.Name = "panelDataCollection";
-            this.panelDataCollection.Size = new System.Drawing.Size(300, 28);
-            this.panelDataCollection.TabIndex = 3;
-            // 
-            // labelDataCollectionLink
-            // 
-            this.labelDataCollectionLink.AutoSize = true;
-            this.labelDataCollectionLink.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.labelDataCollectionLink.LinkArea = new System.Windows.Forms.LinkArea(1, 10);
-            this.labelDataCollectionLink.LinkBehavior = System.Windows.Forms.LinkBehavior.HoverUnderline;
-            this.labelDataCollectionLink.Location = new System.Drawing.Point(153, 4);
-            this.labelDataCollectionLink.Margin = new System.Windows.Forms.Padding(0);
-            this.labelDataCollectionLink.Name = "labelDataCollectionLink";
-            this.labelDataCollectionLink.Size = new System.Drawing.Size(71, 21);
-            this.labelDataCollectionLink.TabIndex = 1;
-            this.labelDataCollectionLink.TabStop = true;
-            this.labelDataCollectionLink.Text = "(learn more)";
-            this.labelDataCollectionLink.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.labelDataCollectionLink.UseCompatibleTextRendering = true;
-            // 
-            // checkDataCollection
-            // 
-            this.checkDataCollection.AutoSize = true;
-            this.checkDataCollection.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.checkDataCollection.Location = new System.Drawing.Point(6, 6);
-            this.checkDataCollection.Margin = new System.Windows.Forms.Padding(6, 6, 0, 2);
-            this.checkDataCollection.Name = "checkDataCollection";
-            this.checkDataCollection.Size = new System.Drawing.Size(147, 19);
-            this.checkDataCollection.TabIndex = 0;
-            this.checkDataCollection.Text = "Send Anonymous Data";
-            this.checkDataCollection.UseVisualStyleBackColor = true;
-            // 
-            // labelDataCollectionMessage
-            // 
-            this.labelDataCollectionMessage.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.labelDataCollectionMessage.Location = new System.Drawing.Point(6, 143);
-            this.labelDataCollectionMessage.Margin = new System.Windows.Forms.Padding(6);
-            this.labelDataCollectionMessage.Name = "labelDataCollectionMessage";
-            this.labelDataCollectionMessage.Size = new System.Drawing.Size(288, 67);
-            this.labelDataCollectionMessage.TabIndex = 5;
-            // 
-            // btnViewReport
-            // 
-            this.btnViewReport.AutoSize = true;
-            this.btnViewReport.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.btnViewReport.Location = new System.Drawing.Point(5, 109);
-            this.btnViewReport.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
-            this.btnViewReport.Name = "btnViewReport";
-            this.btnViewReport.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.btnViewReport.Size = new System.Drawing.Size(155, 25);
-            this.btnViewReport.TabIndex = 4;
-            this.btnViewReport.Text = "View My Analytics Report";
-            this.btnViewReport.UseVisualStyleBackColor = true;
-            // 
 	        // btnSendFeedback
 	        //
 	        this.btnSendFeedback.AutoSize = true;
@@ -111,16 +44,17 @@
 	        this.btnSendFeedback.Text = "Send Feedback / Bug Report";
 	        this.btnSendFeedback.UseVisualStyleBackColor = true;
 	        //
-            // labelDataCollection
+	        // flowPanel
 	        //
-            this.labelDataCollection.AutoSize = true;
-            this.labelDataCollection.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold);
-            this.labelDataCollection.Location = new System.Drawing.Point(3, 63);
-            this.labelDataCollection.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
-            this.labelDataCollection.Name = "labelDataCollection";
-            this.labelDataCollection.Size = new System.Drawing.Size(88, 15);
-            this.labelDataCollection.TabIndex = 2;
-            this.labelDataCollection.Text = "Data Collection";
+	        this.flowPanel.Anchor = ((System.Windows.Forms.AnchorStyles) ((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right)));
+	        this.flowPanel.Controls.Add(this.labelFeedback);
+	        this.flowPanel.Controls.Add(this.btnSendFeedback);
+	        this.flowPanel.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
+	        this.flowPanel.Location = new System.Drawing.Point(9, 9);
+	        this.flowPanel.Name = "flowPanel";
+	        this.flowPanel.Size = new System.Drawing.Size(300, 462);
+	        this.flowPanel.TabIndex = 0;
+	        this.flowPanel.WrapContents = false;
 	        //
 	        // labelFeedback
 	        //
@@ -133,24 +67,6 @@
 	        this.labelFeedback.TabIndex = 0;
 	        this.labelFeedback.Text = "FEEDBACK";
 	        //
-            // flowPanel
-            // 
-            this.flowPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.flowPanel.Controls.Add(this.labelFeedback);
-            this.flowPanel.Controls.Add(this.btnSendFeedback);
-            this.flowPanel.Controls.Add(this.labelDataCollection);
-            this.flowPanel.Controls.Add(this.panelDataCollection);
-            this.flowPanel.Controls.Add(this.btnViewReport);
-            this.flowPanel.Controls.Add(this.labelDataCollectionMessage);
-            this.flowPanel.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
-            this.flowPanel.Location = new System.Drawing.Point(9, 9);
-            this.flowPanel.Name = "flowPanel";
-            this.flowPanel.Size = new System.Drawing.Size(300, 462);
-            this.flowPanel.TabIndex = 0;
-            this.flowPanel.WrapContents = false;
-            // 
 	        // TabSettingsFeedback
 	        //
 	        this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -158,25 +74,16 @@
 	        this.Controls.Add(this.flowPanel);
 	        this.Name = "TabSettingsFeedback";
 	        this.Size = new System.Drawing.Size(631, 480);
-            this.panelDataCollection.ResumeLayout(false);
-            this.panelDataCollection.PerformLayout();
 	        this.flowPanel.ResumeLayout(false);
 	        this.flowPanel.PerformLayout();
 	        this.ResumeLayout(false);
-
         }
 
+        private System.Windows.Forms.ToolTip toolTip;
+        private System.Windows.Forms.Button btnSendFeedback;
+        private System.Windows.Forms.FlowLayoutPanel flowPanel;
+        private System.Windows.Forms.Label labelFeedback;
+
         #endregion
-
-        private System.Windows.Forms.Panel panelDataCollection;
-        private System.Windows.Forms.CheckBox checkDataCollection;
-        private System.Windows.Forms.Label labelDataCollection;
-        private System.Windows.Forms.Label labelFeedback;
-        private System.Windows.Forms.ToolTip toolTip;
-        private System.Windows.Forms.LinkLabel labelDataCollectionLink;
-        private System.Windows.Forms.Button btnSendFeedback;
-        private System.Windows.Forms.Button btnViewReport;
-        private System.Windows.Forms.Label labelDataCollectionMessage;
-        private System.Windows.Forms.FlowLayoutPanel flowPanel;
     }
 }

Dialogs/Settings/TabSettingsFeedback.cs

@@ -1,56 +1,20 @@
 using System;
-using System.Windows.Forms;
-using TweetDuck.Management.Analytics;
-using TweetDuck.Utils;
-using TweetLib.Core.Features.Plugins;
+using TweetLib.Core;
 
 namespace TweetDuck.Dialogs.Settings {
 	sealed partial class TabSettingsFeedback : FormSettings.BaseTab {
-        private readonly AnalyticsFile analyticsFile;
-        private readonly AnalyticsReportGenerator.ExternalInfo analyticsInfo;
-        private readonly PluginManager plugins;
-
-        public TabSettingsFeedback(AnalyticsManager analytics, AnalyticsReportGenerator.ExternalInfo analyticsInfo, PluginManager plugins){
+		public TabSettingsFeedback() {
 			InitializeComponent();
-            
-            this.analyticsFile = analytics?.File ?? AnalyticsFile.Load(Program.AnalyticsFilePath);
-            this.analyticsInfo = analyticsInfo;
-            this.plugins = plugins;
-
-            // feedback
-
-            checkDataCollection.Checked = Config.AllowDataCollection;
-
-            if (analytics != null){
-                string collectionTime = analyticsFile.LastCollectionMessage;
-                labelDataCollectionMessage.Text = string.IsNullOrEmpty(collectionTime) ? "No collection yet" : "Last collection: " + collectionTime;
-            }
 		}
 
 		public override void OnReady() {
 			btnSendFeedback.Click += btnSendFeedback_Click;
-            checkDataCollection.CheckedChanged += checkDataCollection_CheckedChanged;
-            labelDataCollectionLink.LinkClicked += labelDataCollectionLink_LinkClicked;
-            btnViewReport.Click += btnViewReport_Click;
 		}
 
 		#region Feedback
 
 		private void btnSendFeedback_Click(object sender, EventArgs e) {
-            BrowserUtils.OpenExternalBrowser("https://github.com/chylex/TweetDuck/issues/new");
-        }
-
-        private void checkDataCollection_CheckedChanged(object sender, EventArgs e){
-            Config.AllowDataCollection = checkDataCollection.Checked;
-        }
-
-        private void labelDataCollectionLink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e){
-            BrowserUtils.OpenExternalBrowser("https://github.com/chylex/TweetDuck/wiki/Send-anonymous-data");
-        }
-
-        private void btnViewReport_Click(object sender, EventArgs e){
-            using DialogSettingsAnalytics dialog = new DialogSettingsAnalytics(AnalyticsReportGenerator.Create(analyticsFile, analyticsInfo, plugins));
-            dialog.ShowDialog();
+			App.SystemHandler.OpenBrowser(Lib.IssueTrackerUrl + "/new");
 		}
 
 		#endregion

Dialogs/Settings/TabSettingsGeneral.Designer.cs

@@ -44,6 +44,7 @@
             this.labelBrowserSettings = new System.Windows.Forms.Label();
             this.checkSmoothScrolling = new System.Windows.Forms.CheckBox();
             this.checkTouchAdjustment = new System.Windows.Forms.CheckBox();
+            this.checkAutomaticallyDetectColorProfile = new System.Windows.Forms.CheckBox();
             this.checkHardwareAcceleration = new System.Windows.Forms.CheckBox();
             this.labelBrowserPath = new System.Windows.Forms.Label();
             this.comboBoxCustomBrowser = new System.Windows.Forms.ComboBox();
@@ -90,11 +91,11 @@
             //
             this.checkUpdateNotifications.AutoSize = true;
             this.checkUpdateNotifications.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.checkUpdateNotifications.Location = new System.Drawing.Point(6, 403);
+            this.checkUpdateNotifications.Location = new System.Drawing.Point(6, 409);
             this.checkUpdateNotifications.Margin = new System.Windows.Forms.Padding(6, 6, 3, 2);
             this.checkUpdateNotifications.Name = "checkUpdateNotifications";
             this.checkUpdateNotifications.Size = new System.Drawing.Size(182, 19);
-            this.checkUpdateNotifications.TabIndex = 14;
+            this.checkUpdateNotifications.TabIndex = 15;
             this.checkUpdateNotifications.Text = "Check Updates Automatically";
             this.checkUpdateNotifications.UseVisualStyleBackColor = true;
             //
@@ -102,12 +103,12 @@
             //
             this.btnCheckUpdates.AutoSize = true;
             this.btnCheckUpdates.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.btnCheckUpdates.Location = new System.Drawing.Point(5, 427);
+            this.btnCheckUpdates.Location = new System.Drawing.Point(5, 433);
             this.btnCheckUpdates.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.btnCheckUpdates.Name = "btnCheckUpdates";
             this.btnCheckUpdates.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.btnCheckUpdates.Size = new System.Drawing.Size(128, 25);
-            this.btnCheckUpdates.TabIndex = 15;
+            this.btnCheckUpdates.TabIndex = 16;
             this.btnCheckUpdates.Text = "Check Updates Now";
             this.btnCheckUpdates.UseVisualStyleBackColor = true;
             //
@@ -166,11 +167,11 @@
             //
             this.labelZoom.AutoSize = true;
             this.labelZoom.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold);
-            this.labelZoom.Location = new System.Drawing.Point(3, 299);
+            this.labelZoom.Location = new System.Drawing.Point(3, 323);
             this.labelZoom.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelZoom.Name = "labelZoom";
             this.labelZoom.Size = new System.Drawing.Size(39, 15);
-            this.labelZoom.TabIndex = 11;
+            this.labelZoom.TabIndex = 12;
             this.labelZoom.Text = "Zoom";
             //
             // zoomUpdateTimer
@@ -193,11 +194,11 @@
             //
             this.panelZoom.Controls.Add(this.trackBarZoom);
             this.panelZoom.Controls.Add(this.labelZoomValue);
-            this.panelZoom.Location = new System.Drawing.Point(0, 315);
+            this.panelZoom.Location = new System.Drawing.Point(0, 339);
             this.panelZoom.Margin = new System.Windows.Forms.Padding(0, 1, 0, 0);
             this.panelZoom.Name = "panelZoom";
             this.panelZoom.Size = new System.Drawing.Size(300, 35);
-            this.panelZoom.TabIndex = 12;
+            this.panelZoom.TabIndex = 13;
             //
             // checkAnimatedAvatars
             //
@@ -215,11 +216,11 @@
             //
             this.labelUpdates.AutoSize = true;
             this.labelUpdates.Font = new System.Drawing.Font("Segoe UI Semibold", 10.5F, System.Drawing.FontStyle.Bold);
-            this.labelUpdates.Location = new System.Drawing.Point(0, 377);
-            this.labelUpdates.Margin = new System.Windows.Forms.Padding(0, 27, 0, 1);
+            this.labelUpdates.Location = new System.Drawing.Point(0, 383);
+            this.labelUpdates.Margin = new System.Windows.Forms.Padding(0, 7, 0, 1);
             this.labelUpdates.Name = "labelUpdates";
             this.labelUpdates.Size = new System.Drawing.Size(69, 19);
-            this.labelUpdates.TabIndex = 13;
+            this.labelUpdates.TabIndex = 14;
             this.labelUpdates.Text = "UPDATES";
             //
             // flowPanelLeft
@@ -236,6 +237,7 @@
             this.flowPanelLeft.Controls.Add(this.labelBrowserSettings);
             this.flowPanelLeft.Controls.Add(this.checkSmoothScrolling);
             this.flowPanelLeft.Controls.Add(this.checkTouchAdjustment);
+            this.flowPanelLeft.Controls.Add(this.checkAutomaticallyDetectColorProfile);
             this.flowPanelLeft.Controls.Add(this.checkHardwareAcceleration);
             this.flowPanelLeft.Controls.Add(this.labelZoom);
             this.flowPanelLeft.Controls.Add(this.panelZoom);
@@ -308,15 +310,27 @@
             this.checkTouchAdjustment.Text = "Touch Screen Adjustment";
             this.checkTouchAdjustment.UseVisualStyleBackColor = true;
             //
+            // checkAutomaticallyDetectColorProfile
+            //
+            this.checkAutomaticallyDetectColorProfile.AutoSize = true;
+            this.checkAutomaticallyDetectColorProfile.Font = new System.Drawing.Font("Segoe UI", 9F);
+            this.checkAutomaticallyDetectColorProfile.Location = new System.Drawing.Point(6, 266);
+            this.checkAutomaticallyDetectColorProfile.Margin = new System.Windows.Forms.Padding(6, 3, 3, 2);
+            this.checkAutomaticallyDetectColorProfile.Name = "checkAutomaticallyDetectColorProfile";
+            this.checkAutomaticallyDetectColorProfile.Size = new System.Drawing.Size(206, 19);
+            this.checkAutomaticallyDetectColorProfile.TabIndex = 10;
+            this.checkAutomaticallyDetectColorProfile.Text = "Automatically Detect Color Profile";
+            this.checkAutomaticallyDetectColorProfile.UseVisualStyleBackColor = true;
+            //
             // checkHardwareAcceleration
             //
             this.checkHardwareAcceleration.AutoSize = true;
             this.checkHardwareAcceleration.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.checkHardwareAcceleration.Location = new System.Drawing.Point(6, 266);
+            this.checkHardwareAcceleration.Location = new System.Drawing.Point(6, 290);
             this.checkHardwareAcceleration.Margin = new System.Windows.Forms.Padding(6, 3, 3, 2);
             this.checkHardwareAcceleration.Name = "checkHardwareAcceleration";
             this.checkHardwareAcceleration.Size = new System.Drawing.Size(146, 19);
-            this.checkHardwareAcceleration.TabIndex = 10;
+            this.checkHardwareAcceleration.TabIndex = 11;
             this.checkHardwareAcceleration.Text = "Hardware Acceleration";
             this.checkHardwareAcceleration.UseVisualStyleBackColor = true;
             //
@@ -619,6 +633,7 @@
         private System.Windows.Forms.Label labelSearchEngine;
         private System.Windows.Forms.ComboBox comboBoxSearchEngine;
         private System.Windows.Forms.CheckBox checkTouchAdjustment;
+        private System.Windows.Forms.CheckBox checkAutomaticallyDetectColorProfile;
         private System.Windows.Forms.FlowLayoutPanel flowPanelRight;
         private System.Windows.Forms.Panel panelSeparator;
         private System.Windows.Forms.Label labelLocales;

Dialogs/Settings/TabSettingsGeneral.cs

@@ -2,17 +2,20 @@
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
-using TweetDuck.Browser.Handling.General;
+using TweetDuck.Browser.Handling;
 using TweetDuck.Controls;
 using TweetDuck.Utils;
+using TweetLib.Core;
+using TweetLib.Core.Features.Chromium;
+using TweetLib.Core.Features.Twitter;
 using TweetLib.Core.Systems.Updates;
-using TweetLib.Core.Utils;
+using TweetLib.Utils.Globalization;
 
 namespace TweetDuck.Dialogs.Settings {
 	sealed partial class TabSettingsGeneral : FormSettings.BaseTab {
 		private readonly Action reloadColumns;
 
-        private readonly UpdateHandler updates;
+		private readonly UpdateChecker updates;
 		private int updateCheckEventId = -1;
 
 		private readonly int browserListIndexDefault;
@@ -24,7 +27,7 @@ namespace TweetDuck.Dialogs.Settings{
 		private readonly int searchEngineIndexDefault;
 		private readonly int searchEngineIndexCustom;
 
-        public TabSettingsGeneral(Action reloadColumns, UpdateHandler updates){
+		public TabSettingsGeneral(Action reloadColumns, UpdateChecker updates) {
 			InitializeComponent();
 
 			this.reloadColumns = reloadColumns;
@@ -66,13 +69,15 @@ namespace TweetDuck.Dialogs.Settings{
 
 			toolTip.SetToolTip(checkSmoothScrolling, "Toggles smooth mouse wheel scrolling.");
 			toolTip.SetToolTip(checkTouchAdjustment, "Toggles Chromium touch screen adjustment.\r\nDisabled by default, because it is very imprecise with TweetDeck.");
+			toolTip.SetToolTip(checkAutomaticallyDetectColorProfile, "Automatically detects the color profile of your system.\r\nUses the sRGB profile if disabled.");
 			toolTip.SetToolTip(checkHardwareAcceleration, "Uses graphics card to improve performance.\r\nDisable if you experience visual glitches, or to save a small amount of RAM.");
 			toolTip.SetToolTip(comboBoxCustomBrowser, "Sets the default browser for opening links.");
 			toolTip.SetToolTip(comboBoxCustomVideoPlayer, "Sets the default application for playing videos.");
 			toolTip.SetToolTip(comboBoxSearchEngine, "Sets the default website for opening searches.");
 
 			checkSmoothScrolling.Checked = Config.EnableSmoothScrolling;
-            checkTouchAdjustment.Checked = Config.EnableTouchAdjustment;
+			checkTouchAdjustment.Checked = SysConfig.EnableTouchAdjustment;
+			checkAutomaticallyDetectColorProfile.Checked = SysConfig.EnableColorProfileDetection;
 			checkHardwareAcceleration.Checked = SysConfig.HardwareAcceleration;
 
 			foreach (WindowsUtils.Browser browserInfo in WindowsUtils.FindInstalledBrowsers()) {
@@ -105,20 +110,20 @@ namespace TweetDuck.Dialogs.Settings{
 			checkSpellCheck.Checked = Config.EnableSpellCheck;
 
 			try {
-                foreach(LocaleUtils.Item item in LocaleUtils.SpellCheckLanguages){
+				foreach (Language item in SpellCheck.SupportedLanguages) {
 					comboBoxSpellCheckLanguage.Items.Add(item);
 				}
 			} catch {
-                comboBoxSpellCheckLanguage.Items.Add(new LocaleUtils.Item("en-US"));
+				comboBoxSpellCheckLanguage.Items.Add(new Language("en-US"));
 			}
 
-            comboBoxSpellCheckLanguage.SelectedItem = new LocaleUtils.Item(Config.SpellCheckLanguage);
+			comboBoxSpellCheckLanguage.SelectedItem = new Language(Config.SpellCheckLanguage);
 
-            foreach(LocaleUtils.Item item in LocaleUtils.TweetDeckTranslationLocales){
+			foreach (Language item in TweetDeckTranslations.SupportedLanguages) {
 				comboBoxTranslationTarget.Items.Add(item);
 			}
 
-            comboBoxTranslationTarget.SelectedItem = new LocaleUtils.Item(Config.TranslationTarget);
+			comboBoxTranslationTarget.SelectedItem = new Language(Config.TranslationTarget);
 
 			var daysOfWeek = comboBoxFirstDayOfWeek.Items;
 			daysOfWeek.Add("(based on system locale)");
@@ -146,6 +151,7 @@ namespace TweetDuck.Dialogs.Settings{
 
 			checkSmoothScrolling.CheckedChanged += checkSmoothScrolling_CheckedChanged;
 			checkTouchAdjustment.CheckedChanged += checkTouchAdjustment_CheckedChanged;
+			checkAutomaticallyDetectColorProfile.CheckedChanged += checkAutomaticallyDetectColorProfile_CheckedChanged;
 			checkHardwareAcceleration.CheckedChanged += checkHardwareAcceleration_CheckedChanged;
 			comboBoxCustomBrowser.SelectedIndexChanged += comboBoxCustomBrowser_SelectedIndexChanged;
 			btnCustomBrowserChange.Click += btnCustomBrowserChange_Click;
@@ -204,6 +210,7 @@ namespace TweetDuck.Dialogs.Settings{
 		}
 
 		#endregion
+
 		#region Updates
 
 		private void checkUpdateNotifications_CheckedChanged(object sender, EventArgs e) {
@@ -226,12 +233,13 @@ namespace TweetDuck.Dialogs.Settings{
 						FormMessage.Information("No Updates Available", "Your version of TweetDuck is up to date.", FormMessage.OK);
 					}
 				}, ex => {
-                    Program.Reporter.HandleException("Update Check Error", "An error occurred while checking for updates.", true, ex);
+					App.ErrorHandler.HandleException("Update Check Error", "An error occurred while checking for updates.", true, ex);
 				});
 			}
 		}
 
 		#endregion
+
 		#region Browser Settings
 
 		private void checkSmoothScrolling_CheckedChanged(object sender, EventArgs e) {
@@ -239,7 +247,11 @@ namespace TweetDuck.Dialogs.Settings{
 		}
 
 		private void checkTouchAdjustment_CheckedChanged(object sender, EventArgs e) {
-            Config.EnableTouchAdjustment = checkTouchAdjustment.Checked;
+			SysConfig.EnableTouchAdjustment = checkTouchAdjustment.Checked;
+		}
+
+		private void checkAutomaticallyDetectColorProfile_CheckedChanged(object sender, EventArgs e) {
+			SysConfig.EnableColorProfileDetection = checkAutomaticallyDetectColorProfile.Checked;
 		}
 
 		private void checkHardwareAcceleration_CheckedChanged(object sender, EventArgs e) {
@@ -385,6 +397,7 @@ namespace TweetDuck.Dialogs.Settings{
 		}
 
 		#endregion
+
 		#region Locales
 
 		private void checkSpellCheck_CheckedChanged(object sender, EventArgs e) {
@@ -393,11 +406,11 @@ namespace TweetDuck.Dialogs.Settings{
 		}
 
 		private void comboBoxSpellCheckLanguage_SelectedValueChanged(object sender, EventArgs e) {
-            Config.SpellCheckLanguage = (comboBoxSpellCheckLanguage.SelectedItem as LocaleUtils.Item)?.Code ?? "en-US";
+			Config.SpellCheckLanguage = (comboBoxSpellCheckLanguage.SelectedItem as Language)?.Code ?? "en-US";
 		}
 
 		private void comboBoxTranslationTarget_SelectedValueChanged(object sender, EventArgs e) {
-            Config.TranslationTarget = (comboBoxTranslationTarget.SelectedItem as LocaleUtils.Item)?.Code ?? "en";
+			Config.TranslationTarget = (comboBoxTranslationTarget.SelectedItem as Language)?.Code ?? "en";
 		}
 
 		private void comboBoxFirstDayOfWeek_SelectedValueChanged(object sender, EventArgs e) {
@@ -410,7 +423,7 @@ namespace TweetDuck.Dialogs.Settings{
 
 			public DayOfWeekItem(string name, DayOfWeek dow) {
 				Name = name;
-                Id = LocaleUtils.GetJQueryDayOfWeek(dow);
+				Id = JQuery.GetDatePickerDayOfWeek(dow);
 			}
 
 			public override int GetHashCode() => Name.GetHashCode();

Dialogs/Settings/TabSettingsNotifications.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Windows.Forms;
-using TweetDuck.Browser.Notification.Example;
+using TweetDuck.Browser.Notification;
 using TweetDuck.Controls;
 using TweetLib.Core.Features.Notifications;
 
@@ -68,11 +68,21 @@ namespace TweetDuck.Dialogs.Settings{
 			toolTip.SetToolTip(radioLocCustom, "Drag the example notification window to the desired location.");
 
 			switch (Config.NotificationPosition) {
-                case DesktopNotification.Position.TopLeft: radioLocTL.Checked = true; break;
-                case DesktopNotification.Position.TopRight: radioLocTR.Checked = true; break;
-                case DesktopNotification.Position.BottomLeft: radioLocBL.Checked = true; break;
-                case DesktopNotification.Position.BottomRight: radioLocBR.Checked = true; break;
-                case DesktopNotification.Position.Custom: radioLocCustom.Checked = true; break;
+				case DesktopNotification.Position.TopLeft:
+					radioLocTL.Checked = true;
+					break;
+				case DesktopNotification.Position.TopRight:
+					radioLocTR.Checked = true;
+					break;
+				case DesktopNotification.Position.BottomLeft:
+					radioLocBL.Checked = true;
+					break;
+				case DesktopNotification.Position.BottomRight:
+					radioLocBR.Checked = true;
+					break;
+				case DesktopNotification.Position.Custom:
+					radioLocCustom.Checked = true;
+					break;
 			}
 
 			comboBoxDisplay.Enabled = trackBarEdgeDistance.Enabled = !radioLocCustom.Checked;
@@ -93,8 +103,12 @@ namespace TweetDuck.Dialogs.Settings{
 			toolTip.SetToolTip(radioSizeCustom, "Resize the example notification window to the desired size.");
 
 			switch (Config.NotificationSize) {
-                case DesktopNotification.Size.Auto: radioSizeAuto.Checked = true; break;
-                case DesktopNotification.Size.Custom: radioSizeCustom.Checked = true; break;
+				case DesktopNotification.Size.Auto:
+					radioSizeAuto.Checked = true;
+					break;
+				case DesktopNotification.Size.Custom:
+					radioSizeCustom.Checked = true;
+					break;
 			}
 
 			trackBarScrollSpeed.SetValueSafe(Config.NotificationScrollSpeed);
@@ -182,6 +196,7 @@ namespace TweetDuck.Dialogs.Settings{
 		}
 
 		#endregion
+
 		#region Timer
 
 		private void checkNotificationTimer_CheckedChanged(object sender, EventArgs e) {
@@ -221,6 +236,7 @@ namespace TweetDuck.Dialogs.Settings{
 		}
 
 		#endregion
+
 		#region Location
 
 		private void radioLoc_CheckedChanged(object sender, EventArgs e) {
@@ -274,6 +290,7 @@ namespace TweetDuck.Dialogs.Settings{
 		}
 
 		#endregion
+
 		#region Size
 
 		private void radioSize_CheckedChanged(object sender, EventArgs e) {

Management/Analytics/AnalyticsFile.cs

@@ -1,136 +0,0 @@
-using System;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Reflection;
-using TweetLib.Core.Serialization;
-using TweetLib.Core.Serialization.Converters;
-
-namespace TweetDuck.Management.Analytics{
-    [SuppressMessage("ReSharper", "AutoPropertyCanBeMadeGetOnly.Local")]
-    sealed class AnalyticsFile{
-        private static readonly FileSerializer<AnalyticsFile> Serializer = new FileSerializer<AnalyticsFile>();
-
-        static AnalyticsFile(){
-            Serializer.RegisterTypeConverter(typeof(DateTime), new SingleTypeConverter<DateTime>{
-                ConvertToString = value => value.ToBinary().ToString(),
-                ConvertToObject = value => DateTime.FromBinary(long.Parse(value))
-            });
-
-            Serializer.RegisterTypeConverter(typeof(Counter), new SingleTypeConverter<Counter>{
-                ConvertToString = value => value.Value.ToString(),
-                ConvertToObject = value => int.Parse(value)
-            });
-        }
-
-        public static readonly AnalyticsFile Dummy = new AnalyticsFile();
-
-        // STATE PROPERTIES
-        
-        public DateTime LastDataCollection  { get; set; } = DateTime.MinValue;
-        public string LastCollectionVersion { get; set; } = null;
-        public string LastCollectionMessage { get; set; } = null;
-
-        // USAGE DATA
-
-        public Counter OpenOptions { get; private set; } = 0;
-        public Counter OpenPlugins { get; private set; } = 0;
-        public Counter OpenAbout   { get; private set; } = 0;
-        public Counter OpenGuide   { get; private set; } = 0;
-
-        public Counter DesktopNotifications { get; private set; } = 0;
-        public Counter SoundNotifications   { get; private set; } = 0;
-        public Counter NotificationMutes    { get; private set; } = 0;
-        
-        public Counter BrowserContextMenus           { get; private set; } = 0;
-        public Counter BrowserExtraMouseButtons      { get; private set; } = 0;
-        public Counter NotificationContextMenus      { get; private set; } = 0;
-        public Counter NotificationExtraMouseButtons { get; private set; } = 0;
-        public Counter NotificationKeyboardShortcuts { get; private set; } = 0;
-
-        public Counter BrowserReloads   { get; private set; } = 0;
-        public Counter CopiedUsernames  { get; private set; } = 0;
-        public Counter ViewedImages     { get; private set; } = 0;
-        public Counter DownloadedImages { get; private set; } = 0;
-        public Counter DownloadedVideos { get; private set; } = 0;
-        public Counter UsedROT13        { get; private set; } = 0;
-
-        public Counter TweetScreenshots { get; private set; } = 0;
-        public Counter TweetDetails     { get; private set; } = 0;
-        public Counter VideoPlays       { get; private set; } = 0;
-
-        // END OF DATA
-
-        public event EventHandler PropertyChanged;
-        
-        private readonly string file;
-        
-        private AnalyticsFile(string file){
-            this.file = file;
-        }
-
-        private AnalyticsFile(){
-            this.file = null;
-        }
-
-        private void SetupProperties(){
-            foreach(Counter counter in GetType().GetProperties(BindingFlags.Instance | BindingFlags.Public).Where(prop => prop.PropertyType == typeof(Counter)).Select(prop => (Counter)prop.GetValue(this))){
-                counter.SetOwner(this);
-            }
-        }
-
-        public void OnPropertyChanged(){
-            PropertyChanged?.Invoke(this, EventArgs.Empty);
-        }
-
-        public void Save(){
-            if (file == null){
-                return;
-            }
-
-            try{
-                Serializer.Write(file, this);
-            }catch(Exception e){
-                Program.Reporter.HandleException("Analytics File Error", "Could not save the analytics file.", true, e);
-            }
-        }
-        
-        public static AnalyticsFile Load(string file){
-            AnalyticsFile config = new AnalyticsFile(file);
-            
-            try{
-                Serializer.ReadIfExists(file, config);
-            }catch(Exception e){
-                Program.Reporter.HandleException("Analytics File Error", "Could not open the analytics file.", true, e);
-            }
-            
-            config.SetupProperties();
-            return config;
-        }
-
-        public interface IProvider{
-            AnalyticsFile AnalyticsFile { get; }
-        }
-
-        public sealed class Counter{
-            public int Value { get; private set; }
-
-            private AnalyticsFile owner;
-
-            public Counter(int value){
-                this.Value = value;
-            }
-
-            public void SetOwner(AnalyticsFile owner){
-                this.owner = owner;
-            }
-
-            public void Trigger(){
-                ++Value;
-                owner?.OnPropertyChanged();
-            }
-
-            public static implicit operator int(Counter counter) => counter.Value;
-            public static implicit operator Counter(int value) => new Counter(value);
-        }
-    }
-}

Management/Analytics/AnalyticsManager.cs

@@ -1,160 +0,0 @@
-// Uncomment to debug reports locally
-// #define ANALYTICS_LOCALHOST
-// #define ANALYTICS_INSTANT
-
-using System;
-using System.Net;
-using System.Threading.Tasks;
-using System.Timers;
-using TweetDuck.Browser;
-using TweetDuck.Controls;
-using TweetDuck.Utils;
-using TweetLib.Core;
-using TweetLib.Core.Features.Plugins;
-using TweetLib.Core.Utils;
-
-namespace TweetDuck.Management.Analytics{
-    sealed class AnalyticsManager : IDisposable{
-        private static readonly TimeSpan CollectionInterval = TimeSpan.FromDays(14);
-
-        private static readonly Uri CollectionUrl = new Uri(
-            #if (DEBUG && ANALYTICS_LOCALHOST)
-            "http://localhost/newhome/tweetduck/~breadcrumb/request.php?type=report"
-            #else
-            "https://tweetduck.chylex.com/breadcrumb/report"
-            #endif
-        );
-        
-        public AnalyticsFile File { get; }
-
-        private readonly FormBrowser browser;
-        private readonly PluginManager plugins;
-        private readonly Timer currentTimer, saveTimer;
-
-        public AnalyticsManager(FormBrowser browser, PluginManager plugins, string file){
-            this.browser = browser;
-            this.plugins = plugins;
-
-            this.File = AnalyticsFile.Load(file);
-            this.File.PropertyChanged += File_PropertyChanged;
-
-            this.currentTimer = new Timer{ SynchronizingObject = browser };
-            this.currentTimer.Elapsed += currentTimer_Elapsed;
-
-            this.saveTimer = new Timer{ SynchronizingObject = browser, Interval = 60000 };
-            this.saveTimer.Elapsed += saveTimer_Elapsed;
-
-            if (this.File.LastCollectionVersion != Program.VersionTag){
-                ScheduleReportIn(TimeSpan.FromHours(8), string.Empty);
-            }
-            else{
-                RestartTimer();
-            }
-
-            #if (DEBUG && ANALYTICS_INSTANT)
-            SendReport();
-            #endif
-        }
-
-        public void Dispose(){
-            File.PropertyChanged -= File_PropertyChanged;
-
-            if (saveTimer.Enabled){
-                File.Save();
-            }
-
-            currentTimer.Dispose();
-            saveTimer.Dispose();
-        }
-
-        private void File_PropertyChanged(object sender, EventArgs e){
-            saveTimer.Enabled = true;
-        }
-
-        private void saveTimer_Elapsed(object sender, ElapsedEventArgs e){
-            saveTimer.Stop();
-            File.Save();
-        }
-
-        private void ScheduleReportIn(TimeSpan delay, string message = null){
-            SetLastDataCollectionTime(DateTime.Now.Subtract(CollectionInterval).Add(delay), message);
-        }
-
-        private void SetLastDataCollectionTime(DateTime dt, string message = null){
-            File.LastDataCollection = new DateTime(dt.Year, dt.Month, dt.Day, dt.Hour, dt.Minute, 0, dt.Kind);
-            File.LastCollectionVersion = Program.VersionTag;
-            File.LastCollectionMessage = message ?? dt.ToString("g", Lib.Culture);
-
-            File.Save();
-            RestartTimer();
-        }
-
-        private void RestartTimer(){
-            TimeSpan diff = DateTime.Now.Subtract(File.LastDataCollection);
-            int minutesTillNext = (int)(CollectionInterval.TotalMinutes - Math.Floor(diff.TotalMinutes));
-            
-            currentTimer.Interval = Math.Max(minutesTillNext, 2) * 60000;
-            currentTimer.Start();
-        }
-
-        private void currentTimer_Elapsed(object sender, ElapsedEventArgs e){
-            currentTimer.Stop();
-
-            TimeSpan diff = DateTime.Now.Subtract(File.LastDataCollection);
-            
-            if (Math.Floor(diff.TotalMinutes) >= CollectionInterval.TotalMinutes){
-                SendReport();
-            }
-            else{
-                RestartTimer();
-            }
-        }
-        
-        private void SendReport(){
-            AnalyticsReportGenerator.ExternalInfo info = AnalyticsReportGenerator.ExternalInfo.From(browser);
-
-            Task.Factory.StartNew(() => {
-                AnalyticsReport report = AnalyticsReportGenerator.Create(File, info, plugins);
-
-                #if (DEBUG && !ANALYTICS_INSTANT)
-                System.Diagnostics.Debugger.Break();
-                #endif
-
-                WebUtils.NewClient(BrowserUtils.UserAgentVanilla).UploadValues(CollectionUrl, "POST", report.ToNameValueCollection());
-            }).ContinueWith(task => browser.InvokeAsyncSafe(() => {
-                if (task.Status == TaskStatus.RanToCompletion){
-                    SetLastDataCollectionTime(DateTime.Now);
-                }
-                else if (task.Exception != null){
-                    string message = null;
-
-                    if (task.Exception.InnerException is WebException e){
-                        switch(e.Status){
-                            case WebExceptionStatus.ConnectFailure:
-                                message = "Connection Error";
-                                break;
-
-                            case WebExceptionStatus.NameResolutionFailure:
-                                message = "DNS Error";
-                                break;
-
-                            case WebExceptionStatus.ProtocolError:
-                                message = "HTTP Error " + (e.Response is HttpWebResponse response ? $"{(int)response.StatusCode} ({response.StatusDescription})" : "(unknown code)");
-                                break;
-                        }
-
-                        #if DEBUG
-                        System.IO.Stream responseStream = e.Response.GetResponseStream();
-
-                        if (responseStream != null){
-                            System.Diagnostics.Debug.WriteLine(new System.IO.StreamReader(responseStream).ReadToEnd());
-                        }
-                        #endif
-                    }
-
-                    ScheduleReportIn(TimeSpan.FromHours(4), message ?? "Error: " + (task.Exception.InnerException?.Message ?? task.Exception.Message));
-                }
-            }));
-        }
-    }
-}

Management/Analytics/AnalyticsReport.cs

@@ -1,57 +0,0 @@
-using System.Collections;
-using System.Collections.Specialized;
-using System.Text;
-
-namespace TweetDuck.Management.Analytics{
-    sealed class AnalyticsReport : IEnumerable{
-        private OrderedDictionary data = new OrderedDictionary(32);
-        private int separators;
-
-        public void Add(int ignored){ // adding separators to pretty print
-            data.Add((++separators).ToString(), null);
-        }
-
-        public void Add(string key, string value){
-            data.Add(key, value);
-        }
-
-        public AnalyticsReport FinalizeReport(){
-            if (!data.IsReadOnly){
-                data = data.AsReadOnly();
-            }
-
-            return this;
-        }
-
-        public IEnumerator GetEnumerator(){
-            return data.GetEnumerator();
-        }
-
-        public NameValueCollection ToNameValueCollection(){
-            NameValueCollection collection = new NameValueCollection();
-
-            foreach(DictionaryEntry entry in data){
-                if (entry.Value != null){
-                    collection.Add(((string)entry.Key).ToLower().Replace(' ', '_'), (string)entry.Value);
-                }
-            }
-
-            return collection;
-        }
-
-        public override string ToString(){
-            StringBuilder build = new StringBuilder(625);
-
-            foreach(DictionaryEntry entry in data){
-                if (entry.Value == null){
-                    build.AppendLine();
-                }
-                else{
-                    build.AppendLine(entry.Key + ": " + entry.Value);
-                }
-            }
-
-            return build.ToString();
-        }
-    }
-}

Management/Analytics/AnalyticsReportGenerator.cs

@@ -1,322 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.IO;
-using System.Linq;
-using System.Management;
-using System.Text.RegularExpressions;
-using System.Windows.Forms;
-using Microsoft.Win32;
-using TweetDuck.Browser;
-using TweetDuck.Configuration;
-using TweetDuck.Utils;
-using TweetLib.Core;
-using TweetLib.Core.Features.Notifications;
-using TweetLib.Core.Features.Plugins;
-using TweetLib.Core.Features.Plugins.Enums;
-using TweetLib.Core.Utils;
-
-namespace TweetDuck.Management.Analytics{
-    static class AnalyticsReportGenerator{
-        public static AnalyticsReport Create(AnalyticsFile file, ExternalInfo info, PluginManager plugins){
-            Dictionary<string, string> editLayoutDesign = EditLayoutDesignPluginData;
-
-            return new AnalyticsReport{
-                { "App Version"   , Program.VersionTag },
-                { "App Type"      , Program.IsPortable ? "portable" : "installed" },
-                { "App Dev Tools" , Bool(BrowserUtils.HasDevTools) },
-                0,
-                { "System Name"        , SystemName },
-                { "System Edition"     , SystemEdition },
-                { "System Environment" , Environment.Is64BitOperatingSystem ? "64-bit" : "32-bit" },
-                { "System Build"       , SystemBuild },
-                { "System Locale"      , Lib.Culture.Name.ToLower() },
-                0,
-                { "RAM" , Exact(RamSize) },
-                { "GPU" , GpuVendor },
-                0,
-                { "Screen Count"      , Exact(Screen.AllScreens.Length) },
-                { "Screen Resolution" , info.Resolution ?? "(unknown)" },
-                { "Screen DPI"        , info.DPI != null ? Exact(info.DPI.Value) : "(unknown)" },
-                0,
-                { "Hardware Acceleration"     , Bool(SysConfig.HardwareAcceleration) },
-                { "Clear Cache Automatically" , Bool(SysConfig.ClearCacheAutomatically) },
-                { "Clear Cache Threshold"     , Exact(SysConfig.ClearCacheThreshold) },
-                0,
-                { "Expand Links"                  , Bool(UserConfig.ExpandLinksOnHover) },
-                { "Search In First Column"        , Bool(UserConfig.OpenSearchInFirstColumn) },
-                { "Keep Like Follow Dialogs Open" , Bool(UserConfig.KeepLikeFollowDialogsOpen) },
-                { "Best Image Quality"            , Bool(UserConfig.BestImageQuality) },
-                { "Animated Images"               , Bool(UserConfig.EnableAnimatedImages) },
-                0,
-                { "Smooth Scrolling" , Bool(UserConfig.EnableSmoothScrolling) },
-                { "Custom Browser"   , CustomBrowser },
-                { "Zoom"             , Exact(UserConfig.ZoomLevel) },
-                0,
-                { "Spell Check"                 , Bool(UserConfig.EnableSpellCheck) },
-                { "Spell Check Language"        , UserConfig.SpellCheckLanguage.ToLower() },
-                { "Translation Target Language" , UserConfig.TranslationTarget },
-                0,
-                { "Updates"          , Bool(UserConfig.EnableUpdateCheck) },
-                { "Update Dismissed" , Bool(!string.IsNullOrEmpty(UserConfig.DismissedUpdate)) },
-                0,
-                { "Tray"           , TrayMode },
-                { "Tray Highlight" , Bool(UserConfig.EnableTrayHighlight) },
-                0,
-                { "Notification Position"            , NotificationPosition },
-                { "Notification Size"                , NotificationSize },
-                { "Notification Timer"               , NotificationTimer },
-                { "Notification Timer Speed"         , RoundUp(UserConfig.NotificationDurationValue, 5) },
-                { "Notification Scroll Speed"        , Exact(UserConfig.NotificationScrollSpeed) },
-                { "Notification Column Title"        , Bool(UserConfig.DisplayNotificationColumn) },
-                { "Notification Media Previews"      , Bool(UserConfig.NotificationMediaPreviews) },
-                { "Notification Link Skip"           , Bool(UserConfig.NotificationSkipOnLinkClick) },
-                { "Notification Non-Intrusive"       , Bool(UserConfig.NotificationNonIntrusiveMode) },
-                { "Notification Idle Pause"          , Exact(UserConfig.NotificationIdlePauseSeconds) },
-                { "Custom Sound Notification"        , string.IsNullOrEmpty(UserConfig.NotificationSoundPath) ? "off" : Path.GetExtension(UserConfig.NotificationSoundPath) },
-                { "Custom Sound Notification Volume" , RoundUp(UserConfig.NotificationSoundVolume, 5) },
-                0,
-                { "Program Arguments"       , List(ProgramArguments) },
-                { "Custom CEF Arguments"    , RoundUp((UserConfig.CustomCefArgs ?? string.Empty).Length, 10) },
-                { "Custom Browser CSS"      , RoundUp((UserConfig.CustomBrowserCSS ?? string.Empty).Length, 50) },
-                { "Custom Notification CSS" , RoundUp((UserConfig.CustomNotificationCSS ?? string.Empty).Length, 50) },
-                0,
-                { "Plugins All"     , List(plugins.Plugins.Select(Plugin)) },
-                { "Plugins Enabled" , List(plugins.Plugins.Where(plugins.Config.IsEnabled).Select(Plugin)) },
-                0,
-                { "Theme"               , Dict(editLayoutDesign, "_theme",                  "light/def") },
-                { "Column Width"        , Dict(editLayoutDesign, "columnWidth",             "310px/def") },
-                { "Font Size"           , Dict(editLayoutDesign, "fontSize",                "12px/def") },
-                { "Large Quote Font"    , Dict(editLayoutDesign, "increaseQuoteTextSize",   "false/def") },
-                { "Small Compose Font"  , Dict(editLayoutDesign, "smallComposeTextSize",    "false/def") },
-                { "Avatar Radius"       , Dict(editLayoutDesign, "avatarRadius",            "2/def") },
-                { "Hide Tweet Actions"  , Dict(editLayoutDesign, "hideTweetActions",        "true/def") },
-                { "Move Tweet Actions"  , Dict(editLayoutDesign, "moveTweetActionsToRight", "true/def") },
-                { "Theme Color Tweaks"  , Dict(editLayoutDesign, "themeColorTweaks",        "true/def") },
-                { "Revert Icons"        , Dict(editLayoutDesign, "revertIcons",             "true/def") },
-                { "Optimize Animations" , Dict(editLayoutDesign, "optimizeAnimations",      "true/def") },
-                { "Reply Account Mode"  , ReplyAccountConfigFromPlugin },
-                { "Template Count"      , Exact(TemplateCountFromPlugin) },
-                0,
-                { "Opened Options"                   , LogRound(file.OpenOptions, 4) },
-                { "Opened Plugins"                   , LogRound(file.OpenPlugins, 4) },
-                { "Opened About"                     , LogRound(file.OpenAbout, 4) },
-                { "Opened Guide"                     , LogRound(file.OpenGuide, 4) },
-                { "Desktop Notifications"            , LogRound(file.DesktopNotifications, 5) },
-                { "Sound Notifications"              , LogRound(file.SoundNotifications, 5) },
-                { "Notification Mutes"               , LogRound(file.NotificationMutes, 2) },
-                { "Browser Context Menus"            , LogRound(file.BrowserContextMenus, 2) },
-                { "Browser Extra Mouse Buttons"      , LogRound(file.BrowserExtraMouseButtons, 2) },
-                { "Notification Context Menus"       , LogRound(file.NotificationContextMenus, 2) },
-                { "Notification Extra Mouse Buttons" , LogRound(file.NotificationExtraMouseButtons, 2) },
-                { "Notification Keyboard Shortcuts"  , LogRound(file.NotificationKeyboardShortcuts, 2) },
-                { "Browser Reloads"                  , LogRound(file.BrowserReloads, 2) },
-                { "Copied Usernames"                 , LogRound(file.CopiedUsernames, 2) },
-                { "Viewed Images"                    , LogRound(file.ViewedImages, 2) },
-                { "Downloaded Images"                , LogRound(file.DownloadedImages, 2) },
-                { "Downloaded Videos"                , LogRound(file.DownloadedVideos, 2) },
-                { "Used ROT13"                       , LogRound(file.UsedROT13, 2) },
-                { "Tweet Screenshots"                , LogRound(file.TweetScreenshots, 2) },
-                { "Tweet Details"                    , LogRound(file.TweetDetails, 2) },
-                { "Video Plays"                      , LogRound(file.VideoPlays, 4) }
-            }.FinalizeReport();
-        }
-
-        private static UserConfig UserConfig => Program.Config.User;
-        private static SystemConfig SysConfig => Program.Config.System;
-
-        private static string Bool(bool value) => value ? "on" : "off";
-        private static string Exact(int value) => value.ToString();
-        private static string RoundUp(int value, int multiple) => (multiple * (int)Math.Ceiling((double)value / multiple)).ToString();
-        private static string LogRound(int value, int logBase) => (value <= 0 ? 0 : (int)Math.Pow(logBase, Math.Floor(Math.Log(value, logBase)))).ToString();
-        private static string Plugin(Plugin plugin) => plugin.Group.GetIdentifierPrefixShort() + plugin.Identifier.Substring(plugin.Group.GetIdentifierPrefix().Length);
-        private static string Dict(Dictionary<string, string> dict, string key, string def = "(unknown)") => dict.TryGetValue(key, out string value) ? value : def;
-        private static string List(IEnumerable<string> list) => string.Join("|", list.DefaultIfEmpty("(none)"));
-
-        private static string SystemName { get; }
-        private static string SystemEdition { get; }
-        private static string SystemBuild { get; }
-        private static int RamSize { get; }
-        private static string GpuVendor { get; }
-        private static string[] ProgramArguments { get; }
-
-        static AnalyticsReportGenerator(){
-            string osName, osEdition, osBuild;
-
-            try{
-                using RegistryKey key = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\Windows NT\CurrentVersion", false);
-
-                // ReSharper disable once PossibleNullReferenceException
-                osName = key.GetValue("ProductName") as string;
-                osBuild = key.GetValue("CurrentBuild") as string;
-                osEdition = null;
-                    
-                if (osName != null){
-                    Match match = Regex.Match(osName, @"^(.*?\d+(?:\.\d+)?) (.*)$");
-
-                    if (match.Success){
-                        osName = match.Groups[1].Value;
-                        osEdition = match.Groups[2].Value;
-                    }
-                }
-            }catch{
-                osName = osEdition = osBuild = null;
-            }
-
-            SystemName = osName ?? "Windows (unknown)";
-            SystemEdition = osEdition ?? "(unknown)";
-            SystemBuild = osBuild ?? "(unknown)";
-
-            try{
-                using ManagementObjectSearcher searcher = new ManagementObjectSearcher("SELECT Capacity FROM Win32_PhysicalMemory");
-
-                foreach(ManagementBaseObject obj in searcher.Get()){
-                    RamSize += (int)((ulong)obj["Capacity"] / (1024L * 1024L));
-                }
-            }catch{
-                RamSize = 0;
-            }
-
-            string gpu = null;
-
-            try{
-                using ManagementObjectSearcher searcher = new ManagementObjectSearcher("SELECT Caption FROM Win32_VideoController");
-
-                foreach(ManagementBaseObject obj in searcher.Get()){
-                    string vendor = obj["Caption"] as string;
-
-                    if (!string.IsNullOrEmpty(vendor)){
-                        gpu = vendor;
-                    }
-                }
-            }catch{
-                // rip
-            }
-
-            GpuVendor = gpu ?? "(unknown)";
-
-            Dictionary<string, string> args = new Dictionary<string, string>();
-            Arguments.GetCurrentClean().ToDictionary(args);
-            ProgramArguments = args.Keys.Select(key => key.TrimStart('-')).ToArray();
-        }
-
-        private static string CustomBrowser{
-            get{
-                return Path.GetFileName(UserConfig.BrowserPath) ?? string.Empty;
-            }
-        }
-
-        private static string TrayMode{
-            get => UserConfig.TrayBehavior switch{
-                TrayIcon.Behavior.DisplayOnly    => "icon",
-                TrayIcon.Behavior.MinimizeToTray => "minimize",
-                TrayIcon.Behavior.CloseToTray    => "close",
-                TrayIcon.Behavior.Combined       => "combined",
-                _                                => "off"
-            };
-        }
-
-        private static string NotificationPosition{
-            get => UserConfig.NotificationPosition switch{
-                DesktopNotification.Position.TopLeft     => "top left",
-                DesktopNotification.Position.TopRight    => "top right",
-                DesktopNotification.Position.BottomLeft  => "bottom left",
-                DesktopNotification.Position.BottomRight => "bottom right",
-                _                                        => "custom"
-            };
-        }
-
-        private static string NotificationSize{
-            get => UserConfig.NotificationSize switch{
-                DesktopNotification.Size.Auto => "auto",
-                _ => RoundUp(UserConfig.CustomNotificationSize.Width, 20) + "x" + RoundUp(UserConfig.CustomNotificationSize.Height, 20)
-            };
-        }
-
-        private static string NotificationTimer{
-            get{
-                if (!UserConfig.DisplayNotificationTimer){
-                    return "off";
-                }
-                else{
-                    return UserConfig.NotificationTimerCountDown ? "count down" : "count up";
-                }
-            }
-        }
-
-        private static Dictionary<string, string> EditLayoutDesignPluginData{
-            get{
-                Dictionary<string, string> dict = new Dictionary<string, string>();
-                
-                try{
-                    string data = File.ReadAllText(Path.Combine(Program.PluginDataPath, "official", "edit-design", "config.json"));
-
-                    foreach(Match match in Regex.Matches(data, "\"(\\w+?)\":(.*?)[,}]")){
-                        dict[match.Groups[1].Value] = match.Groups[2].Value.Trim('"');
-                    }
-                }catch{
-                    // rip
-                }
-
-                return dict;
-            }
-        }
-
-        private static int TemplateCountFromPlugin{
-            get{
-                try{
-                    string data = File.ReadAllText(Path.Combine(Program.PluginDataPath, "official", "templates", "config.json"));
-                    return Math.Min(StringUtils.CountOccurrences(data, "{\"name\":"), StringUtils.CountOccurrences(data, ",\"contents\":"));
-                }catch{
-                    return 0;
-                }
-            }
-        }
-
-        private static string ReplyAccountConfigFromPlugin{
-            get{
-                try{
-                    string data = File.ReadAllText(Path.Combine(Program.PluginDataPath, "official", "reply-account", "configuration.js")).Replace(" ", "");
-
-                    Match matchType = Regex.Match(data, "defaultAccount:\"([#@])(.*?)\"(?:,|$)");
-                    Match matchAdvanced = Regex.Match(data, "useAdvancedSelector:(.*?)(?:,|$)", RegexOptions.Multiline);
-
-                    if (!matchType.Success){
-                        return data.Contains("defaultAccount:\"\"") ? "(legacy)" : "(unknown)";
-                    }
-
-                    string accType = matchType.Groups[1].Value == "#" ? matchType.Groups[2].Value : "account";
-                    return matchAdvanced.Success && !matchAdvanced.Value.Contains("false") ? "advanced/" + accType : accType;
-                }catch{
-                    return "(unknown)";
-                }
-            }
-        }
-
-        public class ExternalInfo{
-            public static ExternalInfo From(Form form){
-                if (form == null){
-                    return new ExternalInfo();
-                }
-                else{
-                    Screen screen = Screen.FromControl(form); // works on multi-monitor setups even in tray
-                    int dpi;
-
-                    using(Graphics graphics = form.CreateGraphics()){
-                        dpi = (int)graphics.DpiY;
-                    }
-
-                    return new ExternalInfo{
-                        Resolution = screen.Bounds.Width + "x" + screen.Bounds.Height,
-                        DPI = dpi
-                    };
-                }
-            }
-
-            public string Resolution { get; private set; }
-            public int? DPI { get; private set; }
-
-            private ExternalInfo(){}
-        }
-    }
-}

Management/BrowserCache.cs

@@ -3,13 +3,14 @@ using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using TweetLib.Core;
 
 namespace TweetDuck.Management {
 	static class BrowserCache {
-        public static string CacheFolder => Path.Combine(Program.StoragePath, "Cache");
+		public static string CacheFolder => Path.Combine(App.StoragePath, "Cache");
 
-        private static bool ClearOnExit;
-        private static Timer AutoClearTimer;
+		private static bool clearOnExit;
+		private static Timer autoClearTimer;
 
 		private static long CalculateCacheSize() {
 			return new DirectoryInfo(CacheFolder).EnumerateFiles().Select(file => {
@@ -22,21 +23,21 @@ namespace TweetDuck.Management{
 		}
 
 		public static void GetCacheSize(Action<Task<long>> callbackBytes) {
-            Task<long> task = new Task<long>(CalculateCacheSize);
+			var task = new Task<long>(CalculateCacheSize);
 			task.ContinueWith(callbackBytes);
 			task.Start();
 		}
 
 		public static void RefreshTimer() {
-            bool shouldRun = Program.Config.System.ClearCacheAutomatically && !ClearOnExit;
+			bool shouldRun = Program.Config.System.ClearCacheAutomatically && !clearOnExit;
 
-            if (!shouldRun && AutoClearTimer != null){
-                AutoClearTimer.Dispose();
-                AutoClearTimer = null;
+			if (!shouldRun && autoClearTimer != null) {
+				autoClearTimer.Dispose();
+				autoClearTimer = null;
 			}
-            else if (shouldRun && AutoClearTimer == null){
-                AutoClearTimer = new Timer(state => {
-                    if (AutoClearTimer != null){
+			else if (shouldRun && autoClearTimer == null) {
+				autoClearTimer = new Timer(state => {
+					if (autoClearTimer != null) {
 						try {
 							if (CalculateCacheSize() >= Program.Config.System.ClearCacheThreshold * 1024L * 1024L) {
 								SetClearOnExit();
@@ -50,7 +51,7 @@ namespace TweetDuck.Management{
 		}
 
 		public static void SetClearOnExit() {
-            ClearOnExit = true;
+			clearOnExit = true;
 			RefreshTimer();
 		}
 
@@ -63,12 +64,12 @@ namespace TweetDuck.Management{
 		}
 
 		public static void Exit() {
-            if (AutoClearTimer != null){
-                AutoClearTimer.Dispose();
-                AutoClearTimer = null;
+			if (autoClearTimer != null) {
+				autoClearTimer.Dispose();
+				autoClearTimer = null;
 			}
 
-            if (ClearOnExit){
+			if (clearOnExit) {
 				TryClearNow();
 			}
 		}

Management/ClipboardManager.cs

@@ -3,6 +3,7 @@ using System.Drawing;
 using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
+using TweetLib.Core;
 
 namespace TweetDuck.Management {
 	static class ClipboardManager {
@@ -29,7 +30,7 @@ namespace TweetDuck.Management{
 			try {
 				Clipboard.SetDataObject(obj);
 			} catch (ExternalException e) {
-                Program.Reporter.HandleException("Clipboard Error", "TweetDuck could not access the clipboard as it is currently used by another process.", true, e);
+				App.ErrorHandler.HandleException("Clipboard Error", "TweetDuck could not access the clipboard as it is currently used by another process.", true, e);
 			}
 		}
 

Management/FormManager.cs

@@ -1,10 +1,33 @@
-using System.Linq;
+using System;
+using System.Linq;
 using System.Windows.Forms;
+using TweetDuck.Browser;
+using TweetDuck.Controls;
 
 namespace TweetDuck.Management {
 	static class FormManager {
 		private static FormCollection OpenForms => System.Windows.Forms.Application.OpenForms;
 
+		public static void RunOnUIThread(Action action) {
+			var form = TryFind<FormBrowser>();
+			if (form == null) {
+				action();
+			}
+			else {
+				form.InvokeSafe(action);
+			}
+		}
+
+		public static void RunOnUIThreadAsync(Action action) {
+			var form = TryFind<FormBrowser>();
+			if (form == null) {
+				action();
+			}
+			else {
+				form.InvokeAsyncSafe(action);
+			}
+		}
+
 		public static T TryFind<T>() where T : Form {
 			return OpenForms.OfType<T>().FirstOrDefault();
 		}

Management/LockManager.cs

@@ -3,6 +3,7 @@ using System.ComponentModel;
 using System.Diagnostics;
 using TweetDuck.Dialogs;
 using TweetDuck.Utils;
+using TweetLib.Core;
 using TweetLib.Core.Systems.Startup;
 
 namespace TweetDuck.Management {
@@ -12,6 +13,8 @@ namespace TweetDuck.Management{
 		private const int CloseNaturallyTimeout = 10000;
 		private const int CloseKillTimeout = 5000;
 
+		public uint WindowRestoreMessage { get; } = NativeMethods.RegisterWindowMessage("TweetDuckRestore");
+
 		private readonly LockFile lockFile;
 
 		public LockManager(string path) {
@@ -32,7 +35,7 @@ namespace TweetDuck.Management{
 			LockResult lockResult = lockFile.Lock();
 
 			if (lockResult is LockResult.HasProcess info) {
-                if (!RestoreProcess(info.Process) && FormMessage.Error("TweetDuck is Already Running", "Another instance of TweetDuck is already running.\nDo you want to close it?", FormMessage.Yes, FormMessage.No)){
+				if (!RestoreProcess(info.Process, WindowRestoreMessage) && FormMessage.Error("TweetDuck is Already Running", "Another instance of TweetDuck is already running.\nDo you want to close it?", FormMessage.Yes, FormMessage.No)) {
 					if (!CloseProcess(info.Process)) {
 						FormMessage.Error("TweetDuck Has Failed :(", "Could not close the other process.", FormMessage.OK);
 						return false;
@@ -79,12 +82,12 @@ namespace TweetDuck.Management{
 		// Helpers
 
 		private static void ShowGenericException(LockResult.Fail fail) {
-            Program.Reporter.HandleException("TweetDuck Has Failed :(", "An unknown error occurred accessing the data folder. Please, make sure TweetDuck is not already running. If the problem persists, try restarting your system.", false, fail.Exception);
+			App.ErrorHandler.HandleException("TweetDuck Has Failed :(", "An unknown error occurred accessing the data folder. Please, make sure TweetDuck is not already running. If the problem persists, try restarting your system.", false, fail.Exception);
 		}
 
-        private static bool RestoreProcess(Process process){
+		private static bool RestoreProcess(Process process, uint windowRestoreMessage) {
 			if (process.MainWindowHandle == IntPtr.Zero) { // restore if the original process is in tray
-                NativeMethods.BroadcastMessage(Program.WindowRestoreMessage, (uint)process.Id, 0);
+				NativeMethods.BroadcastMessage(windowRestoreMessage, (uint) process.Id, 0);
 
 				if (WindowsUtils.TrySleepUntil(() => CheckProcessExited(process) || (process.MainWindowHandle != IntPtr.Zero && process.Responding), RestoreFailTimeout, WaitRetryDelay)) {
 					return true;

Management/ProfileManager.cs

@@ -3,14 +3,20 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using TweetDuck.Dialogs;
-using TweetLib.Core.Data;
+using TweetLib.Core;
 using TweetLib.Core.Features.Plugins;
 using TweetLib.Core.Features.Plugins.Enums;
+using TweetLib.Utils.IO;
 
 namespace TweetDuck.Management {
 	sealed class ProfileManager {
-        private static readonly string CookiesPath = Path.Combine(Program.StoragePath, "Cookies");
-        private static readonly string TempCookiesPath = Path.Combine(Program.StoragePath, "CookiesTmp");
+		private static readonly string CookiesPath = Path.Combine(App.StoragePath, "Cookies");
+		private static readonly string LocalPrefsPath = Path.Combine(App.StoragePath, "LocalPrefs.json");
+
+		private static readonly string TempCookiesPath = Path.Combine(App.StoragePath, "CookiesTmp");
+		private static readonly string TempLocalPrefsPath = Path.Combine(App.StoragePath, "LocalPrefsTmp.json");
+
+		private const int SessionFileCount = 2;
 
 		[Flags]
 		public enum Items {
@@ -18,8 +24,7 @@ namespace TweetDuck.Management{
 			UserConfig = 1,
 			SystemConfig = 2,
 			Session = 4,
-            PluginData = 8,
-            All = UserConfig|SystemConfig|Session|PluginData
+			PluginData = 8
 		}
 
 		private readonly string file;
@@ -32,17 +37,18 @@ namespace TweetDuck.Management{
 
 		public bool Export(Items items) {
 			try {
-                using(CombinedFileStream stream = new CombinedFileStream(new FileStream(file, FileMode.Create, FileAccess.Write, FileShare.None))){
+				using CombinedFileStream stream = new CombinedFileStream(new FileStream(file, FileMode.Create, FileAccess.Write, FileShare.None));
+
 				if (items.HasFlag(Items.UserConfig)) {
-                        stream.WriteFile("config", Program.UserConfigFilePath);
+					stream.WriteFile("config", App.ConfigManager.UserPath);
 				}
 
 				if (items.HasFlag(Items.SystemConfig)) {
-                        stream.WriteFile("system", Program.SystemConfigFilePath);
+					stream.WriteFile("system", App.ConfigManager.SystemPath);
 				}
 
 				if (items.HasFlag(Items.PluginData)) {
-                        stream.WriteFile("plugin.config", Program.PluginConfigFilePath);
+					stream.WriteFile("plugin.config", App.ConfigManager.PluginsPath);
 
 					foreach (Plugin plugin in plugins.Plugins) {
 						foreach (PathInfo path in EnumerateFilesRelative(plugin.GetPluginFolder(PluginFolder.Data))) {
@@ -57,14 +63,13 @@ namespace TweetDuck.Management{
 
 				if (items.HasFlag(Items.Session)) {
 					stream.WriteFile("cookies", CookiesPath);
+					stream.WriteFile("localprefs", LocalPrefsPath);
 				}
 
 				stream.Flush();
-                }
-
 				return true;
 			} catch (Exception e) {
-                Program.Reporter.HandleException("Profile Export Error", "An exception happened while exporting TweetDuck profile.", true, e);
+				App.ErrorHandler.HandleException("Profile Export Error", "An exception happened while exporting TweetDuck profile.", true, e);
 				return false;
 			}
 		}
@@ -92,6 +97,7 @@ namespace TweetDuck.Management{
 							break;
 
 						case "cookies":
+						case "localprefs":
 							items |= Items.Session;
 							break;
 					}
@@ -105,7 +111,8 @@ namespace TweetDuck.Management{
 
 		public bool Import(Items items) {
 			try {
-                HashSet<string> missingPlugins = new HashSet<string>();
+				var missingPlugins = new HashSet<string>();
+				var sessionFiles = new HashSet<string>();
 
 				using (CombinedFileStream stream = new CombinedFileStream(new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.None))) {
 					CombinedFileStream.Entry entry;
@@ -114,21 +121,21 @@ namespace TweetDuck.Management{
 						switch (entry.KeyName) {
 							case "config":
 								if (items.HasFlag(Items.UserConfig)) {
-                                    entry.WriteToFile(Program.UserConfigFilePath);
+									entry.WriteToFile(App.ConfigManager.UserPath);
 								}
 
 								break;
 
 							case "system":
 								if (items.HasFlag(Items.SystemConfig)) {
-                                    entry.WriteToFile(Program.SystemConfigFilePath);
+									entry.WriteToFile(App.ConfigManager.SystemPath);
 								}
 
 								break;
 
 							case "plugin.config":
 								if (items.HasFlag(Items.PluginData)) {
-                                    entry.WriteToFile(Program.PluginConfigFilePath);
+									entry.WriteToFile(App.ConfigManager.PluginsPath);
 								}
 
 								break;
@@ -137,7 +144,7 @@ namespace TweetDuck.Management{
 								if (items.HasFlag(Items.PluginData)) {
 									string[] value = entry.KeyValue;
 
-                                    entry.WriteToFile(Path.Combine(Program.PluginDataPath, value[0], value[1]), true);
+									entry.WriteToFile(Path.Combine(plugins.PluginDataFolder, value[0], value[1]), true);
 
 									if (!plugins.Plugins.Any(plugin => plugin.Identifier.Equals(value[0]))) {
 										missingPlugins.Add(value[0]);
@@ -148,7 +155,16 @@ namespace TweetDuck.Management{
 
 							case "cookies":
 								if (items.HasFlag(Items.Session)) {
-                                    entry.WriteToFile(Path.Combine(Program.StoragePath, TempCookiesPath));
+									entry.WriteToFile(TempCookiesPath);
+									sessionFiles.Add(entry.KeyName);
+								}
+
+								break;
+
+							case "localprefs":
+								if (items.HasFlag(Items.Session)) {
+									entry.WriteToFile(TempLocalPrefsPath);
+									sessionFiles.Add(entry.KeyName);
 								}
 
 								break;
@@ -156,27 +172,39 @@ namespace TweetDuck.Management{
 					}
 				}
 
+				if (items.HasFlag(Items.Session) && sessionFiles.Count != SessionFileCount) {
+					FormMessage.Error("Profile Import Error", "Cannot import login session from an older version of TweetDuck.", FormMessage.OK);
+					File.Delete(TempCookiesPath);
+					File.Delete(TempLocalPrefsPath);
+					return false;
+				}
+
 				if (missingPlugins.Count > 0) {
 					FormMessage.Information("Profile Import", "Detected missing plugins when importing plugin data:\n" + string.Join("\n", missingPlugins), FormMessage.OK);
 				}
 
 				return true;
 			} catch (Exception e) {
-                Program.Reporter.HandleException("Profile Import", "An exception happened while importing TweetDuck profile.", true, e);
+				App.ErrorHandler.HandleException("Profile Import", "An exception happened while importing TweetDuck profile.", true, e);
 				return false;
 			}
 		}
 
 		public static void ImportCookies() {
-            if (File.Exists(TempCookiesPath)){
+			if (File.Exists(TempCookiesPath) && File.Exists(TempLocalPrefsPath)) {
 				try {
 					if (File.Exists(CookiesPath)) {
 						File.Delete(CookiesPath);
 					}
 
+					if (File.Exists(LocalPrefsPath)) {
+						File.Delete(LocalPrefsPath);
+					}
+
 					File.Move(TempCookiesPath, CookiesPath);
+					File.Move(TempLocalPrefsPath, LocalPrefsPath);
 				} catch (Exception e) {
-                    Program.Reporter.HandleException("Profile Import Error", "Could not import the cookie file to restore login session.", true, e);
+					App.ErrorHandler.HandleException("Profile Import Error", "Could not import the cookie file to restore login session.", true, e);
 				}
 			}
 		}
@@ -187,7 +215,7 @@ namespace TweetDuck.Management{
 					File.Delete(CookiesPath);
 				}
 			} catch (Exception e) {
-                Program.Reporter.HandleException("Session Reset Error", "Could not remove the cookie file to reset the login session.", true, e);
+				App.ErrorHandler.HandleException("Session Reset Error", "Could not remove the cookie file to reset the login session.", true, e);
 			}
 		}
 

Management/VideoPlayer.cs

@@ -6,14 +6,15 @@ using TweetDuck.Browser;
 using TweetDuck.Configuration;
 using TweetDuck.Controls;
 using TweetDuck.Dialogs;
-using TweetDuck.Utils;
-using TweetLib.Communication;
+using TweetLib.Communication.Pipe;
+using TweetLib.Core;
+using TweetLib.Core.Systems.Configuration;
 
 namespace TweetDuck.Management {
 	sealed class VideoPlayer : IDisposable {
 		private static UserConfig Config => Program.Config.User;
 
-        public bool Running => currentInstance != null && currentInstance.Running;
+		public bool Running => currentInstance is { Running: true };
 
 		public event EventHandler ProcessExited;
 
@@ -37,14 +38,15 @@ namespace TweetDuck.Management{
 				DuplexPipe.Server pipe = DuplexPipe.CreateServer();
 				pipe.DataIn += pipe_DataIn;
 
-                Process process;
-
-                if ((process = Process.Start(new ProcessStartInfo{
-                    FileName = Path.Combine(Program.ProgramPath, "TweetDuck.Video.exe"),
+				ProcessStartInfo startInfo = new ProcessStartInfo {
+					FileName = Path.Combine(App.ProgramPath, "TweetDuck.Video.exe"),
 					Arguments = $"{owner.Handle} {(int) Math.Floor(100F * owner.GetDPIScale())} {Config.VideoPlayerVolume} \"{videoUrl}\" \"{pipe.GenerateToken()}\"",
 					UseShellExecute = false,
 					RedirectStandardOutput = true
-                })) != null){
+				};
+
+				Process process;
+				if ((process = Process.Start(startInfo)) != null) {
 					currentInstance = new Instance(process, pipe, videoUrl, tweetUrl, username);
 
 					process.EnableRaisingEvents = true;
@@ -60,7 +62,7 @@ namespace TweetDuck.Management{
 					pipe.Dispose();
 				}
 			} catch (Exception e) {
-                Program.Reporter.HandleException("Video Playback Error", "Error launching video player.", true, e);
+				App.ErrorHandler.HandleException("Video Playback Error", "Error launching video player.", true, e);
 			}
 		}
 
@@ -81,8 +83,7 @@ namespace TweetDuck.Management{
 
 					case "download":
 						if (currentInstance != null) {
-                            owner.AnalyticsFile.DownloadedVideos.Trigger();
-                            TwitterUtils.DownloadVideo(currentInstance.VideoUrl, currentInstance.Username);
+							owner.SaveVideo(currentInstance.VideoUrl, currentInstance.Username);
 						}
 
 						break;
@@ -136,7 +137,7 @@ namespace TweetDuck.Management{
 
 		private void process_OutputDataReceived(object sender, DataReceivedEventArgs e) {
 			if (!string.IsNullOrEmpty(e.Data)) {
-                Program.Reporter.LogVerbose("[VideoPlayer] " + e.Data);
+				App.Logger.Debug("[VideoPlayer] " + e.Data);
 			}
 		}
 
@@ -154,14 +155,14 @@ namespace TweetDuck.Management{
 			switch (exitCode) {
 				case 3: // CODE_LAUNCH_FAIL
 					if (FormMessage.Error("Video Playback Error", "Error launching video player, this may be caused by missing Windows Media Player. Do you want to open the video in your browser?", FormMessage.Yes, FormMessage.No)) {
-                        BrowserUtils.OpenExternalBrowser(tweetUrl);
+						App.SystemHandler.OpenBrowser(tweetUrl);
 					}
 
 					break;
 
 				case 4: // CODE_MEDIA_ERROR
 					if (FormMessage.Error("Video Playback Error", "The video could not be loaded, most likely due to unknown format. Do you want to open the video in your browser?", FormMessage.Yes, FormMessage.No)) {
-                        BrowserUtils.OpenExternalBrowser(tweetUrl);
+						App.SystemHandler.OpenBrowser(tweetUrl);
 					}
 
 					break;

Plugins/PluginControl.cs

@@ -3,8 +3,10 @@ using System.Drawing;
 using System.Windows.Forms;
 using TweetDuck.Controls;
 using TweetDuck.Utils;
+using TweetLib.Core;
 using TweetLib.Core.Features.Plugins;
 using TweetLib.Core.Features.Plugins.Enums;
+using TweetLib.Core.Systems.Configuration;
 
 namespace TweetDuck.Plugins {
 	sealed partial class PluginControl : UserControl {
@@ -80,7 +82,7 @@ namespace TweetDuck.Plugins{
 
 		private void labelWebsite_Click(object sender, EventArgs e) {
 			if (labelWebsite.Text.Length > 0) {
-                BrowserUtils.OpenExternalBrowser(labelWebsite.Text);
+				App.SystemHandler.OpenBrowser(labelWebsite.Text);
 			}
 		}
 
@@ -91,6 +93,7 @@ namespace TweetDuck.Plugins{
 
 		private void btnToggleState_Click(object sender, EventArgs e) {
 			pluginManager.Config.SetEnabled(plugin, !pluginManager.Config.IsEnabled(plugin));
+			pluginManager.Config.Save();
 			UpdatePluginState();
 		}
 

Plugins/PluginDispatcher.cs

@@ -1,37 +0,0 @@
-using System;
-using CefSharp;
-using TweetDuck.Browser.Adapters;
-using TweetDuck.Utils;
-using TweetLib.Core.Browser;
-using TweetLib.Core.Features.Plugins;
-using TweetLib.Core.Features.Plugins.Events;
-using TweetLib.Core.Features.Twitter;
-
-namespace TweetDuck.Plugins{
-    sealed class PluginDispatcher : IPluginDispatcher{
-        public event EventHandler<PluginDispatchEventArgs> Ready;
-
-        private readonly IWebBrowser browser;
-        private readonly IScriptExecutor executor;
-        private readonly Func<string, bool> executeOnUrl;
-
-        public PluginDispatcher(IWebBrowser browser, Func<string, bool> executeOnUrl){
-            this.executeOnUrl = executeOnUrl;
-            this.browser = browser;
-            this.browser.FrameLoadEnd += browser_FrameLoadEnd;
-            this.executor = new CefScriptExecutor(browser);
-        }
-
-        void IPluginDispatcher.AttachBridge(string name, object bridge){
-            browser.RegisterJsBridge(name, bridge);
-        }
-
-        private void browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e){
-            IFrame frame = e.Frame;
-
-            if (frame.IsMain && executeOnUrl(frame.Url)){
-                Ready?.Invoke(this, new PluginDispatchEventArgs(executor));
-            }
-        }
-    }
-}

Plugins/PluginSchemeFactory.cs

@@ -1,47 +0,0 @@
-using System.IO;
-using System.Net;
-using System.Text;
-using CefSharp;
-using TweetLib.Core.Browser;
-using TweetLib.Core.Features.Plugins;
-
-namespace TweetDuck.Plugins{
-    sealed class PluginSchemeFactory : ISchemeHandlerFactory{
-        public const string Name = PluginSchemeHandler<IResourceHandler>.Name;
-
-        private readonly PluginSchemeHandler<IResourceHandler> handler = new PluginSchemeHandler<IResourceHandler>(new ResourceProvider());
-
-        internal void Setup(PluginManager plugins){
-            handler.Setup(plugins);
-        }
-
-        public IResourceHandler Create(IBrowser browser, IFrame frame, string schemeName, IRequest request){
-            return handler.Process(request.Url);
-        }
-
-        private sealed class ResourceProvider : IResourceProvider<IResourceHandler>{
-            private static ResourceHandler CreateHandler(byte[] bytes){
-                var handler = ResourceHandler.FromStream(new MemoryStream(bytes), autoDisposeStream: true);
-                handler.Headers.Set("Access-Control-Allow-Origin", "*");
-                return handler;
-            }
-
-            public IResourceHandler Status(HttpStatusCode code, string message){
-                var handler = CreateHandler(Encoding.UTF8.GetBytes(message));
-                handler.StatusCode = (int)code;
-                return handler;
-            }
-
-            public IResourceHandler File(byte[] bytes, string extension){
-                if (bytes.Length == 0){
-                    return Status(HttpStatusCode.NoContent, "File is empty."); // FromByteArray crashes CEF internals with no contents
-                }
-                else{
-                    var handler = CreateHandler(bytes);
-                    handler.MimeType = Cef.GetMimeType(extension);
-                    return handler;
-                }
-            }
-        }
-    }
-}