diff --git a/Build/Themes/Dark.ini b/Build/Themes/Dark.ini
index d94ea8e34..69f9b10b7 100644
--- a/Build/Themes/Dark.ini
+++ b/Build/Themes/Dark.ini
@@ -1,25 +1,18 @@
 # Lexer Styles "Dark" taken from Axl Cash (https://www.axlcash.com/notepad2-dark-theme-schemes-style-or-whatever-you-call-it)
+
 [Custom Colors]
 01=#252526
 02=#1346CE
-03=#3A6EA5
 04=#52A5F8
 05=#0D8206
-06=#608020
 07=#B5B5B9
-08=#A46000
 09=#54EDBF
 10=#FCA287
 11=#ACFBC0
-12=#FFC000
-13=#FF4000
-14=#C80000
-15=#B000B0
 16=#92FB53
 [Common Base]
-FileNameExtensions=txt; text; tmp; log; asc; doc; wtx
-Default Style=font:Default; size:+0; fore:#FFFFE2; back:#252526
-Margins and Line Numbers=font:Default; size:-1; bold; fore:#009D9D; back:#252526
+Default Style=font:Default; fore:#FFFFE2; back:#252526
+Margins and Line Numbers=font:Default; size:-1; bold; fore:#A4FFFF; back:#444444
 Matching Braces (Indicator)=fore:#009100; back:#252526; alpha:40; alpha2:220; indic_roundbox
 Matching Braces Error (Indicator)=fore:#FF0080; back:#252526; alpha:140; alpha2:220; indic_roundbox
 Control Characters (Font)=size:-1; fore:#FFF1A8; back:#252526
@@ -27,7 +20,7 @@ Indentation Guide (Color)=fore:#A0A0A0; back:#252526
 Selected Text (Colors)=fore:#FFFFE2; back:#409FFF; eolfilled; alpha:80
 Whitespace (Colors, Size 0-12)=fore:#666600; back:#252526
 Current Line Background (Color)=size:2; fore:#4F9D9D; back:#C1C1C1; alpha:50
-Caret (Color, Size 1-3)=size:1; fore:#80FF80
+Caret (Color, Size 1-3)=fore:#80FF80
 Long Line Marker (Colors)=fore:#954A00; back:#181818
 Extra Line Spacing (Size)=back:#252526
 Bookmarks and Folding (Colors, Size)=size:+2; fore:#888888; back:#0095DD; alpha:100
@@ -35,9 +28,8 @@ Mark Occurrences (Indicator)=fore:#00FF80; back:#B0FFB0; alpha:100; alpha2:100;
 Hyperlink Hotspots=bold; italic; fore:#009F9F; back:#0053B7; indic_roundbox
 Inline-IME Color=fore:#00FF00; back:#252526
 [2nd Common Base]
-FileNameExtensions=txt; text; tmp; log; asc; doc; wtx
-2nd Default Style=font:Courier New; size:+0; fore:#FFFFE2; back:#252526
-2nd Margins and Line Numbers=font:Courier New; size:-1; bold; fore:#009D9D; back:#252526
+2nd Default Style=font:Courier New; fore:#FFFFE2; back:#252526
+2nd Margins and Line Numbers=font:Courier New; size:-1; bold; fore:#A4FFFF; back:#444444
 2nd Matching Braces (Indicator)=fore:#009100; back:#252526; alpha:40; alpha2:220; indic_roundbox
 2nd Matching Braces Error (Indicator)=fore:#FF0080; back:#252526; alpha:140; alpha2:220; indic_roundbox
 2nd Control Characters (Font)=size:-1; fore:#FFF1A8; back:#252526
@@ -53,33 +45,15 @@ FileNameExtensions=txt; text; tmp; log; asc; doc; wtx
 2nd Hyperlink Hotspots=bold; italic; fore:#009F9F; back:#0053B7; indic_roundbox
 2nd Inline-IME Color=fore:#00FF00; back:#252526
 [ANSI Art]
-FileNameExtensions=nfo; diz
-Default=font:Lucida Console; size:11; thin; smoothing:none
-Margins and Line Numbers=font:Lucida Console; size:-2
-Matching Braces=size:+0
-Matching Braces Error=size:+0
-Extra Line Spacing (Size)=size:-1
 [Apache Config Files]
-FileNameExtensions=conf; cfg; cnf; htaccess; properties; prefs; iface; prop; po; te
-Default=
 Comment=fore:#75715E
 String=fore:#E6DB74
 Number=fore:#AE81FF
-Directive=fore:#003CE6
-IP Address=bold; fore:#FF4000
 [Assembly Script]
-FileNameExtensions=asm; s; sx; inc; a51
-Default=
 Comment=fore:#75715E
-Identifier=
 String=fore:#E6DB74
 Number=fore:#AE81FF
 Operator=fore:#F92672
-CPU Instruction=fore:#0A246A
-FPU Instruction=fore:#0A246A
-Extended Instruction=fore:#0A246A
-Directive=fore:#0A246A
-Directive Operand=fore:#0A246A
 Register=fore:#75715E
 [AutoHotkey Script]
 FileNameExtensions=
@@ -103,79 +77,14 @@ Special=italic; fore:#0000FF
 Variable Keyword=italic; fore:#CF00CF; back:#F9F9FF
 Error=back:#FFC0C0
 [AutoHotkey_L Script]
-FileNameExtensions=ahkl; ahk; ia; scriptlet
-Default=
-Identifier=
-Comment=fore:#008000
-String=fore:#404040
-Label=fore:#0000DD
-HotKey=fore:#00AADD
-HotString=fore:#00BBBB
-KeyHotstringOption=fore:#990099
-Hex Number=fore:#880088
-Number=fore:#FF9000
-Variable=fore:#FF9000
-Variable Dereferencing=fore:#990055
-Object=fore:#008888
-User-Defined Function=fore:#0000DD
-Directive=italic; fore:#4A0000
-Command=bold; fore:#0000DD
-Parameter=fore:#0085DD
-Flow of Control=fore:#0000DD
-Function=fore:#DD00DD
-Built-In Variables=bold; fore:#EE3010
-Key=fore:#A2A2A2
-Escape=italic; fore:#660000
-Error=back:#FF0000
 [AutoIt3 Script]
-FileNameExtensions=au3
-Default=
-Comment=fore:#008000
-Number=fore:#008080
-Function=fore:#0000FF
-User-Defined Function=fore:#0000FF
-Keyword=fore:#0000FF
-Macro=fore:#0080FF
-String=fore:#008080
-Operator=fore:#C000C0
-Variable=fore:#808000
-Send Key=fore:#FF0000
-Preprocessor=fore:#FF8000
-Special=fore:#FF8000
 [AviSynth Script]
-FileNameExtensions=avs; avsi
-Default=
-Comment=fore:#008000
-Operator=
-String=fore:#7F007F
-Number=fore:#007F7F
-Keyword=bold; fore:#00007F
-Filter=bold; fore:#00007F
-Plugin=bold; fore:#0080C0
-Function=fore:#007F7F
-Clip Property=fore:#00007F
 [Awk Script]
-FileNameExtensions=awk
-Default=
-Keyword=bold; fore:#0000A0
-Keyword 2nd=bold; italic; fore:#6666FF
-Identifier=
-Comment=fore:#808080
-String=fore:#008000
-Number=fore:#C04000
-Operator=fore:#B000B0
 [Batch Files]
-FileNameExtensions=bat; cmd
 Default=back:#000000
 Comment=fore:#75715E
 Keyword=fore:#26B5F9
-Identifier=fore:#003CE6; back:#FFF1A8
-Operator=fore:#B000B0
-Command=bold
-Label=fore:#C80000; back:#F4F4F4; eolfilled
 [C# Source Code]
-FileNameExtensions=cs; csx; vala
-Default=
 Comment=fore:#0D8206
 Keyword=fore:#52A5F8
 Identifier=fore:#FFFFFF
@@ -184,303 +93,108 @@ Verbatim String=fore:#FCA287
 Number=fore:#80FF80
 Operator=fore:#FFFFFF
 Preprocessor=fore:#808080
-Global Class=fore:#2B91AF
 [C/C++ Source Code]
-FileNameExtensions=c; cpp; cxx; cc; h; hpp; hxx; hh; m; mm; idl; midl; inl; odl; xpm
-Default=
 Identifier=fore:#B5B5B9
 Comment=fore:#0D8206
 Keyword=fore:#3A6EA5
-Keyword 2nd=bold; italic; fore:#3C6CDD
-Typedefs/Classes=bold; italic; fore:#800000
 String=fore:#FCA287
 Number=fore:#ACFBC0
 Operator=fore:#808080
 Preprocessor=fore:#808080
 [Cmake Script]
-FileNameExtensions=cmake; ctest
-Default=
-Comment=fore:#008000
-String=fore:#7F007F; back:#EEEEEE
-Function=fore:#00007F
-Parameter=fore:#7F200F
-Variable=fore:#CC3300
-While Def=fore:#00007F
-For Each Def=fore:#00007F
-If Def=fore:#00007F
-Macro Def=fore:#00007F
-Variable within String=fore:#CC3300; back:#EEEEEE
-Number=fore:#008080
 [Coffeescript]
-FileNameExtensions=coffee; Cakefile
-Default=
-Comment=fore:#646464
-String=fore:#008000
-Preprocessor=fore:#FF8000
-Identifier=bold; fore:#0A246A
-Operator=fore:#B000B0
-Number=fore:#FF0000
-Regex=fore:#006633; back:#FFF1A8
-Global Class=
-Word=
-Verbatim=
 [Configuration Files]
-FileNameExtensions=ini; inf; properties; oem; sif; url; sed; theme; clw
 Default=back:#000000
 Comment=fore:#0D8206
 Section=fore:#3A6EA5
 Assignment=fore:#A6E22E
-Default Value=fore:#FF0000
 [CSS Style Sheets]
-FileNameExtensions=css; less; hss; sass; scss
 Default=fore:#FFFFFF; back:#000000
 Comment=fore:#008000
 HTML Tag=bold; fore:#B28B40
 Tag-Class=bold; fore:#B28B40
 Tag-ID=bold; fore:#B28B40
 Tag-Attribute=fore:#B28B40
-Pseudo-Class=fore:#B000B0
-Pseudo-Element=fore:#B00050
 CSS Property=fore:#35BDFF
 String=fore:#FF8080
 Value=fore:#FFFFFF
 Operator=fore:#DFE1B1
 Important=bold; fore:#DFE1B1
 Directive=bold
-Media=bold; fore:#0A246A
-Variable=bold; fore:#FF4000
 Unknown Pseudo-Class=fore:#FF0000
 Unknown Property=fore:#FF0000
 [D Source Code]
-FileNameExtensions=d; dd; di
-Default=
-Comment=fore:#008000
-Comment Doc=fore:#0040A0
-Number=fore:#FF0000
-Keyword=bold; fore:#0A246A
-Keyword 2nd=bold; fore:#0A246A
-Typedef=italic; fore:#0A246A
-String=italic; fore:#3C6CDD
-Operator=fore:#B000B0
-Identifier=
 [Diff Files]
-FileNameExtensions=diff; patch
-Default=
 Comment=fore:#75715E
-Command=bold; fore:#0A246A
 Source and Destination=bold; italic; fore:#4C4745
-Position Setting=fore:#0000FF
 Line Addition=back:#13354A; eolfilled
 Line Removal=fore:#960050; back:#1E0010; eolfilled
 Line Change=fore:#89807D; back:#4C4745; eolfilled
 [Go Source Code]
-FileNameExtensions=go
-Default=
-Comment=fore:#008000
-Number=fore:#FF0000
-Keyword=bold; fore:#0A246A
-Keyword 2nd=bold; fore:#0A246A
-Typedef=italic; fore:#0A246A
-String=italic; fore:#3C6CDD
-Operator=fore:#B000B0
-Identifier=
 [Inno Setup Script]
-FileNameExtensions=iss; isl; islu
-Default=
-Comment=fore:#008000
-Keyword=fore:#0000FF
-Parameter=fore:#0000FF
-Section=bold; fore:#000080
-Preprocessor=fore:#CC0000
-Inline Expansion=fore:#800080
-Pascal Comment=fore:#008000
-Pascal Keyword=fore:#0000FF
-String=
 [Java Source Code]
-FileNameExtensions=java; jad; aidl; bsh
-Default=
 Comment=fore:#008000
 Keyword=fore:#F92672
-Identifier=
 String=fore:#E6DB74
 Regex=fore:#E6DB74
 Number=fore:#AE81FF
 Operator=fore:#F92672
 [JavaScript]
-FileNameExtensions=js; jse; jsm; as
-Default=
 Comment=fore:#008000
 Keyword=fore:#0080C0
-Identifier=
 String=fore:#FF8080
 Regex=fore:#804000
 Number=fore:#FFFFFF
 Operator=fore:#FFFFFF
 [JSON]
-FileNameExtensions=json; eslintrc; jshintrc; jsonld
-Default=
-Comment=fore:#646464
 Keyword=bold; fore:#A46000
 Identifier=
-String=fore:#008000
 Regex=fore:#006633; back:#FFF1A8
-Number=fore:#FF0000
-Operator=fore:#B000B0
 [LaTeX Files]
-FileNameExtensions=tex; latex; sty
-Default=
-Command=fore:#0000FF
-Comment=fore:#008000
-Math=fore:#FF0000
-Special Char=fore:#AAAA00
-Tag=fore:#0000FF
-Verbatim Segment=fore:#666666
 [Lua Script]
-FileNameExtensions=lua
-Default=
-Comment=fore:#008000
-Number=fore:#008080
-Keyword=fore:#00007F
-Basic Functions=fore:#00007F
-String, Table & Math Functions=fore:#00007F
-Input, Output & System Facilities=fore:#00007F
-String=fore:#B000B0
-Literal String=fore:#B000B0
-Preprocessor=fore:#FF8000
-Operator=
-Identifier=
-Label=fore:#808000
 [Makefiles]
-FileNameExtensions=mak; make; mk; dsp; msc; msvc; am; pro; pri; gmk; ninja
-Default=
 Comment=fore:#75715E
-Identifier=fore:#003CE6
-Operator=
-Target=fore:#003CE6; back:#FFC000
 Preprocessor=fore:#75715E
 [Markdown]
-FileNameExtensions=md; markdown; mdown; mkdn; mkd
-Default=
-Line Begin=
-Strong=bold
-Emphasis=italic
 Header 1=bold; fore:#FF0088
 Header 2=bold; fore:#FF0088
 Header 3=bold; fore:#FF0088
 Header 4=bold; fore:#FF0088
 Header 5=bold; fore:#FF0088
 Header 6=bold; fore:#FF0088
-Pre Char=fore:#00007F
-Unordered List=bold; fore:#0080FF
-Ordered List=bold; fore:#0080FF
-Block Quote=fore:#00007F
-Strikeout=
-Horizontal Rule=bold
-Link=fore:#0000FF
-Code=fore:#00007F; back:#EBEBEB
 [MATLAB]
-FileNameExtensions=matlab; m; sce; sci
-Default=
-Comment=fore:#008000
-Command=bold
-Number=fore:#FF8000
-Keyword=bold; fore:#00007F
-String=fore:#7F007F
-Operator=
-Identifier=
 [Nim Source Code]
-FileNameExtensions=nim; nimrod
-Default=
-Comment=italic; fore:#484A86
-Keyword=bold; fore:#5E8F60
-Identifier=
-String Double Quoted=fore:#A4255B
-String Single Quoted=fore:#A4255B
-String Triple Double Quotes=fore:#A4255B
-String Triple Single Quotes=fore:#A4255B
-Number=fore:#252DBE
-Operator=bold; fore:#4B4B4B
-Function name=fore:#4B4B4B
-Parsing Error=italic; fore:#FFFF00; back:#A00000
 [NSIS Script]
-FileNameExtensions=nsi; nsh
-Default=
-Comment=fore:#008000
-String=fore:#666666; back:#EEEEEE
-Function=fore:#0033CC
-Variable=fore:#CC3300
-Variable within String=fore:#CC3300; back:#EEEEEE
-Number=fore:#FF0000
-Constant=fore:#FF9900
-Section=fore:#0033CC
-Sub Section=fore:#0033CC
-Section Group=fore:#0033CC
-Function Definition=fore:#0033CC
-PageEx=fore:#0033CC
-If Definition=fore:#0033CC
-Macro Definition=fore:#0033CC
 [Pascal Source Code]
-FileNameExtensions=pas; dpr; dpk; dfm; inc; pp
-Default=
 Comment=fore:#75715E
 Keyword=fore:#F92672
-Identifier=
 String=fore:#E6DB74
 Number=fore:#AE81FF
-Operator=bold
-Inline Asm=fore:#0000FF
 Preprocessor=fore:#75715E
 [Perl Script]
-FileNameExtensions=pl; pm; cgi; pod
-Default=
 Comment=fore:#75715E
 Keyword=fore:#F92672
-Identifier=
 String Double Quoted=fore:#E6DB74
 String Single Quoted=fore:#E6DB74
 Number=fore:#AE81FF
-Operator=bold
-Scalar $var=fore:#0A246A
-Array @var=fore:#003CE6
-Hash %var=fore:#B000B0
-Symbol Table *var=fore:#3A6EA5
 Regex /re/ or m{re}=fore:#E6DB74
 Substitution s/re/ore/=fore:#E6DB74
-Back Ticks=fore:#E24000; back:#FFF1A8
 Here-Doc (Delimiter)=fore:#75715E
 Here-Doc (Single Quoted, q)=fore:#75715E
 Here-Doc (Double Quoted, qq)=fore:#75715E
 Here-Doc (Back Ticks, qx)=fore:#75715E
 Single Quoted String (Generic, q)=fore:#E6DB74
 Double Quoted String (qq)=fore:#E6DB74
-Back Ticks (qx)=fore:#E24000; back:#FFF1A8
 Regex (qr)=fore:#E6DB74
-Array (qw)=fore:#003CE6
-Prototype=fore:#800080; back:#FFE2FF
-Format Identifier=bold; fore:#648000; back:#FFF1A8
-Format Body=fore:#648000; back:#FFF1A8
-POD (Common)=fore:#A46000; back:#FFFFC0; eolfilled
-POD (Verbatim)=fore:#A46000; back:#FFFFC0; eolfilled
-Data Section=fore:#A46000; back:#FFFFC0; eolfilled
 Parsing Error=fore:#F8F8F0; back:#F92672
 [PowerShell Script]
-FileNameExtensions=ps1; psd1; psm1
-Default=
 Comment=fore:#75715E
 Keyword=fore:#F92672
-Identifier=
 String=fore:#E6DB74
 Number=fore:#AE81FF
-Operator=bold
-Variable=fore:#0A246A
-Cmdlet=fore:#804000; back:#FFF1A8
-Alias=bold; fore:#0A246A
 [Python Script]
-FileNameExtensions=py; pyw
-Default=
 Comment=fore:#75715E
 Keyword=fore:#F92672
-Identifier=
 String Double Quoted=fore:#E6DB74
 String Single Quoted=fore:#E6DB74
 String Triple Double Quotes=fore:#E6DB74
@@ -490,139 +204,33 @@ Operator=fore:#F92672
 Function Name=fore:#A6E22E
 Class Name=fore:#A6E22E
 [Registry Files]
-FileNameExtensions=reg
-Default=
-Comment=fore:#008800
-Value Name=
-String=fore:#008000
-Value Type=bold; fore:#00007F
-Hex=fore:#7F0B0C
-Added Key=bold; fore:#000000; back:#FF8040; eolfilled
-Deleted Key=fore:#FF0000
-Escaped=bold; fore:#7D8187
-GUID in Key Path=fore:#7B5F15
-Parameter=fore:#0B6561
-Operator=bold
 [Resource Script]
-FileNameExtensions=rc; rc2; rct; rh; dlg
-Default=
 Comment=fore:#75715E
 Keyword=fore:#F92672
-Identifier=
 String=fore:#E6DB74
 Number=fore:#80FF80
 Operator=fore:#F92672
 Preprocessor=fore:#75715E
 [R-S-SPlus Statistics Code]
-FileNameExtensions=R
-Default=
-Comment=fore:#008000
-Keyword=bold; fore:#0A246A
-Base Package Functions=bold; fore:#7F0000
-Other Package Functions=bold; fore:#7F007F
-Number=fore:#0000FF
-String=italic; fore:#3C6CDD
-Operator=bold; fore:#B000B0
-Identifier=
-Infix=fore:#660066
-Infix EOL=fore:#FF4000; back:#E0C0E0; eolfilled
 [Ruby Script]
-FileNameExtensions=rb; ruby; rbw; rake; rjs; Rakefile; gemspec
-Default=
-Comment=fore:#008000
-Keyword=fore:#00007F
-Identifier=
-Number=fore:#008080
-Operator=
-String=fore:#FF8000
-Class Name=fore:#0000FF
-Function Name=fore:#007F7F
-POD=fore:#004000; back:#C0FFC0; eolfilled
-Regex=fore:#000000; back:#A0FFA0
-Symbol=fore:#C0A030
-Module Name=fore:#A000A0
-Instance Var=fore:#B00080
-Class Var=fore:#8000B0
-Data Section=fore:#600000; back:#FFF0D8; eolfilled
 [Rust Source Code]
-FileNameExtensions=rs; rust
-Default=
-Identifier=
-Keyword=bold; fore:#248112
-Build-In Type=fore:#A9003D
-Other Keyword=italic; fore:#248112
-Number=fore:#666666
-Comment=italic; fore:#488080
-String=fore:#B31C1B
-Operator=fore:#666666
-Macro Definition=fore:#0A246A
-Rust Lifetime=fore:#B000B0
-Parsing Error=fore:#F0F0F0; back:#F00000
-Byte String=fore:#C0C0C0
 [Shell Script]
-FileNameExtensions=sh; csh; zsh; bash; tcsh; m4; in
-Default=
-Error=
-Comment=fore:#008000
-Number=fore:#008080
-Keyword=fore:#0000FF
-String Double Quoted=fore:#008080
-String Single Quoted=fore:#800080
-Operator=
-Identifier=
-Scalar=fore:#808000
-Parameter Expansion=fore:#808000; back:#FFFF99
-Back Ticks=fore:#FF0080
-Here-Doc (Delimiter)=
-Here-Doc (Single Quoted, q)=fore:#008080
 [SQL Query]
-FileNameExtensions=sql; mysql; hsql
 Default=bold; fore:#EC7600
 Comment=fore:#66747B
 Keyword=bold; fore:#93C763
-Value Type=bold; fore:#000080
 String=fore:#E6DB74
 Identifier=bold; fore:#93C763
-Quoted Identifier=fore:#800080; back:#FFCCFF
 Number=fore:#FFD351
 Operator=fore:#FFF1A8
 [Tcl Script]
-FileNameExtensions=tcl; itcl
-Default=
-Comment=fore:#008000
-Keyword=fore:#0000FF
-Number=fore:#008080
-String=fore:#008080
-Operator=
-Identifier=fore:#800080
-Substitution=fore:#CC0000
-Modifier=fore:#FF00FF
 [VBScript]
-FileNameExtensions=vbs; dsm
-Default=
 Comment=fore:#0D8206
 Keyword=fore:#3A6EA5
-Identifier=
 String=fore:#FCA287
 Number=fore:#ACFBC0
-Operator=
 [VHDL]
-FileNameExtensions=vhdl; vhd
-Default=
-Comment=fore:#008800
-Number=fore:#FF0000
-String=fore:#008000
-Operator=fore:#B000B0
-Identifier=
-Keyword=bold; fore:#0A246A
-Standard Operator=bold; fore:#0A246A
-Attribute=
-Standard Function=
-Standard Package=
-Standard Type=fore:#FF8000
 [Visual Basic]
-FileNameExtensions=vb; bas; frm; cls; ctl; pag; dsr; dob
-Default=
 Comment=fore:#0D8206
 Keyword=fore:#3A6EA5
 Identifier=fore:#FFFFFF
@@ -631,7 +239,6 @@ Number=fore:#92FB53
 Operator=fore:#FFFFFF
 Preprocessor=fore:#52A5F8
 [Web Source Code]
-FileNameExtensions=html; htm; asp; aspx; shtml; htd; xhtml; php; php3; phtml; htt; cfm; tpl; dtd; hta; htc
 Default=fore:#FFFFFF
 HTML Tag=fore:#0080C0
 HTML Unknown Tag=fore:#C80000
@@ -643,12 +250,10 @@ HTML Other Inside Tag=fore:#FFFFFF
 HTML Comment=fore:#008000
 HTML Entity=fore:#0080C0
 HTML Element Text=fore:#E0E2E4
-XML Identifier=bold; fore:#881280
 SGML=fore:#0080C0
 CDATA=fore:#E0E2E4
 ASP Start Tag=fore:#0080C0
 PHP Start Tag=fore:#FFFFFF
-PHP Default=
 PHP Comment=fore:#FFFFFF
 PHP Keyword=fore:#92C654
 PHP String=font:Lucida Console; size:9; fore:#808080
@@ -658,36 +263,27 @@ PHP Operator=fore:#E7AF66
 PHP Variable=font:Lucida Console; size:9; fore:#678CB1
 PHP String Variable=fore:#EB7517
 PHP Complex Variable=fore:#EB7517
-JS Default=
 JS Comment=fore:#8F0306; back:#9F9F9F
 JS Keyword=bold; fore:#3A6EA5
-JS Identifier=
 JS String=fore:#FF8080
 JS Regex=fore:#FFFFFF
 JS Number=fore:#2291FF
 JS Symbols=fore:#FFFFFF
-ASP JS Default=
 ASP JS Comment=fore:#75715E
 ASP JS Keyword=fore:#F92672
-ASP JS Identifier=
 ASP JS String=fore:#E6DB74
 ASP JS Regex=fore:#E6DB74
 ASP JS Number=fore:#AE81FF
 ASP JS Symbols=fore:#F92672
-VBS Default=
 VBS Comment=fore:#75715E
 VBS Keyword=fore:#F92672
-VBS Identifier=
 VBS String=fore:#E6DB74
 VBS Number=fore:#AE81FF
-ASP VBS Default=
 ASP VBS Comment=fore:#75715E
 ASP VBS Keyword=fore:#F92672
-ASP VBS Identifier=
 ASP VBS String=fore:#E6DB74
 ASP VBS Number=fore:#AE81FF
 [XML Document]
-FileNameExtensions=xml; xsl; rss; svg; xul; xsd; xslt; axl; rdf; xaml; vcproj
 Default=fore:#FFFFFF; back:#000000
 XML Tag=fore:#3A6EA5
 XML Attribute=fore:#52A5F8
@@ -696,20 +292,8 @@ XML String=fore:#FFFFFF
 XML Other Inside Tag=fore:#0080C0
 XML Comment=fore:#008000
 XML Entity=fore:#0080C0
-XML Element Text=
 XML Identifier=fore:#808080
 SGML=fore:#F92672
 CDATA=fore:#75715E
 [YAML]
-FileNameExtensions=yaml; yml
-Default=
-Comment=fore:#008800
-Identifier=bold; fore:#0A246A
-Keyword=fore:#880088
-Number=fore:#FF8000
-Reference=fore:#008888
-Document=bold; fore:#FFFFFF; back:#000088; eolfilled
-Text=fore:#404040
-Error=bold; italic; fore:#FFFFFF; back:#FF0000; eolfilled
-Operator=fore:#333366
 [Styles]
diff --git a/Build/Themes/Obsidian.ini b/Build/Themes/Obsidian.ini
index 9e61cb419..f566c306b 100644
--- a/Build/Themes/Obsidian.ini
+++ b/Build/Themes/Obsidian.ini
@@ -1,49 +1,22 @@
 # Lexer Styles "Obsidian" taken from xCONFLiCTiONx (https://gist.github.com/xCONFLiCTiONx/43c035627909a92572334559b5685cf0)
+
 [Custom Colors]
-01=#000000
-02=#0A246A
-03=#3A6EA5
-04=#003CE6
-05=#006633
-06=#608020
-07=#648000
-08=#A46000
-09=#FFFFFF
-10=#FFFFE2
-11=#FFF1A8
-12=#FFC000
-13=#FF4000
-14=#C80000
-15=#B000B0
-16=#B28B40
 [Common Base]
-FileNameExtensions=txt; text; tmp; log; asc; doc; wtx
 Default Style=font:Calibri; size:11; fore:#EAEAEA; back:#000000
-Margins and Line Numbers=size:-2; fore:#8F8F8F; back:#161616
-Matching Braces (Indicator)=fore:#00FF40; alpha:80; alpha2:80; indic_roundbox
-Matching Braces Error (Indicator)=fore:#FF0080; alpha:140; alpha2:140; indic_roundbox
-Control Characters (Font)=size:-1
-Indentation Guide (Color)=fore:#A0A0A0
+Margins and Line Numbers=size:-2; fore:#A4FFFF; back:#444444
 Selected Text (Colors)=fore:#FFFFFF; back:#3478AB; eolfilled
-Whitespace (Colors, Size 0-12)=fore:#FF4000
 Current Line Background (Color)=fore:#F7F7F7; back:#000000
 Caret (Color, Size 1-3)=size:2; fore:#FFFFFF
 Long Line Marker (Colors)=fore:#BCBCBC; back:#3B3A32
-Extra Line Spacing (Size)=size:2
 Bookmarks and Folding (Colors, Size)=size:+2; fore:#000000; back:#808080; alpha:80
 Mark Occurrences (Indicator)=fore:#FF0000; alpha:100; alpha2:100; indic_roundbox
 Hyperlink Hotspots=fore:#3080E0; indic_roundbox
-Inline-IME Color=fore:#00AA00
 [2nd Common Base]
-FileNameExtensions=txt; text; tmp; log; asc; doc; wtx
 2nd Default Style=font:Courier New; fore:#EAEAEA; back:#000000
-2nd Margins and Line Numbers=font:Courier New; size:-2; fore:#8F8F8F; back:#161616
+2nd Margins and Line Numbers=font:Courier New; size:-2; fore:#A4FFFF; back:#444444
 2nd Matching Braces (Indicator)=fore:#00FF40; alpha:80; alpha2:80; indic_roundbox
 2nd Matching Braces Error (Indicator)=fore:#FF0080; alpha:140; alpha2:140; indic_roundbox
-2nd Control Characters (Font)=size:-1
-2nd Indentation Guide (Color)=fore:#A0A0A0
 2nd Selected Text (Colors)=fore:#FFFFFF; back:#3478AB; eolfilled
-2nd Whitespace (Colors, Size 0-12)=fore:#FF4000
 2nd Current Line Background (Color)=fore:#F7F7F7; back:#000000
 2nd Caret (Color, Size 1-3)=size:2; fore:#FFFFFF
 2nd Long Line Marker (Colors)=fore:#BCBCBC; back:#3B3A32
@@ -53,33 +26,16 @@ FileNameExtensions=txt; text; tmp; log; asc; doc; wtx
 2nd Hyperlink Hotspots=fore:#3080E0; indic_roundbox
 2nd Inline-IME Color=fore:#00AA00
 [ANSI Art]
-FileNameExtensions=nfo; diz
 Default=font:Lucida Console; size:11
-Margins and Line Numbers=font:Lucida Console; size:-2
-Matching Braces=size:+0
-Matching Braces Error=size:+0
-Extra Line Spacing (Size)=size:-1
 [Apache Config Files]
-FileNameExtensions=conf; cfg; cnf; htaccess; properties; prefs; iface; prop; po; te
-Default=
 Comment=fore:#75715E
 String=fore:#E0A596
 Number=fore:#AE81FF
-Directive=fore:#003CE6
-IP Address=bold; fore:#FF4000
 [Assembly Script]
-FileNameExtensions=asm; s; sx; inc; a51
-Default=
 Comment=fore:#75715E
-Identifier=
 String=fore:#E0A596
 Number=fore:#AE81FF
 Operator=fore:#F92672
-CPU Instruction=fore:#0A246A
-FPU Instruction=fore:#0A246A
-Extended Instruction=fore:#0A246A
-Directive=fore:#0A246A
-Directive Operand=fore:#0A246A
 Register=fore:#75715E
 [AutoHotkey Script]
 FileNameExtensions=
@@ -103,79 +59,16 @@ Special=italic; fore:#0000FF
 Variable Keyword=italic; fore:#CF00CF; back:#F9F9FF
 Error=back:#FFC0C0
 [AutoHotkey_L Script]
-FileNameExtensions=ahkl; ahk; ia; scriptlet
-Default=
-Identifier=
-Comment=fore:#008000
-String=fore:#404040
-Label=fore:#0000DD
-HotKey=fore:#00AADD
-HotString=fore:#00BBBB
-KeyHotstringOption=fore:#990099
-Hex Number=fore:#880088
-Number=fore:#FF9000
-Variable=fore:#FF9000
-Variable Dereferencing=fore:#990055
-Object=fore:#008888
-User-Defined Function=fore:#0000DD
-Directive=italic; fore:#4A0000
-Command=bold; fore:#0000DD
-Parameter=fore:#0085DD
-Flow of Control=fore:#0000DD
-Function=fore:#DD00DD
-Built-In Variables=bold; fore:#EE3010
-Key=fore:#A2A2A2
-Escape=italic; fore:#660000
-Error=back:#FF0000
 [AutoIt3 Script]
-FileNameExtensions=au3
-Default=
-Comment=fore:#008000
-Number=fore:#008080
-Function=fore:#0000FF
-User-Defined Function=fore:#0000FF
-Keyword=fore:#0000FF
-Macro=fore:#0080FF
-String=fore:#008080
-Operator=fore:#C000C0
-Variable=fore:#808000
-Send Key=fore:#FF0000
-Preprocessor=fore:#FF8000
-Special=fore:#FF8000
 [AviSynth Script]
-FileNameExtensions=avs; avsi
-Default=
-Comment=fore:#008000
-Operator=
-String=fore:#7F007F
-Number=fore:#007F7F
-Keyword=bold; fore:#00007F
-Filter=bold; fore:#00007F
-Plugin=bold; fore:#0080C0
-Function=fore:#007F7F
-Clip Property=fore:#00007F
 [Awk Script]
-FileNameExtensions=awk
-Default=
-Keyword=bold; fore:#0000A0
-Keyword 2nd=bold; italic; fore:#6666FF
-Identifier=
-Comment=fore:#808080
-String=fore:#008000
-Number=fore:#C04000
-Operator=fore:#B000B0
 [Batch Files]
-FileNameExtensions=bat; cmd
 Default=back:#000000
 Comment=fore:#0D8206
 Keyword=fore:#52A5F8
-Identifier=fore:#003CE6; back:#FFF1A8
 Operator=fore:#ADADAD
-Command=bold
 Label=fore:#2FEA00
 [C# Source Code]
-FileNameExtensions=cs; csx; vala
-Default=
 Comment=fore:#0D8206
 Keyword=fore:#52A5F8
 Identifier=fore:#FFFFFF
@@ -186,182 +79,51 @@ Operator=fore:#FFFFFF
 Preprocessor=fore:#808080
 Global Class=fore:#54EDBF
 [C/C++ Source Code]
-FileNameExtensions=c; cpp; cxx; cc; h; hpp; hxx; hh; m; mm; idl; midl; inl; odl; xpm
-Default=
 Identifier=fore:#B000B0
 Comment=fore:#0D8206
 Keyword=fore:#3A6EA5
-Keyword 2nd=bold; italic; fore:#3C6CDD
-Typedefs/Classes=bold; italic; fore:#800000
 String=fore:#E0A596
 Number=fore:#ACFBC0
 Operator=fore:#808080
 Preprocessor=fore:#808080
 [Cmake Script]
-FileNameExtensions=cmake; ctest
-Default=
-Comment=fore:#008000
-String=fore:#7F007F; back:#EEEEEE
-Function=fore:#00007F
-Parameter=fore:#7F200F
-Variable=fore:#CC3300
-While Def=fore:#00007F
-For Each Def=fore:#00007F
-If Def=fore:#00007F
-Macro Def=fore:#00007F
-Variable within String=fore:#CC3300; back:#EEEEEE
-Number=fore:#008080
 [Coffeescript]
-FileNameExtensions=coffee; Cakefile
-Default=
-Comment=fore:#646464
-String=fore:#008000
-Preprocessor=fore:#FF8000
-Identifier=bold; fore:#0A246A
-Operator=fore:#B000B0
-Number=fore:#FF0000
-Regex=fore:#006633; back:#FFF1A8
-Global Class=
-Word=
-Verbatim=
 [Configuration Files]
-FileNameExtensions=ini; inf; properties; oem; sif; url; sed; theme; clw
 Default=back:#000000
 Comment=fore:#0D8206
 Section=fore:#3A6EA5
 Assignment=fore:#A6E22E
-Default Value=fore:#FF0000
 [CSS Style Sheets]
-FileNameExtensions=css; less; hss; sass; scss
 Default=fore:#FFFFFF; back:#000000
 Comment=fore:#008000
 HTML Tag=bold; fore:#B28B40
 Tag-Class=bold; fore:#B28B40
 Tag-ID=bold; fore:#B28B40
 Tag-Attribute=fore:#B28B40
-Pseudo-Class=fore:#B000B0
-Pseudo-Element=fore:#B00050
 CSS Property=fore:#35BDFF
 String=fore:#E0A596
 Value=fore:#FFFFFF
 Operator=fore:#DFE1B1
 Important=bold; fore:#DFE1B1
 Directive=bold
-Media=bold; fore:#0A246A
-Variable=bold; fore:#FF4000
 Unknown Pseudo-Class=fore:#FF0000
 Unknown Property=fore:#FF0000
 [D Source Code]
-FileNameExtensions=d; dd; di
-Default=
-Comment=fore:#008000
-Comment Doc=fore:#0040A0
-Number=fore:#FF0000
-Keyword=bold; fore:#0A246A
-Keyword 2nd=bold; fore:#0A246A
-Typedef=italic; fore:#0A246A
-String=italic; fore:#3C6CDD
-Operator=fore:#B000B0
-Identifier=
 [Diff Files]
-FileNameExtensions=diff; patch
-Default=
-Comment=fore:#008000
-Command=bold; fore:#0A246A
-Source and Destination=fore:#C80000; back:#FFF1A8; eolfilled
-Position Setting=fore:#0000FF
-Line Addition=fore:#002000; back:#80FF80; eolfilled
-Line Removal=fore:#200000; back:#FF8080; eolfilled
-Line Change=fore:#000020; back:#8080FF; eolfilled
 [Go Source Code]
-FileNameExtensions=go
-Default=
-Comment=fore:#008000
-Number=fore:#FF0000
-Keyword=bold; fore:#0A246A
-Keyword 2nd=bold; fore:#0A246A
-Typedef=italic; fore:#0A246A
-String=italic; fore:#3C6CDD
-Operator=fore:#B000B0
-Identifier=
 [Inno Setup Script]
-FileNameExtensions=iss; isl; islu
-Default=
-Comment=fore:#008000
-Keyword=fore:#0000FF
-Parameter=fore:#0000FF
-Section=bold; fore:#000080
-Preprocessor=fore:#CC0000
-Inline Expansion=fore:#800080
-Pascal Comment=fore:#008000
-Pascal Keyword=fore:#0000FF
-String=
 [Java Source Code]
-FileNameExtensions=java; jad; aidl; bsh
-Default=
-Comment=fore:#646464
-Keyword=bold; fore:#A46000
-Identifier=
 String=fore:#E0A596
-Regex=fore:#006633; back:#FFF1A8
-Number=fore:#FF0000
-Operator=fore:#B000B0
 [JavaScript]
-FileNameExtensions=js; jse; jsm; as
-Default=
-Comment=fore:#646464
-Keyword=bold; fore:#A46000
-Identifier=
 String=fore:#E0A596
-Regex=fore:#006633; back:#FFF1A8
-Number=fore:#FF0000
-Operator=fore:#B000B0
 [JSON]
-FileNameExtensions=json; eslintrc; jshintrc; jsonld
-Default=
-Comment=fore:#646464
 Keyword=bold; fore:#A46000
 Identifier=
-String=fore:#008000
 Regex=fore:#006633; back:#FFF1A8
-Number=fore:#FF0000
-Operator=fore:#B000B0
 [LaTeX Files]
-FileNameExtensions=tex; latex; sty
-Default=
-Command=fore:#0000FF
-Comment=fore:#008000
-Math=fore:#FF0000
-Special Char=fore:#AAAA00
-Tag=fore:#0000FF
-Verbatim Segment=fore:#666666
 [Lua Script]
-FileNameExtensions=lua
-Default=
-Comment=fore:#008000
-Number=fore:#008080
-Keyword=fore:#00007F
-Basic Functions=fore:#00007F
-String, Table & Math Functions=fore:#00007F
-Input, Output & System Facilities=fore:#00007F
-String=fore:#B000B0
-Literal String=fore:#B000B0
-Preprocessor=fore:#FF8000
-Operator=
-Identifier=
-Label=fore:#808000
 [Makefiles]
-FileNameExtensions=mak; make; mk; dsp; msc; msvc; am; pro; pri; gmk; ninja
-Default=
-Comment=fore:#008000
-Identifier=fore:#003CE6
-Operator=
-Target=fore:#003CE6; back:#FFC000
-Preprocessor=fore:#FF8000
 [Markdown]
-FileNameExtensions=md; markdown; mdown; mkdn; mkd
-Default=
-Line Begin=
 Strong=bold; fore:#E68A00
 Emphasis=italic; fore:#E68A00
 Header 1=bold; fore:#3A6EA5
@@ -374,113 +136,48 @@ Pre Char=fore:#55A5F4
 Unordered List=bold; fore:#52A5F8
 Ordered List=bold; fore:#52A5F8
 Block Quote=fore:#52A5F8
-Strikeout=
-Horizontal Rule=bold
 Link=fore:#418FDE
 Code=fore:#3A6EA5
 [MATLAB]
-FileNameExtensions=matlab; m; sce; sci
-Default=
-Comment=fore:#008000
-Command=bold
-Number=fore:#FF8000
-Keyword=bold; fore:#00007F
-String=fore:#7F007F
-Operator=
-Identifier=
 [Nim Source Code]
-FileNameExtensions=nim; nimrod
-Default=
 Comment=fore:#880000
 Keyword=bold; fore:#000088
-Identifier=
 String Double Quoted=fore:#008800
 String Single Quoted=fore:#008800
 String Triple Double Quotes=fore:#008800
 String Triple Single Quotes=fore:#008800
 Number=fore:#FF4000
 Operator=bold; fore:#666600
-Function name=fore:#4B4B4B
-Parsing Error=italic; fore:#FFFF00; back:#A00000
 [NSIS Script]
-FileNameExtensions=nsi; nsh
-Default=
-Comment=fore:#008000
-String=fore:#666666; back:#EEEEEE
-Function=fore:#0033CC
-Variable=fore:#CC3300
-Variable within String=fore:#CC3300; back:#EEEEEE
-Number=fore:#FF0000
-Constant=fore:#FF9900
-Section=fore:#0033CC
-Sub Section=fore:#0033CC
-Section Group=fore:#0033CC
-Function Definition=fore:#0033CC
-PageEx=fore:#0033CC
-If Definition=fore:#0033CC
-Macro Definition=fore:#0033CC
 [Pascal Source Code]
-FileNameExtensions=pas; dpr; dpk; dfm; inc; pp
-Default=
-Comment=fore:#646464
 Keyword=fore:#F92672
-Identifier=
 String=fore:#E0A596
 Number=fore:#AE81FF
-Operator=bold
-Inline Asm=fore:#0000FF
 Preprocessor=fore:#75715E
 [Perl Script]
-FileNameExtensions=pl; pm; cgi; pod
-Default=
 Comment=fore:#75715E
 Keyword=fore:#F92672
-Identifier=
 String Double Quoted=fore:#E0A596
 String Single Quoted=fore:#E0A596
 Number=fore:#AE81FF
-Operator=bold
-Scalar $var=fore:#0A246A
-Array @var=fore:#003CE6
-Hash %var=fore:#B000B0
-Symbol Table *var=fore:#3A6EA5
 Regex /re/ or m{re}=fore:#E6DB74
 Substitution s/re/ore/=fore:#E6DB74
-Back Ticks=fore:#E24000; back:#FFF1A8
 Here-Doc (Delimiter)=fore:#75715E
 Here-Doc (Single Quoted, q)=fore:#75715E
 Here-Doc (Double Quoted, qq)=fore:#75715E
 Here-Doc (Back Ticks, qx)=fore:#75715E
 Single Quoted String (Generic, q)=fore:#E0A596
 Double Quoted String (qq)=fore:#E0A596
-Back Ticks (qx)=fore:#E24000; back:#FFF1A8
 Regex (qr)=fore:#E6DB74
-Array (qw)=fore:#003CE6
-Prototype=fore:#800080; back:#FFE2FF
-Format Identifier=bold; fore:#648000; back:#FFF1A8
-Format Body=fore:#648000; back:#FFF1A8
-POD (Common)=fore:#A46000; back:#FFFFC0; eolfilled
-POD (Verbatim)=fore:#A46000; back:#FFFFC0; eolfilled
-Data Section=fore:#A46000; back:#FFFFC0; eolfilled
 Parsing Error=fore:#F8F8F0; back:#F92672
 [PowerShell Script]
-FileNameExtensions=ps1; psd1; psm1
-Default=
 Comment=fore:#75715E
 Keyword=fore:#F92672
-Identifier=
 String=fore:#E0A596
 Number=fore:#AE81FF
-Operator=bold
-Variable=fore:#0A246A
-Cmdlet=fore:#804000; back:#FFF1A8
-Alias=bold; fore:#0A246A
 [Python Script]
-FileNameExtensions=py; pyw
-Default=
 Comment=fore:#75715E
 Keyword=fore:#F92672
-Identifier=
 String Double Quoted=fore:#E0A596
 String Single Quoted=fore:#E0A596
 String Triple Double Quotes=fore:#E0A596
@@ -490,8 +187,6 @@ Operator=fore:#F92672
 Function Name=fore:#A6E22E
 Class Name=fore:#A6E22E
 [Registry Files]
-FileNameExtensions=reg
-Default=
 Comment=fore:#0D8206
 Value Name=fore:#6ABAE6
 String=fore:#E0A596
@@ -501,128 +196,33 @@ Added Key=semibold; fore:#2563A0
 Deleted Key=fore:#BB0000
 Escaped=fore:#E0A596
 GUID in Key Path=fore:#95D09C
-Parameter=fore:#0B6561
-Operator=bold
 [Resource Script]
-FileNameExtensions=rc; rc2; rct; rh; dlg
-Default=
 Comment=fore:#75715E
 Keyword=fore:#F92672
-Identifier=
 String=fore:#E0A596
 Number=fore:#80FF80
 Operator=fore:#F92672
 Preprocessor=fore:#75715E
 [R-S-SPlus Statistics Code]
-FileNameExtensions=R
-Default=
-Comment=fore:#008000
-Keyword=bold; fore:#0A246A
-Base Package Functions=bold; fore:#7F0000
-Other Package Functions=bold; fore:#7F007F
-Number=fore:#0000FF
-String=italic; fore:#3C6CDD
-Operator=bold; fore:#B000B0
-Identifier=
-Infix=fore:#660066
-Infix EOL=fore:#FF4000; back:#E0C0E0; eolfilled
 [Ruby Script]
-FileNameExtensions=rb; ruby; rbw; rake; rjs; Rakefile; gemspec
-Default=
-Comment=fore:#008000
-Keyword=fore:#00007F
-Identifier=
-Number=fore:#008080
-Operator=
-String=fore:#FF8000
-Class Name=fore:#0000FF
-Function Name=fore:#007F7F
-POD=fore:#004000; back:#C0FFC0; eolfilled
-Regex=fore:#000000; back:#A0FFA0
-Symbol=fore:#C0A030
-Module Name=fore:#A000A0
-Instance Var=fore:#B00080
-Class Var=fore:#8000B0
-Data Section=fore:#600000; back:#FFF0D8; eolfilled
 [Rust Source Code]
-FileNameExtensions=rs; rust
-Default=
-Identifier=
-Keyword=bold; fore:#248112
-Build-In Type=fore:#A9003D
-Other Keyword=italic; fore:#248112
-Number=fore:#666666
-Comment=italic; fore:#488080
-String=fore:#B31C1B
-Operator=fore:#666666
-Macro Definition=fore:#0A246A
-Rust Lifetime=fore:#B000B0
-Parsing Error=fore:#F0F0F0; back:#F00000
-Byte String=fore:#C0C0C0
 [Shell Script]
-FileNameExtensions=sh; csh; zsh; bash; tcsh; m4; in
-Default=
-Error=
-Comment=fore:#008000
-Number=fore:#008080
-Keyword=fore:#0000FF
-String Double Quoted=fore:#008080
-String Single Quoted=fore:#800080
-Operator=
-Identifier=
-Scalar=fore:#808000
-Parameter Expansion=fore:#808000; back:#FFFF99
-Back Ticks=fore:#FF0080
-Here-Doc (Delimiter)=
-Here-Doc (Single Quoted, q)=fore:#008080
 [SQL Query]
-FileNameExtensions=sql; mysql; hsql
 Default=bold; fore:#EC7600
 Comment=fore:#66747B
 Keyword=bold; fore:#93C763
-Value Type=bold; fore:#000080
 String=fore:#E0A596
 Identifier=bold; fore:#93C763
-Quoted Identifier=fore:#800080; back:#FFCCFF
 Number=fore:#FFD351
 Operator=fore:#FFF1A8
 [Tcl Script]
-FileNameExtensions=tcl; itcl
-Default=
-Comment=fore:#008000
-Keyword=fore:#0000FF
-Number=fore:#008080
-String=fore:#008080
-Operator=
-Identifier=fore:#800080
-Substitution=fore:#CC0000
-Modifier=fore:#FF00FF
 [VBScript]
-FileNameExtensions=vbs; dsm
-Default=
 Comment=fore:#0D8206
 Keyword=fore:#3A6EA5
-Identifier=
 String=fore:#E0A596
 Number=fore:#ACFBC0
-Operator=
 [VHDL]
-FileNameExtensions=vhdl; vhd
-Default=
-Comment=fore:#008800
-Number=fore:#FF0000
-String=fore:#008000
-Operator=fore:#B000B0
-Identifier=
-Keyword=bold; fore:#0A246A
-Standard Operator=bold; fore:#0A246A
-Attribute=
-Standard Function=
-Standard Package=
-Standard Type=fore:#FF8000
 [Visual Basic]
-FileNameExtensions=vb; bas; frm; cls; ctl; pag; dsr; dob
-Default=
 Comment=fore:#0D8206
 Keyword=fore:#3A6EA5
 Identifier=fore:#FFFFFF
@@ -631,7 +231,6 @@ Number=fore:#92FB53
 Operator=fore:#FFFFFF
 Preprocessor=fore:#52A5F8
 [Web Source Code]
-FileNameExtensions=html; htm; asp; aspx; shtml; htd; xhtml; php; php3; phtml; htt; cfm; tpl; dtd; hta; htc
 Default=fore:#FFFFFF
 HTML Tag=fore:#0080C0
 HTML Unknown Tag=fore:#C80000
@@ -643,12 +242,10 @@ HTML Other Inside Tag=fore:#FFFFFF
 HTML Comment=fore:#008000
 HTML Entity=fore:#0080C0
 HTML Element Text=fore:#E0E2E4
-XML Identifier=bold; fore:#881280
 SGML=fore:#0080C0
 CDATA=fore:#E0E2E4
 ASP Start Tag=fore:#0080C0
 PHP Start Tag=fore:#FFFFFF
-PHP Default=
 PHP Comment=fore:#FFFFFF
 PHP Keyword=fore:#92C654
 PHP String=fore:#E0A596
@@ -658,36 +255,27 @@ PHP Operator=fore:#E7AF66
 PHP Variable=fore:#E0A596
 PHP String Variable=fore:#E0A596
 PHP Complex Variable=fore:#EB7517
-JS Default=
 JS Comment=fore:#8F0306; back:#9F9F9F
 JS Keyword=bold; fore:#3A6EA5
-JS Identifier=
 JS String=fore:#E0A596
 JS Regex=fore:#FFFFFF
 JS Number=fore:#2291FF
 JS Symbols=fore:#FFFFFF
-ASP JS Default=
 ASP JS Comment=fore:#75715E
 ASP JS Keyword=fore:#F92672
-ASP JS Identifier=
 ASP JS String=fore:#E0A596
 ASP JS Regex=fore:#E6DB74
 ASP JS Number=fore:#AE81FF
 ASP JS Symbols=fore:#F92672
-VBS Default=
 VBS Comment=fore:#75715E
 VBS Keyword=fore:#F92672
-VBS Identifier=
 VBS String=fore:#E0A596
 VBS Number=fore:#AE81FF
-ASP VBS Default=
 ASP VBS Comment=fore:#75715E
 ASP VBS Keyword=fore:#F92672
-ASP VBS Identifier=
 ASP VBS String=fore:#E0A596
 ASP VBS Number=fore:#AE81FF
 [XML Document]
-FileNameExtensions=xml; xsl; rss; svg; xul; xsd; xslt; axl; rdf; xaml; vcproj
 Default=fore:#FFFFFF; back:#000000
 XML Tag=fore:#3A6EA5
 XML Attribute=fore:#52A5F8
@@ -696,20 +284,8 @@ XML String=fore:#E0A596
 XML Other Inside Tag=fore:#0080C0
 XML Comment=fore:#008000
 XML Entity=fore:#0080C0
-XML Element Text=
 XML Identifier=fore:#808080
 SGML=fore:#F92672
 CDATA=fore:#75715E
 [YAML]
-FileNameExtensions=yaml; yml
-Default=
-Comment=fore:#008800
-Identifier=bold; fore:#0A246A
-Keyword=fore:#880088
-Number=fore:#FF8000
-Reference=fore:#008888
-Document=bold; fore:#FFFFFF; back:#000088; eolfilled
-Text=fore:#404040
-Error=bold; italic; fore:#FFFFFF; back:#FF0000; eolfilled
-Operator=fore:#333366
 [Styles]
diff --git a/Build/Themes/Sombra.ini b/Build/Themes/Sombra.ini
new file mode 100644
index 000000000..569040a16
--- /dev/null
+++ b/Build/Themes/Sombra.ini
@@ -0,0 +1,558 @@
+# Lexer Style "Sombra" from Mad Dog Vachon
+
+[Custom Colors]
+[Styles]
+[Common Base]
+Default Style=font:Default; fore:#F8F8ED; back:#141613
+Margins and Line Numbers=size:-2; fore:#A4FFFF; back:#444444
+Matching Braces (Indicator)=fore:#38FF6B; alpha:80; alpha2:80; indic_roundbox
+Matching Braces Error (Indicator)=fore:#FF389D; alpha:140; alpha2:140; indic_roundbox
+Control Characters (Font)=size:-1; fore:#FFF1A8; back:#141613
+Indentation Guide (Color)=fore:#A0A0A1; back:#141613
+Selected Text (Colors)=fore:#FDCA1C; back:#0000B3; eolfilled; alpha:80
+Whitespace (Colors, Size 0-12)=fore:#FF6937; back:#141613
+Current Line Background (Color)=size:2; fore:#A0A0A1; back:#FFFF37; alpha:50
+Long Line Marker (Colors)=fore:#FFCD37; back:#161916
+Extra Line Spacing (Size)=back:#141613
+Bookmarks and Folding (Colors, Size)=size:+2; fore:#B7B7FF; back:#49FF4A; alpha:100
+Mark Occurrences (Indicator)=fore:#3499FF; alpha:60; alpha2:60; indic_roundbox
+Hyperlink Hotspots=fore:#6666FF; back:#8A8AFF; indic_plain
+Multi Edit Indicator=fore:#FFB437; alpha:60; alpha2:180; indic_roundbox
+Inline-IME Color=fore:#63FF62
+[2nd Common Base]
+2nd Default Style=font:Courier New; fore:#FFFFE2; back:#141613
+2nd Margins and Line Numbers=font:Courier New; size:-2; fore:#A4FFFF; back:#444444
+2nd Matching Braces (Indicator)=fore:#37FF69; alpha:80; alpha2:220; indic_roundbox
+2nd Matching Braces Error (Indicator)=fore:#FF379B; alpha:140; alpha2:220; indic_roundbox
+2nd Control Characters (Font)=size:-1; fore:#FFF1A8; back:#141613
+2nd Indentation Guide (Color)=fore:#A0A0A1
+2nd Selected Text (Colors)=fore:#FF6B38; eolfilled
+2nd Whitespace (Colors, Size 0-12)=fore:#FF6B38
+2nd Current Line Background (Color)=size:2; fore:#5F60FF; back:#FFFF37; alpha:50
+2nd Caret (Color, Size 1-3)=size:2; fore:#343400
+2nd Long Line Marker (Colors)=fore:#FFCF38; back:#181818
+2nd Extra Line Spacing (Size)=size:2
+2nd Bookmarks and Folding (Colors, Size)=size:+2; fore:#B7FFB7; back:#49FF49; charset:2; case:U; alpha:100
+2nd Mark Occurrences (Indicator)=fore:#8A8AFF; alpha:60; alpha2:60; indic_box
+2nd Hyperlink Hotspots=fore:#4FFF4F; back:#6AFF69; alpha:180; indic_compositionthin
+2nd Multi Edit Indicator=fore:#38B9FF; indic_box
+2nd Inline-IME Color=fore:#F65555; back:#141613
+[Text Files]
+Margins and Line Numbers=font:Default; size:-2
+Extra Line Spacing (Size)=size:2
+[ANSI Art]
+Default=font:Lucida Console; size:11
+[Apache Config Files]
+Comment=italic; fore:#7ECC7E
+String=fore:#FF9933
+Number=fore:#FF6B38
+Directive=fore:#4476FF
+IP Address=bold; fore:#FF6B38
+[Assembly Script]
+Comment=italic; fore:#7ECC7E
+String=fore:#CCFFCC
+Number=fore:#F65555
+Operator=fore:#BDCFFF
+CPU Instruction=fore:#BDCFFF
+FPU Instruction=fore:#BDCFFF
+Extended Instruction=fore:#BDCFFF
+Directive=fore:#BDCFFF
+Directive Operand=fore:#BDCFFF
+Register=fore:#FFFF91
+[AutoHotkey_L Script]
+Comment=italic; fore:#7ECC7E
+String=fore:#BABBBA
+Label=fore:#A8A8FF
+HotKey=fore:#49D6FF
+HotString=fore:#69FFFF
+KeyHotstringOption=fore:#FE6BFE
+Hex Number=fore:#FE74FE
+Number=fore:#FFA938
+Variable=fore:#FFA938
+Variable Dereferencing=fore:#FE6BBC
+Object=fore:#73FFFE
+User-Defined Function=fore:#A8A8FF
+Directive=italic; fore:#FF9492
+Command=bold; fore:#A8A8FF
+Parameter=fore:#49B7FF
+Flow of Control=fore:#A0A0FF
+Function=fore:#FF8FFF
+Built-In Variables=bold; fore:#F25F45
+Key=fore:#A2A3A2
+Escape=italic; fore:#FF8684
+Error=back:#F65555
+[AutoIt3 Script]
+Comment=italic; fore:#7ECC7E
+Number=fore:#5A7DFF
+Function=fore:#678AE9
+User-Defined Function=fore:#E6E6E6
+Keyword=fore:#646BFF
+Macro=fore:#FFFF91
+String=fore:#80FFFF
+Operator=fore:#FF9933
+Variable=fore:#DFDDD9
+Send Key=fore:#B4B4B4
+Preprocessor=fore:#FFFF91
+Special=fore:#FFFF91
+[AviSynth Script]
+Comment=italic; fore:#7ECC7E
+String=fore:#E87DE8
+Number=fore:#78FEFE
+Keyword=bold; fore:#A3A3F5
+Filter=bold; fore:#A3A3F5
+Plugin=bold; fore:#57C8FF
+Function=fore:#78FEFE
+Clip Property=fore:#A3A3F5
+[Awk Script]
+Keyword=bold; fore:#6768FF
+Keyword 2nd=bold; italic; fore:#6667FF
+Comment=italic; fore:#7ECC7E
+String=fore:#CCFFCC
+Number=fore:#FF9057
+Operator=fore:#FF9933
+[Batch Files]
+Default=back:#141613
+Comment=italic; fore:#7ECC7E
+Keyword=bold; fore:#8694F4
+Identifier=fore:#A0A0FF; back:#4D4100
+Operator=fore:#FF9933
+Label=fore:#FF5453; back:#303B30; eolfilled
+[C# Source Code]
+Comment=italic; fore:#7ECC7E
+Keyword=bold; fore:#FFBC77
+Identifier=fore:#A0A0FF
+String=fore:#99FFBB
+Verbatim String=fore:#66DDAA
+Number=fore:#F65555
+Operator=fore:#FF9933
+Preprocessor=fore:#FFFF91
+Global Class=fore:#6EC3DB
+[C/C++ Source Code]
+Identifier=fore:#C5D3CE
+Comment=italic; fore:#7ECC7E
+Keyword=bold; fore:#BDCFFF
+Keyword 2nd=bold; italic; fore:#4A78E0
+Typedefs/Classes=bold; italic; fore:#FF7877
+String=fore:#CCFFCC
+Number=fore:#F65555
+Operator=fore:#FF9933
+Preprocessor=fore:#FFFF91
+[Cmake Script]
+Comment=italic; fore:#7ECC7E
+String=fore:#E87DE8; back:#232623
+Function=fore:#A3A3F5
+Parameter=fore:#F0917F
+Variable=fore:#FF7E51
+While Def=fore:#A3A3F5
+For Each Def=fore:#A3A3F5
+If Def=fore:#A3A3F5
+Macro Def=fore:#A3A3F5
+Variable within String=fore:#FF7E51; back:#232623
+Number=fore:#80FFFF
+[Coffeescript]
+Comment=italic; fore:#7ECC7E
+String=fore:#CCFFCC
+Preprocessor=fore:#FFFF91
+Identifier=bold; fore:#BDCFFF
+Operator=fore:#FF9933
+Number=fore:#F65555
+Regex=fore:#84FFC1; back:#6D5D00
+[Configuration Files]
+Default=back:#141614
+Comment=italic; fore:#7ECC7E
+Section=bold; fore:#000800; back:#993300; eolfilled
+Assignment=fore:#F65555
+Default Value=fore:#F65555
+[CSS Style Sheets]
+Default=fore:#DBDBDB; back:#141614
+Comment=italic; fore:#7ECC7E
+HTML Tag=bold; fore:#BDCFFF
+Tag-Class=fore:#E0FF77
+Tag-ID=fore:#E0FF77
+Tag-Attribute=italic; fore:#E0FF77
+Pseudo-Class=fore:#FF9933
+Pseudo-Element=fore:#FE60A7
+CSS Property=fore:#FF6B38
+String=fore:#CCFFCC
+Value=fore:#77A3CF
+Operator=fore:#FF9933
+Important=bold; fore:#FF5453
+Directive=bold; fore:#B7FFB7; back:#6D5D00
+Media=bold; fore:#BDCFFF
+Variable=bold; fore:#FF6E38
+Unknown Pseudo-Class=fore:#FF5453; back:#FFFF81
+Unknown Property=fore:#FF5453; back:#FFFF81
+[CSV Prism]
+Column 0=fore:#C94EFE
+Column 1=fore:#7861FD
+Column 2=fore:#3E8CFE
+Column 3=fore:#28A5FF
+Column 4=fore:#56FEFD
+Column 5=fore:#4CFF74
+Column 6=fore:#B7FF4C
+Column 7=fore:#F0FE45
+Column 8=fore:#FFAF37
+Column 9=fore:#FF4C4B
+[D Source Code]
+Comment=italic; fore:#7ECC7E
+Comment Doc=fore:#67A5FF
+Number=fore:#F65555
+Keyword=bold; fore:#BDCFFF
+Keyword 2nd=bold; fore:#BDCFFF
+Typedef=italic; fore:#BDCFFF
+String=italic; fore:#4A78E0
+Operator=fore:#FF9933
+[Diff Files]
+Comment=italic; fore:#7ECC7E
+Command=bold; fore:#BDCFFF
+Source and Destination=fore:#C80100; back:#FFF2A8; eolfilled
+Position Setting=fore:#8A8AFF
+Line Addition=fore:#81FF80; back:#002100; eolfilled
+Line Removal=fore:#200100; back:#FF8180; eolfilled
+Line Change=fore:#000120; back:#8081FF; eolfilled
+[Go Source Code]
+Comment=italic; fore:#7ECC7E
+Number=fore:#F65555
+Keyword=bold; fore:#BDCFFF
+Keyword 2nd=bold; fore:#BDCFFF
+Typedef=italic; fore:#BDCFFF
+String=italic; fore:#4A78E0
+Operator=fore:#FF9933
+[Inno Setup Script]
+Comment=italic; fore:#7ECC7E
+Keyword=fore:#8A8AFF
+Parameter=fore:#8A8AFF
+Section=bold; fore:#B3B3FF
+Preprocessor=fore:#FF5251
+Inline Expansion=fore:#F2A6F2
+Pascal Comment=italic; fore:#7ECC7E
+Pascal Keyword=fore:#8A8AFF
+[Java Source Code]
+Comment=italic; fore:#7ECC7E
+Keyword=bold; fore:#FFC065
+String=fore:#CCFFCC
+Regex=fore:#84FFC1; back:#6D5D00
+Number=fore:#F65555
+Operator=fore:#FF9933
+[JavaScript]
+Comment=italic; fore:#7ECC7E
+Keyword=bold; fore:#FFC065
+String=fore:#CCFFCC
+Regex=fore:#84FFC1; back:#6D5D00
+Number=fore:#F65555
+Operator=fore:#FF9933
+[JSON]
+Comment=italic; fore:#7ECC7E
+Keyword=bold; fore:#FFDC6D
+LD Keyword=bold; fore:#FB7F66
+String=fore:#CCFFCC
+Number=fore:#F65555
+Operator=fore:#FF9933
+Property Name=fore:#89A0E1
+ESC Sequence=fore:#70F590
+Parsing Error=fore:#FFFF37; back:#FF6867; eolfilled
+[LaTeX Files]
+Command=fore:#8A8AFF
+Comment=italic; fore:#7ECC7E
+Math=fore:#F65555
+Special Char=fore:#FEFF62
+Tag=fore:#8A8AFF
+Verbatim Segment=fore:#A7A8A7
+Error=fore:#FFFF37; back:#FF6867
+[Lua Script]
+Comment=italic; fore:#7ECC7E
+Number=fore:#80FFFF
+Keyword=fore:#8F8FEF
+Basic Functions=fore:#A3A3F5
+String, Table & Math Functions=fore:#78BBFF
+Input, Output & System Facilities=fore:#80FFFF
+String=fore:#FF9933
+Literal String=fore:#DB9957
+Preprocessor=fore:#FFFF91
+Label=fore:#FEFF77
+[Makefiles]
+Comment=italic; fore:#7ECC7E
+Identifier=fore:#80A2FF
+Target=fore:#FFCF38; back:#4476FF
+Preprocessor=fore:#FFFF91
+[Markdown]
+Strong=bold; fore:#E68A00
+Emphasis=italic; fore:#E68A00
+Header 1=bold; fore:#FF66B8
+Header 2=bold; fore:#E651A1
+Header 3=bold; fore:#CC3385
+Header 4=bold; fore:#E651A1
+Header 5=bold; fore:#FF66B8
+Header 6=bold; fore:#CC3385
+Pre Char=fore:#A3A3F5
+Unordered List=bold; fore:#389DFF
+Ordered List=bold; fore:#389DFF
+Block Quote=fore:#B3B3FF
+Link=fore:#8A8AFF
+Code=fore:#6666FF; back:#262726
+[MATLAB]
+Comment=italic; fore:#7ECC7E
+Number=fore:#FFFF91
+Keyword=bold; fore:#A3A3F5
+String=fore:#E87DE8
+[Nim Source Code]
+Comment=italic; fore:#7ECC7E
+Keyword=bold; fore:#8CB38D
+String Double Quoted=fore:#DF73A0
+String Single Quoted=fore:#DF73A0
+String Triple Double Quotes=fore:#DF73A0
+String Triple Single Quotes=fore:#DF73A0
+Number=fore:#646CE1
+Operator=bold; fore:#B5B6B5
+Function name=fore:#B5B6B5
+Parsing Error=italic; fore:#FFFF37; back:#FF6867
+[NSIS Script]
+Comment=italic; fore:#7ECC7E
+String=fore:#A7A8A7; back:#232623
+Function=fore:#678AE9
+Variable=fore:#FF7E51
+Variable within String=fore:#FF7E51; back:#232623
+Number=fore:#F65555
+Constant=fore:#FFAF37
+Section=fore:#517EFF
+Sub Section=fore:#517EFF
+Section Group=fore:#517EFF
+Function Definition=fore:#517EFF
+PageEx=fore:#517EFF
+If Definition=fore:#517EFF
+Macro Definition=fore:#517EFF
+[Pascal Source Code]
+Comment=italic; fore:#7ECC7E
+Keyword=bold; fore:#E78DE7
+String=fore:#CCFFCC
+Number=fore:#F65555
+Inline Asm=fore:#8A8AFF
+Preprocessor=fore:#DF20DF
+[Perl Script]
+Comment=italic; fore:#7ECC7E
+Keyword=bold; fore:#FFBC77
+String Double Quoted=fore:#CCFFCC
+String Single Quoted=fore:#CCFFCC
+Number=fore:#F65555
+Scalar $var=fore:#BDCFFF
+Array @var=fore:#4476FF
+Hash %var=fore:#FF9933
+Symbol Table *var=fore:#77A3CF
+Regex /re/ or m{re}=fore:#84FFC1; back:#6D5D00
+Substitution s/re/ore/=fore:#84FFC1; back:#6D5D00
+Back Ticks=fore:#FF7B46; back:#6D5D00
+Here-Doc (Delimiter)=fore:#E0FF77
+Here-Doc (Single Quoted, q)=fore:#E0FF77
+Here-Doc (Double Quoted, qq)=fore:#E0FF77
+Here-Doc (Back Ticks, qx)=fore:#FF7B46; back:#6D5D00
+Single Quoted String (Generic, q)=fore:#CCFFCC
+Double Quoted String (qq)=fore:#CCFFCC
+Back Ticks (qx)=fore:#FF7B46; back:#6D5D00
+Regex (qr)=fore:#84FFC1; back:#6D5D00
+Array (qw)=fore:#4476FF
+Prototype=fore:#E87DE8; back:#460046
+Format Identifier=bold; fore:#E0FF77; back:#6D5D00
+Format Body=fore:#E0FF77; back:#6D5D00
+POD (Common)=fore:#FFC065; back:#5C5C00; eolfilled
+POD (Verbatim)=fore:#FFC065; back:#5C5C00; eolfilled
+Data Section=fore:#FFC065; back:#5C5C00; eolfilled
+Parsing Error=fore:#FF5453; back:#FFFF81
+[PowerShell Script]
+Comment=italic; fore:#7ECC7E
+Keyword=bold; fore:#FFBC77
+String=fore:#CCFFCC
+Number=fore:#F65555
+Variable=fore:#BDCFFF
+Cmdlet=fore:#FFE6CC; back:#473D06
+Alias=bold; fore:#BDCFFF
+[Python Script]
+Comment=italic; fore:#7ECC7E
+Keyword=fore:#A3A3F5
+String Double Quoted=fore:#73FF73
+String Single Quoted=fore:#2BEE2B
+String Triple Double Quotes=fore:#4DCB4D
+String Triple Single Quotes=fore:#7AB87A
+Number=fore:#FF6B38
+Operator=bold; fore:#FEFF84
+Function Name=fore:#FE85FE
+Class Name=fore:#FE85FE
+[Registry Files]
+Comment=italic; fore:#7ECC7E
+String=fore:#99FF99
+Value Type=bold; fore:#A3A3F5
+Hex=fore:#F37F7E
+Added Key=bold; fore:#000800; back:#993300; eolfilled
+Deleted Key=fore:#F65555
+Escaped=bold; fore:#969A9E
+GUID in Key Path=fore:#E9CD85
+Parameter=fore:#8BF3ED
+[Resource Script]
+Comment=italic; fore:#7ECC7E
+Keyword=bold; fore:#BDCFFF
+String=fore:#CCFFCC
+Number=fore:#F65555
+Operator=fore:#BDCFFF
+Preprocessor=fore:#FFFF91
+[R-S-SPlus Statistics Code]
+Comment=italic; fore:#7ECC7E
+Keyword=bold; fore:#BDCFFF
+Base Package Functions=bold; fore:#FF7978
+Other Package Functions=bold; fore:#E87DE8
+Number=fore:#8A8AFF
+String=italic; fore:#4A78E0
+Operator=bold; fore:#FF9933
+Infix=fore:#FE85FE
+Infix EOL=fore:#FF6B38; back:#4B264B; eolfilled
+[Ruby Script]
+Comment=italic; fore:#7ECC7E
+Keyword=fore:#A3A3F5
+Number=fore:#80FFFF
+String=fore:#FFFF91
+Class Name=fore:#8A8AFF
+Function Name=fore:#78FEFE
+POD=fore:#97FF97; back:#015D00; eolfilled
+Regex=fore:#B7FFB7; back:#017200
+Symbol=fore:#D9C066
+Module Name=fore:#E87DE8
+Instance Var=fore:#FE60D3
+Class Var=fore:#D360FE
+Data Section=fore:#FF8987; back:#4D3100; eolfilled
+[Rust Source Code]
+Build-In Type=fore:#FE639B
+Other Keyword=italic; fore:#91ED7F
+Number=fore:#A7A8A7
+Comment=italic; fore:#7ECC7E
+String=fore:#E86967
+Operator=fore:#A7A8A7
+Macro Definition=fore:#BDCFFF
+Rust Lifetime=fore:#FF9933
+Parsing Error=fore:#222422; back:#FF403F
+Byte String=fore:#C0C1C0
+[Shell Script]
+Comment=italic; fore:#7ECC7E
+Number=fore:#80FFFF
+Keyword=fore:#6666FF
+String Double Quoted=fore:#80FFFF
+String Single Quoted=fore:#E87DE8
+Scalar=fore:#FEFF77
+Parameter Expansion=fore:#FEFF77; back:#949600
+Back Ticks=fore:#FF379B
+Here-Doc (Single Quoted, q)=fore:#80FFFF
+[SQL Query]
+Default=bold; fore:#EC7600
+Comment=italic; fore:#7ECC7E
+Keyword=bold; fore:#E87DE8
+Value Type=bold; fore:#B3B3FF
+String=fore:#CCFFCC; back:#6D5D00
+Identifier=fore:#A0A0FF
+Quoted Identifier=fore:#FE78FE; back:#540054
+Number=fore:#F65555
+Operator=bold; fore:#FF9933
+[Tcl Script]
+Comment=italic; fore:#7ECC7E
+Keyword=fore:#8A8AFF
+Number=fore:#F65555
+String=fore:#80FFFF
+Identifier=fore:#A0A0FF
+Substitution=fore:#E23636
+Modifier=fore:#E651A1
+[TOML Config]
+Keyword=bold; fore:#FF379B
+Comment=italic; fore:#7ECC7E
+Section=bold; fore:#CCFFCC; back:#04529A; eolfilled
+Key=bold; fore:#8C8FB4
+Assignment=bold; fore:#FF2928
+Value=fore:#CACCCA
+Number=fore:#4748FF
+Date-Time=fore:#E830DC
+String=italic; fore:#AAABAA
+Parsing Error=fore:#FFFF37; back:#561010; eolfilled
+[VBScript]
+Comment=italic; fore:#7ECC7E
+Keyword=bold; fore:#FF9933
+String=fore:#CCFFCC
+Number=fore:#F65555
+[VHDL]
+Comment=fore:#73FF73
+Number=fore:#F65555
+String=fore:#CCFFCC
+Operator=fore:#FF9933
+Keyword=bold; fore:#BDCFFF
+Standard Operator=bold; fore:#BDCFFF
+Standard Type=fore:#FFFF91
+[Visual Basic]
+Comment=italic; fore:#7ECC7E
+Keyword=bold; fore:#FF9933
+Identifier=fore:#DBDBDB
+String=fore:#99FF99
+Number=fore:#F65555
+Operator=fore:#DBDBDB
+Preprocessor=fore:#FFB238
+[Web Source Code]
+Default=fore:#DBDBDB
+HTML Tag=fore:#E0FF77
+HTML Unknown Tag=fore:#FF5453; back:#FFFF81
+HTML Attribute=fore:#FF6B38
+HTML Unknown Attribute=fore:#FF5453; back:#FFFF81
+HTML Value=fore:#77A3CF
+HTML String=fore:#77A3CF
+HTML Other Inside Tag=fore:#77A3CF
+HTML Comment=italic; fore:#7ECC7E
+HTML Entity=fore:#FF9933
+HTML Element Text=fore:#E0E2E4
+XML Identifier=bold; fore:#ED7CE5
+SGML=fore:#ED7CE5
+CDATA=fore:#A8A9A8
+ASP Start Tag=bold; fore:#B3B3FF
+PHP Start Tag=bold; fore:#B3B3FF
+PHP Comment=fore:#FFFF91
+PHP Keyword=bold; fore:#FFC065
+PHP String=fore:#CCFFCC
+PHP Simple String=fore:#99FF99
+PHP Number=fore:#F65555
+PHP Operator=fore:#FF9933
+PHP Variable=italic; fore:#B3B3FF
+PHP String Variable=italic; fore:#B3B3FF
+PHP Complex Variable=italic; fore:#B3B3FF
+JS Comment=fore:#A8A9A8
+JS Keyword=bold; fore:#FFC065
+JS String=fore:#CCFFCC
+JS Regex=fore:#84FFC1; back:#6D5D00
+JS Number=fore:#F65555
+JS Symbols=fore:#FF9933
+ASP JS Comment=fore:#A8A9A8; back:#7F7F7F
+ASP JS Keyword=bold; fore:#FFC065
+ASP JS String=fore:#CCFFCC
+ASP JS Regex=fore:#84FFC1; back:#6D5D00
+ASP JS Number=fore:#F65555
+ASP JS Symbols=fore:#FF9933
+VBS Comment=fore:#A8A9A8
+VBS Keyword=bold; fore:#FF9933
+VBS String=fore:#CCFFCC
+VBS Number=fore:#F65555
+ASP VBS Comment=fore:#A8A9A8
+ASP VBS Keyword=bold; fore:#FF9933
+ASP VBS String=fore:#CCFFCC
+ASP VBS Number=fore:#F65555
+[XML Document]
+Default=fore:#DBDBDB; back:#1A1A1A
+XML Tag=fore:#A6A6F2
+XML Attribute=fore:#FFAF6B
+XML Value=fore:#ED7CE5
+XML String=fore:#EDFFED
+XML Other Inside Tag=fore:#CDEDCD
+XML Comment=italic; fore:#7ECC7E
+XML Entity=fore:#FF9933
+XML Identifier=bold; fore:#ED7CE5
+SGML=fore:#FFB3EB
+CDATA=fore:#A8A9A8
+[YAML]
+Comment=italic; fore:#7ECC7E
+Identifier=bold; fore:#BDCFFF
+Keyword=fore:#FE74FE
+Number=fore:#FFFF91
+Reference=fore:#73FFFE
+Document=bold; fore:#343400; back:#A6A6FF; eolfilled
+Text=fore:#BABBBA
+Error=bold; italic; fore:#343400; back:#FF5555; eolfilled
+Operator=fore:#9C9DCE
diff --git a/language/common_res.rc b/language/common_res.rc
index 65ed68a64..441a4bf6b 100644
--- a/language/common_res.rc
+++ b/language/common_res.rc
@@ -49,7 +49,6 @@ END
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
 IDI_MUI_RUN             ICON                    "Run.ico"
-//IDI_MUI_STYLES          ICON                    "Styles.ico"
 IDI_MUI_STYLES          ICON                    "Preferences.ico"
 
 
@@ -58,7 +57,7 @@ IDI_MUI_STYLES          ICON                    "Preferences.ico"
 // Bitmap
 //
 
-IDR_RIZBITMAP           BITMAP                  "rizonesoft.bmp"
+IDR_RIZBITMAP           BITMAP                  "rizonesoft_t.bmp"
 
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/language/np3_af_za/dialogs_af_za.rc b/language/np3_af_za/dialogs_af_za.rc
index 6e0ed5f06..012a57a21 100644
--- a/language/np3_af_za/dialogs_af_za.rc
+++ b/language/np3_af_za/dialogs_af_za.rc
@@ -66,7 +66,7 @@ BEGIN
     LTEXT           "IDC_TRANSL_AUTH",IDC_TRANSL_AUTH,80,64,218,8
     LTEXT           "",IDC_WEBPAGE2,190,55,100,8,NOT WS_VISIBLE | WS_DISABLED
     CONTROL         "",IDC_WEBPAGE,"SysLink",WS_TABSTOP,200,52,100,10
-    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,305,7, 75, 24,WS_EX_TRANSPARENT
+    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,300,7,88,24,WS_EX_TRANSPARENT
     PUSHBUTTON      "Kopieer Weergawe-teks",IDC_COPYVERSTRG,304,35,76,14,BS_FLAT
     CONTROL         "",IDC_RICHEDITABOUT,RICHEDIT_CONTROL_VER,WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | 0x29c4,20,80,360,170
 END
@@ -324,7 +324,6 @@ BEGIN
     GROUPBOX        "Info",IDC_INFO_GROUPBOX,180,7,280,127
     LTEXT           "Pas skemas aan",IDC_TITLE,264,25,180,12
     EDITTEXT        IDC_STYLEEDIT_HELP,197,54,252,74,ES_MULTILINE | ES_READONLY | NOT WS_BORDER
-    SCROLLBAR       IDC_RESIZEGRIP,7,233,10,10
 END
 
 IDD_MUI_TABSETTINGS DIALOGEX 0, 0, 174, 114
diff --git a/language/np3_be_by/dialogs_be_by.rc b/language/np3_be_by/dialogs_be_by.rc
index b9f9dc67e..e6fa75fe2 100644
--- a/language/np3_be_by/dialogs_be_by.rc
+++ b/language/np3_be_by/dialogs_be_by.rc
@@ -66,7 +66,7 @@ BEGIN
     LTEXT           "IDC_TRANSL_AUTH",IDC_TRANSL_AUTH,80,64,218,8
     LTEXT           "",IDC_WEBPAGE2,190,55,100,8,NOT WS_VISIBLE | WS_DISABLED
     CONTROL         "",IDC_WEBPAGE,"SysLink",WS_TABSTOP,200,52,100,10
-    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,305,7, 75, 24,WS_EX_TRANSPARENT
+    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,300,7,88,24,WS_EX_TRANSPARENT
     PUSHBUTTON      "Капіяваць версію",IDC_COPYVERSTRG,304,35,76,14,BS_FLAT
     CONTROL         "",IDC_RICHEDITABOUT,RICHEDIT_CONTROL_VER,WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | 0x29c4,20,80,360,170
 END
@@ -324,7 +324,6 @@ BEGIN
     GROUPBOX        "Інфармацыя",IDC_INFO_GROUPBOX,180,7,280,127
     LTEXT           "Налады схемаў",IDC_TITLE,264,25,180,12
     EDITTEXT        IDC_STYLEEDIT_HELP,197,54,252,74,ES_MULTILINE | ES_READONLY | NOT WS_BORDER
-    SCROLLBAR       IDC_RESIZEGRIP,7,233,10,10
 END
 
 IDD_MUI_TABSETTINGS DIALOGEX 0, 0, 192, 114
diff --git a/language/np3_de_de/dialogs_de_de.rc b/language/np3_de_de/dialogs_de_de.rc
index 84d8542fb..82034e5e1 100644
--- a/language/np3_de_de/dialogs_de_de.rc
+++ b/language/np3_de_de/dialogs_de_de.rc
@@ -66,7 +66,7 @@ BEGIN
     LTEXT           "IDC_TRANSL_AUTH",IDC_TRANSL_AUTH,80,64,218,8
     LTEXT           "",IDC_WEBPAGE2,190,55,100,8,NOT WS_VISIBLE | WS_DISABLED
     CONTROL         "",IDC_WEBPAGE,"SysLink",WS_TABSTOP,200,52,100,10
-    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,305,7, 75, 24,WS_EX_TRANSPARENT
+    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,300,7,88,24,WS_EX_TRANSPARENT
     PUSHBUTTON      "Kopiere Versions Text",IDC_COPYVERSTRG,304,35,76,14,BS_FLAT
     CONTROL         "",IDC_RICHEDITABOUT,RICHEDIT_CONTROL_VER,WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | 0x29c4,20,80,360,170
 END
@@ -111,7 +111,6 @@ BEGIN
     CONTROL         "<a>(?)</a>",IDC_WILDCARDHELP,"SysLink",0x0,191,97,14,10
     CONTROL         "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,142,259,9,WS_EX_STATICEDGE
     PUSHBUTTON      "&Fokussieren",IDC_TOGGLE_VISIBILITY,211,77,55,14
-    SCROLLBAR       IDC_RESIZEGRIP,262,143,10,10
 END
 
 IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 180
@@ -151,7 +150,6 @@ BEGIN
     CONTROL         "<a>(?)</a>",IDC_WILDCARDHELP,"SysLink",0x0,191,126,14,10
     CONTROL         "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,168,259,9,WS_EX_STATICEDGE
     PUSHBUTTON      "&Fokussieren",IDC_TOGGLE_VISIBILITY,211,106,55,14
-    SCROLLBAR       IDC_RESIZEGRIP,262,169,10,10
 END
 
 IDD_MUI_RUN DIALOGEX 0, 0, 229, 96
@@ -324,7 +322,6 @@ BEGIN
     GROUPBOX        "Information",IDC_INFO_GROUPBOX,180,7,280,127
     LTEXT           "Syntax Schemata anpassen",IDC_TITLE,264,25,180,12
     EDITTEXT        IDC_STYLEEDIT_HELP,197,54,252,74,ES_MULTILINE | ES_READONLY | NOT WS_BORDER
-    SCROLLBAR       IDC_RESIZEGRIP,7,233,10,10
 END
 
 IDD_MUI_TABSETTINGS DIALOGEX 0, 0, 184, 114
diff --git a/language/np3_en_gb/dialogs_en_gb.rc b/language/np3_en_gb/dialogs_en_gb.rc
index 2db3fd3ce..f1ba45315 100644
--- a/language/np3_en_gb/dialogs_en_gb.rc
+++ b/language/np3_en_gb/dialogs_en_gb.rc
@@ -66,7 +66,7 @@ BEGIN
     LTEXT           "IDC_TRANSL_AUTH",IDC_TRANSL_AUTH,80,64,218,8
     LTEXT           "",IDC_WEBPAGE2,190,55,100,8,NOT WS_VISIBLE | WS_DISABLED
     CONTROL         "",IDC_WEBPAGE,"SysLink",WS_TABSTOP,200,52,100,10
-    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,305,7, 75, 24,WS_EX_TRANSPARENT
+    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,300,7,88,24,WS_EX_TRANSPARENT
     PUSHBUTTON      "Copy Version Text",IDC_COPYVERSTRG,304,35,76,14,BS_FLAT
     CONTROL         "",IDC_RICHEDITABOUT,RICHEDIT_CONTROL_VER,WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | 0x29c4,20,80,360,170
 END
@@ -111,7 +111,6 @@ BEGIN
     CONTROL         "<a>(?)</a>",IDC_WILDCARDHELP,"SysLink",0x0,191,97,14,10
     CONTROL         "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,142,259,9,WS_EX_STATICEDGE
     PUSHBUTTON      "Focused &View",IDC_TOGGLE_VISIBILITY,211,77,55,14
-    SCROLLBAR       IDC_RESIZEGRIP,262,143,10,10
 END
 
 IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 180
@@ -151,7 +150,6 @@ BEGIN
     CONTROL         "<a>(?)</a>",IDC_WILDCARDHELP,"SysLink",0x0,191,126,14,10
     CONTROL         "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,168,259,9,WS_EX_STATICEDGE
     PUSHBUTTON      "Focused &View",IDC_TOGGLE_VISIBILITY,211,106,55,14
-    SCROLLBAR       IDC_RESIZEGRIP,262,169,10,10
 END
 
 IDD_MUI_RUN DIALOGEX 0, 0, 229, 96
@@ -324,7 +322,6 @@ BEGIN
     GROUPBOX        "Info",IDC_INFO_GROUPBOX,180,7,280,127
     LTEXT           "Customise Schemes",IDC_TITLE,264,25,180,12
     EDITTEXT        IDC_STYLEEDIT_HELP,197,54,252,74,ES_MULTILINE | ES_READONLY | NOT WS_BORDER
-    SCROLLBAR       IDC_RESIZEGRIP,7,233,10,10
 END
 
 IDD_MUI_TABSETTINGS DIALOGEX 0, 0, 174, 114
diff --git a/language/np3_en_us/dialogs_en_us.rc b/language/np3_en_us/dialogs_en_us.rc
index d55116b19..4b3f9a58c 100644
--- a/language/np3_en_us/dialogs_en_us.rc
+++ b/language/np3_en_us/dialogs_en_us.rc
@@ -66,7 +66,7 @@ BEGIN
     LTEXT           "IDC_TRANSL_AUTH",IDC_TRANSL_AUTH,80,64,218,8
     LTEXT           "",IDC_WEBPAGE2,190,55,100,8,NOT WS_VISIBLE | WS_DISABLED
     CONTROL         "",IDC_WEBPAGE,"SysLink",WS_TABSTOP,200,52,100,10
-    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,305,7,75,24,WS_EX_TRANSPARENT
+    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,300,7,88,24,WS_EX_TRANSPARENT
     PUSHBUTTON      "Copy Version Text",IDC_COPYVERSTRG,304,35,76,14,BS_FLAT
     CONTROL         "",IDC_RICHEDITABOUT,RICHEDIT_CONTROL_VER,WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | 0x29c4,20,80,360,170
 END
@@ -111,7 +111,6 @@ BEGIN
     CONTROL         "<a>(?)</a>",IDC_WILDCARDHELP,"SysLink",0x0,191,97,14,10
     CONTROL         "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,142,259,9,WS_EX_STATICEDGE
     PUSHBUTTON      "Focused &View",IDC_TOGGLE_VISIBILITY,211,77,55,14
-    SCROLLBAR       IDC_RESIZEGRIP,262,143,10,10
 END
 
 IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 180
@@ -151,7 +150,6 @@ BEGIN
     CONTROL         "<a>(?)</a>",IDC_WILDCARDHELP,"SysLink",0x0,191,126,14,10
     CONTROL         "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,168,259,9,WS_EX_STATICEDGE
     PUSHBUTTON      "Focused &View",IDC_TOGGLE_VISIBILITY,211,106,55,14
-    SCROLLBAR       IDC_RESIZEGRIP,262,169,10,10
 END
 
 IDD_MUI_RUN DIALOGEX 0, 0, 229, 96
@@ -324,7 +322,6 @@ BEGIN
     DEFPUSHBUTTON   "OK",IDOK,355,233,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,410,233,50,14
     EDITTEXT        IDC_STYLEEDIT_HELP,197,54,252,74,ES_MULTILINE | ES_READONLY | NOT WS_BORDER
-    //@@@SCROLLBAR       IDC_RESIZEGRIP,7,233,10,10
 END
 
 IDD_MUI_TABSETTINGS DIALOGEX 0, 0, 174, 114
diff --git a/language/np3_es_es/dialogs_es_es.rc b/language/np3_es_es/dialogs_es_es.rc
index 50be6f08d..a062b6f05 100644
--- a/language/np3_es_es/dialogs_es_es.rc
+++ b/language/np3_es_es/dialogs_es_es.rc
@@ -66,7 +66,7 @@ BEGIN
     LTEXT           "IDC_TRANSL_AUTH",IDC_TRANSL_AUTH,80,64,218,8
     LTEXT           "",IDC_WEBPAGE2,190,55,100,8,NOT WS_VISIBLE | WS_DISABLED
     CONTROL         "",IDC_WEBPAGE,"SysLink",WS_TABSTOP,200,52,100,10
-    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,305,7, 75, 24,WS_EX_TRANSPARENT
+    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,300,7,88,24,WS_EX_TRANSPARENT
     PUSHBUTTON      "Copiar Versión Texto",IDC_COPYVERSTRG,304,35,76,14,BS_FLAT
     CONTROL         "",IDC_RICHEDITABOUT,RICHEDIT_CONTROL_VER,WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | 0x29c4,20,80,360,170
 END
@@ -111,7 +111,6 @@ BEGIN
     CONTROL         "<a>(?)</a>",IDC_WILDCARDHELP,"SysLink",0x0,191,97,14,10
     CONTROL         "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,142,259,9,WS_EX_STATICEDGE
     PUSHBUTTON      "&Vista enfocada",IDC_TOGGLE_VISIBILITY,211,77,55,14
-    SCROLLBAR       IDC_RESIZEGRIP,262,143,10,10
 END
 
 IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 180
@@ -151,7 +150,6 @@ BEGIN
     CONTROL         "<a>(?)</a>",IDC_WILDCARDHELP,"SysLink",0x0,191,126,14,10
     CONTROL         "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,168,259,9,WS_EX_STATICEDGE
     PUSHBUTTON      "&Vista enfocada",IDC_TOGGLE_VISIBILITY,211,106,55,14
-    SCROLLBAR       IDC_RESIZEGRIP,262,169,10,10
 END
 
 IDD_MUI_RUN DIALOGEX 0, 0, 229, 96
@@ -324,7 +322,6 @@ BEGIN
     GROUPBOX        "Información",IDC_INFO_GROUPBOX,180,7,280,127
     LTEXT           "Personalizar esquemas",IDC_TITLE,264,25,180,12
     EDITTEXT        IDC_STYLEEDIT_HELP,197,54,252,74,ES_MULTILINE | ES_READONLY | NOT WS_BORDER
-    SCROLLBAR       IDC_RESIZEGRIP,7,233,10,10
 END
 
 IDD_MUI_TABSETTINGS DIALOGEX 0, 0, 174, 114
diff --git a/language/np3_fr_fr/dialogs_fr_fr.rc b/language/np3_fr_fr/dialogs_fr_fr.rc
index 489ef0392..75e7b18c1 100644
--- a/language/np3_fr_fr/dialogs_fr_fr.rc
+++ b/language/np3_fr_fr/dialogs_fr_fr.rc
@@ -66,7 +66,7 @@ BEGIN
     LTEXT           "IDC_TRANSL_AUTH",IDC_TRANSL_AUTH,80,64,218,8
     LTEXT           "",IDC_WEBPAGE2,190,55,100,8,NOT WS_VISIBLE | WS_DISABLED
     CONTROL         "",IDC_WEBPAGE,"SysLink",WS_TABSTOP,200,52,100,10
-    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,305,7, 75, 24,WS_EX_TRANSPARENT
+    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,300,7,88,24,WS_EX_TRANSPARENT
     PUSHBUTTON      "Copier Versions Texte",IDC_COPYVERSTRG,304,35,76,14,BS_FLAT
     CONTROL         "",IDC_RICHEDITABOUT,RICHEDIT_CONTROL_VER,WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | 0x29c4,20,80,360,170
 END
@@ -111,7 +111,6 @@ BEGIN
     CONTROL         "<a>(?)</a>",IDC_WILDCARDHELP,"SysLink",0x0,191,97,14,10
     CONTROL         "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,142,259,9,WS_EX_STATICEDGE
     PUSHBUTTON      "&Vue focalisée",IDC_TOGGLE_VISIBILITY,211,77,55,14
-    SCROLLBAR       IDC_RESIZEGRIP,262,143,10,10
 END
 
 IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 180
@@ -151,7 +150,6 @@ BEGIN
     CONTROL         "<a>(?)</a>",IDC_WILDCARDHELP,"SysLink",0x0,191,126,14,10
     CONTROL         "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,168,259,9,WS_EX_STATICEDGE
     PUSHBUTTON      "&Vue focalisée",IDC_TOGGLE_VISIBILITY,211,106,55,14
-    SCROLLBAR       IDC_RESIZEGRIP,262,169,10,10
 END
 
 IDD_MUI_RUN DIALOGEX 0, 0, 229, 96
@@ -324,7 +322,6 @@ BEGIN
     GROUPBOX        "Info",IDC_INFO_GROUPBOX,180,7,280,127
     LTEXT           "Personnaliser les Schèmes",IDC_TITLE,264,25,180,12
     EDITTEXT        IDC_STYLEEDIT_HELP,197,54,252,74,ES_MULTILINE | ES_READONLY | NOT WS_BORDER
-    SCROLLBAR       IDC_RESIZEGRIP,7,233,10,10
 END
 
 IDD_MUI_TABSETTINGS DIALOGEX 0, 0, 174, 114
diff --git a/language/np3_hu_hu/dialogs_hu_hu.rc b/language/np3_hu_hu/dialogs_hu_hu.rc
index 6f6cbd76e..fe4ca8c0f 100644
--- a/language/np3_hu_hu/dialogs_hu_hu.rc
+++ b/language/np3_hu_hu/dialogs_hu_hu.rc
@@ -66,7 +66,7 @@ BEGIN
     LTEXT           "IDC_TRANSL_AUTH",IDC_TRANSL_AUTH,80,64,218,8
     LTEXT           "",IDC_WEBPAGE2,190,55,100,8,NOT WS_VISIBLE | WS_DISABLED
     CONTROL         "",IDC_WEBPAGE,"SysLink",WS_TABSTOP,200,52,100,10
-    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,305,7, 75, 24,WS_EX_TRANSPARENT
+    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,300,7,88,24,WS_EX_TRANSPARENT
     PUSHBUTTON      "Verzió másolása",IDC_COPYVERSTRG,304,35,76,14,BS_FLAT
     CONTROL         "",IDC_RICHEDITABOUT,RICHEDIT_CONTROL_VER,WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | 0x29c4,20,80,360,170
 END
@@ -111,7 +111,6 @@ BEGIN
     CONTROL         "<a>(?)</a>",IDC_WILDCARDHELP,"SysLink",0x0,191,97,14,10
     CONTROL         "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,142,259,9,WS_EX_STATICEDGE
     PUSHBUTTON      "F&ókuszált nézet",IDC_TOGGLE_VISIBILITY,211,77,55,14
-    SCROLLBAR       IDC_RESIZEGRIP,262,143,10,10
 END
 
 IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 180
@@ -151,7 +150,6 @@ BEGIN
     CONTROL         "<a>(?)</a>",IDC_WILDCARDHELP,"SysLink",0x0,191,126,14,10
     CONTROL         "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,168,259,9,WS_EX_STATICEDGE
     PUSHBUTTON      "F&ókuszált nézet",IDC_TOGGLE_VISIBILITY,211,106,55,14
-    SCROLLBAR       IDC_RESIZEGRIP,262,169,10,10
 END
 
 IDD_MUI_RUN DIALOGEX 0, 0, 229, 96
@@ -324,7 +322,6 @@ BEGIN
     GROUPBOX        "Info",IDC_INFO_GROUPBOX,180,7,280,127
     LTEXT           "Színkiemelések testreszabása",IDC_TITLE,264,25,180,12
     EDITTEXT        IDC_STYLEEDIT_HELP,197,54,252,74,ES_MULTILINE | ES_READONLY | NOT WS_BORDER
-    SCROLLBAR       IDC_RESIZEGRIP,7,233,10,10
 END
 
 IDD_MUI_TABSETTINGS DIALOGEX 0, 0, 174, 114
diff --git a/language/np3_id_id/dialogs_id_id.rc b/language/np3_id_id/dialogs_id_id.rc
index 36b12737f..28805b256 100644
--- a/language/np3_id_id/dialogs_id_id.rc
+++ b/language/np3_id_id/dialogs_id_id.rc
@@ -66,7 +66,7 @@ BEGIN
     LTEXT           "IDC_TRANSL_AUTH",IDC_TRANSL_AUTH,80,64,218,8
     LTEXT           "",IDC_WEBPAGE2,190,55,100,8,NOT WS_VISIBLE | WS_DISABLED
     CONTROL         "",IDC_WEBPAGE,"SysLink",WS_TABSTOP,200,52,100,10
-    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,305,7, 75, 24,WS_EX_TRANSPARENT
+    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,300,7,88,24,WS_EX_TRANSPARENT
     PUSHBUTTON      "Copy Version Text",IDC_COPYVERSTRG,304,35,76,14,BS_FLAT
     CONTROL         "",IDC_RICHEDITABOUT,RICHEDIT_CONTROL_VER,WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | 0x29c4,20,80,360,170
 END
@@ -111,7 +111,6 @@ BEGIN
     CONTROL         "<a>(?)</a>",IDC_WILDCARDHELP,"SysLink",0x0,191,97,14,10
     CONTROL         "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,142,259,9,WS_EX_STATICEDGE
     PUSHBUTTON      "Focused &View",IDC_TOGGLE_VISIBILITY,211,77,55,14
-    SCROLLBAR       IDC_RESIZEGRIP,262,143,10,10
 END
 
 IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 180
@@ -151,7 +150,6 @@ BEGIN
     CONTROL         "<a>(?)</a>",IDC_WILDCARDHELP,"SysLink",0x0,191,126,14,10
     CONTROL         "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,168,259,9,WS_EX_STATICEDGE
     PUSHBUTTON      "Focused &View",IDC_TOGGLE_VISIBILITY,211,106,55,14
-    SCROLLBAR       IDC_RESIZEGRIP,262,169,10,10
 END
 
 IDD_MUI_RUN DIALOGEX 0, 0, 229, 96
@@ -324,7 +322,6 @@ BEGIN
     GROUPBOX        "Info",IDC_INFO_GROUPBOX,180,7,280,127
     LTEXT           "Customise Schemes",IDC_TITLE,264,25,180,12
     EDITTEXT        IDC_STYLEEDIT_HELP,197,54,252,74,ES_MULTILINE | ES_READONLY | NOT WS_BORDER
-    SCROLLBAR       IDC_RESIZEGRIP,7,233,10,10
 END
 
 IDD_MUI_TABSETTINGS DIALOGEX 0, 0, 174, 114
diff --git a/language/np3_it_it/dialogs_it_it.rc b/language/np3_it_it/dialogs_it_it.rc
index b37531373..2338a0c73 100644
--- a/language/np3_it_it/dialogs_it_it.rc
+++ b/language/np3_it_it/dialogs_it_it.rc
@@ -66,7 +66,7 @@ BEGIN
     LTEXT           "IDC_TRANSL_AUTH",IDC_TRANSL_AUTH,80,64,218,8
     LTEXT           "",IDC_WEBPAGE2,190,55,100,8,NOT WS_VISIBLE | WS_DISABLED
     CONTROL         "",IDC_WEBPAGE,"SysLink",WS_TABSTOP,200,52,100,10
-    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,305,7, 75, 24,WS_EX_TRANSPARENT
+    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,300,7,88,24,WS_EX_TRANSPARENT
     PUSHBUTTON      "Copia testo versione",IDC_COPYVERSTRG,304,35,76,14,BS_FLAT
     CONTROL         "",IDC_RICHEDITABOUT,RICHEDIT_CONTROL_VER,WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | 0x29c4,20,80,360,170
 END
@@ -324,7 +324,6 @@ BEGIN
     GROUPBOX        "Info",IDC_INFO_GROUPBOX,180,7,280,127
     LTEXT           "Personalizza Schemi",IDC_TITLE,264,25,180,12
     EDITTEXT        IDC_STYLEEDIT_HELP,197,54,252,74,ES_MULTILINE | ES_READONLY | NOT WS_BORDER
-    SCROLLBAR       IDC_RESIZEGRIP,7,233,10,10
 END
 
 IDD_MUI_TABSETTINGS DIALOGEX 0, 0, 174, 114
diff --git a/language/np3_ja_jp/dialogs_ja_jp.rc b/language/np3_ja_jp/dialogs_ja_jp.rc
index e0108a4f2..3c88a0f4c 100644
--- a/language/np3_ja_jp/dialogs_ja_jp.rc
+++ b/language/np3_ja_jp/dialogs_ja_jp.rc
@@ -66,7 +66,7 @@ BEGIN
     LTEXT           "IDC_TRANSL_AUTH",IDC_TRANSL_AUTH,80,64,218,8
     LTEXT           "",IDC_WEBPAGE2,190,55,100,8,NOT WS_VISIBLE | WS_DISABLED
     CONTROL         "",IDC_WEBPAGE,"SysLink",WS_TABSTOP,200,52,100,10
-    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,305,7, 75, 24,WS_EX_TRANSPARENT
+    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,300,7,88,24,WS_EX_TRANSPARENT
     PUSHBUTTON      "バージョン情報のコピー",IDC_COPYVERSTRG,304,35,76,14,BS_FLAT
     CONTROL         "",IDC_RICHEDITABOUT,RICHEDIT_CONTROL_VER,WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | 0x29c4,20,80,360,170
 END
@@ -111,7 +111,6 @@ BEGIN
     CONTROL         "<a>(?)</a>",IDC_WILDCARDHELP,"SysLink",0x0,191,97,14,10
     CONTROL         "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,142,259,9,WS_EX_STATICEDGE
     PUSHBUTTON      "一望モード(&V)",IDC_TOGGLE_VISIBILITY,211,77,55,14
-    SCROLLBAR       IDC_RESIZEGRIP,262,143,10,10
 END
 
 IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 180
@@ -151,7 +150,6 @@ BEGIN
     CONTROL         "<a>(?)</a>",IDC_WILDCARDHELP,"SysLink",0x0,191,126,14,10
     CONTROL         "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,168,259,9,WS_EX_STATICEDGE
     PUSHBUTTON      "一望モード(&V)",IDC_TOGGLE_VISIBILITY,211,106,55,14
-    SCROLLBAR       IDC_RESIZEGRIP,262,169,10,10
 END
 
 IDD_MUI_RUN DIALOGEX 0, 0, 229, 96
@@ -324,7 +322,6 @@ BEGIN
     GROUPBOX        "説明",IDC_INFO_GROUPBOX,180,7,280,127
     LTEXT           "色とフォントの指定方法",IDC_TITLE,264,25,180,12
     EDITTEXT        IDC_STYLEEDIT_HELP,197,54,252,74,ES_MULTILINE | ES_READONLY | NOT WS_BORDER
-    SCROLLBAR       IDC_RESIZEGRIP,7,233,10,10
 END
 
 IDD_MUI_TABSETTINGS DIALOGEX 0, 0, 174, 114
diff --git a/language/np3_ko_kr/dialogs_ko_kr.rc b/language/np3_ko_kr/dialogs_ko_kr.rc
index 11103aa5e..d2205ae28 100644
--- a/language/np3_ko_kr/dialogs_ko_kr.rc
+++ b/language/np3_ko_kr/dialogs_ko_kr.rc
@@ -66,7 +66,7 @@ BEGIN
     LTEXT           "IDC_TRANSL_AUTH",IDC_TRANSL_AUTH,80,64,218,8
     LTEXT           "",IDC_WEBPAGE2,190,55,100,8,NOT WS_VISIBLE | WS_DISABLED
     CONTROL         "",IDC_WEBPAGE,"SysLink",WS_TABSTOP,200,52,100,10
-    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,305,7, 75, 24,WS_EX_TRANSPARENT
+    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,300,7,88,24,WS_EX_TRANSPARENT
     PUSHBUTTON      "Copy Version Text",IDC_COPYVERSTRG,304,35,76,14,BS_FLAT
     CONTROL         "",IDC_RICHEDITABOUT,RICHEDIT_CONTROL_VER,WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | 0x29c4,20,80,360,170
 END
@@ -324,7 +324,6 @@ BEGIN
     GROUPBOX        "정보",IDC_INFO_GROUPBOX,180,7,280,127
     LTEXT           "스키마 편집",IDC_TITLE,264,25,180,12
     EDITTEXT        IDC_STYLEEDIT_HELP,197,54,252,74,ES_MULTILINE | ES_READONLY | NOT WS_BORDER
-    SCROLLBAR       IDC_RESIZEGRIP,7,233,10,10
 END
 
 IDD_MUI_TABSETTINGS DIALOGEX 0, 0, 174, 114
diff --git a/language/np3_nl_nl/dialogs_nl_nl.rc b/language/np3_nl_nl/dialogs_nl_nl.rc
index 34ea42244..707c98e16 100644
--- a/language/np3_nl_nl/dialogs_nl_nl.rc
+++ b/language/np3_nl_nl/dialogs_nl_nl.rc
@@ -66,7 +66,7 @@ BEGIN
     LTEXT           "IDC_TRANSL_AUTH",IDC_TRANSL_AUTH,80,64,218,8
     LTEXT           "",IDC_WEBPAGE2,190,55,100,8,NOT WS_VISIBLE | WS_DISABLED
     CONTROL         "",IDC_WEBPAGE,"SysLink",WS_TABSTOP,200,52,100,10
-    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,305,7, 75, 24,WS_EX_TRANSPARENT
+    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,300,7,88,24,WS_EX_TRANSPARENT
     PUSHBUTTON      "Kopieer Versies Tekst",IDC_COPYVERSTRG,304,35,76,14,BS_FLAT
     CONTROL         "",IDC_RICHEDITABOUT,RICHEDIT_CONTROL_VER,WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | 0x29c4,20,80,360,170
 END
@@ -111,7 +111,6 @@ BEGIN
     CONTROL         "<a>(?)</a>",IDC_WILDCARDHELP,"SysLink",0x0,191,97,14,10
     CONTROL         "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,142,259,9,WS_EX_STATICEDGE
     PUSHBUTTON      "Gefocust &zicht",IDC_TOGGLE_VISIBILITY,211,77,55,14
-    SCROLLBAR       IDC_RESIZEGRIP,262,143,10,10
 END
 
 IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 180
@@ -151,7 +150,6 @@ BEGIN
     CONTROL         "<a>(?)</a>",IDC_WILDCARDHELP,"SysLink",0x0,191,126,14,10
     CONTROL         "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,168,259,9,WS_EX_STATICEDGE
     PUSHBUTTON      "Gefocust &zicht",IDC_TOGGLE_VISIBILITY,211,106,55,14
-    SCROLLBAR       IDC_RESIZEGRIP,262,169,10,10
 END
 
 IDD_MUI_RUN DIALOGEX 0, 0, 229, 96
@@ -324,7 +322,6 @@ BEGIN
     GROUPBOX        "Info",IDC_INFO_GROUPBOX,180,7,280,127
     LTEXT           "Aanpassen Schema's",IDC_TITLE,264,25,180,12
     EDITTEXT        IDC_STYLEEDIT_HELP,197,50,262,74,ES_MULTILINE | ES_READONLY | NOT WS_BORDER
-    SCROLLBAR       IDC_RESIZEGRIP,7,233,10,10
 END
 
 IDD_MUI_TABSETTINGS DIALOGEX 0, 0, 174, 114
diff --git a/language/np3_pl_pl/dialogs_pl_pl.rc b/language/np3_pl_pl/dialogs_pl_pl.rc
index 4f7b30c56..c7f27e82b 100644
--- a/language/np3_pl_pl/dialogs_pl_pl.rc
+++ b/language/np3_pl_pl/dialogs_pl_pl.rc
@@ -66,7 +66,7 @@ BEGIN
     LTEXT           "IDC_TRANSL_AUTH",IDC_TRANSL_AUTH,80,64,218,8
     LTEXT           "",IDC_WEBPAGE2,190,55,100,8,NOT WS_VISIBLE | WS_DISABLED
     CONTROL         "",IDC_WEBPAGE,"SysLink",WS_TABSTOP,200,52,100,10
-    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,305,7, 75, 24,WS_EX_TRANSPARENT
+    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,300,7,88,24,WS_EX_TRANSPARENT
     PUSHBUTTON      "Kopiuj tekst wersji",IDC_COPYVERSTRG,304,35,76,14,BS_FLAT
     CONTROL         "",IDC_RICHEDITABOUT,RICHEDIT_CONTROL_VER,WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | 0x29c4,20,80,360,170
 END
@@ -111,7 +111,6 @@ BEGIN
     CONTROL         "<a>(?)</a>",IDC_WILDCARDHELP,"SysLink",0x0,191,97,14,10
     CONTROL         "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,142,259,9,WS_EX_STATICEDGE
     PUSHBUTTON      "Widok skupiony",IDC_TOGGLE_VISIBILITY,211,77,55,14
-    SCROLLBAR       IDC_RESIZEGRIP,262,143,10,10
 END
 
 IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 180
@@ -151,7 +150,6 @@ BEGIN
     CONTROL         "<a>(?)</a>",IDC_WILDCARDHELP,"SysLink",0x0,191,126,14,10
     CONTROL         "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,168,259,9,WS_EX_STATICEDGE
     PUSHBUTTON      "Widok skupiony",IDC_TOGGLE_VISIBILITY,211,106,55,14
-    SCROLLBAR       IDC_RESIZEGRIP,262,169,10,10
 END
 
 IDD_MUI_RUN DIALOGEX 0, 0, 229, 96
@@ -324,7 +322,6 @@ BEGIN
     GROUPBOX        "Info",IDC_INFO_GROUPBOX,180,7,280,127
     LTEXT           "Dostosuj schematy",IDC_TITLE,264,25,180,12
     EDITTEXT        IDC_STYLEEDIT_HELP,197,54,252,74,ES_MULTILINE | ES_READONLY | NOT WS_BORDER
-    SCROLLBAR       IDC_RESIZEGRIP,7,233,10,10
 END
 
 IDD_MUI_TABSETTINGS DIALOGEX 0, 0, 174, 114
diff --git a/language/np3_pt_br/dialogs_pt_br.rc b/language/np3_pt_br/dialogs_pt_br.rc
index 41d55ae51..dcc6b0d7c 100644
--- a/language/np3_pt_br/dialogs_pt_br.rc
+++ b/language/np3_pt_br/dialogs_pt_br.rc
@@ -66,7 +66,7 @@ BEGIN
     LTEXT           "IDC_TRANSL_AUTH",IDC_TRANSL_AUTH,80,64,218,8
     LTEXT           "",IDC_WEBPAGE2,190,55,100,8,NOT WS_VISIBLE | WS_DISABLED
     CONTROL         "",IDC_WEBPAGE,"SysLink",WS_TABSTOP,200,52,100,10
-    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,305,7, 75, 24,WS_EX_TRANSPARENT
+    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,300,7,88,24,WS_EX_TRANSPARENT
     PUSHBUTTON      "Copy Version Text",IDC_COPYVERSTRG,304,35,76,14,BS_FLAT
     CONTROL         "",IDC_RICHEDITABOUT,RICHEDIT_CONTROL_VER,WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | 0x29c4,20,80,360,170
 END
@@ -111,7 +111,6 @@ BEGIN
     CONTROL         "<a>(?)</a>",IDC_WILDCARDHELP,"SysLink",0x0,191,97,14,10
     CONTROL         "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,142,259,9,WS_EX_STATICEDGE
     PUSHBUTTON      "Focused &View",IDC_TOGGLE_VISIBILITY,211,77,55,14
-    SCROLLBAR       IDC_RESIZEGRIP,262,143,10,10
 END
 
 IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 180
@@ -151,7 +150,6 @@ BEGIN
     CONTROL         "<a>(?)</a>",IDC_WILDCARDHELP,"SysLink",0x0,191,126,14,10
     CONTROL         "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,168,259,9,WS_EX_STATICEDGE
     PUSHBUTTON      "Focused &View",IDC_TOGGLE_VISIBILITY,211,106,55,14
-    SCROLLBAR       IDC_RESIZEGRIP,262,169,10,10
 END
 
 IDD_MUI_RUN DIALOGEX 0, 0, 229, 96
@@ -324,7 +322,6 @@ BEGIN
     GROUPBOX        "Info",IDC_INFO_GROUPBOX,180,7,280,127
     LTEXT           "Customise Schemes",IDC_TITLE,264,25,180,12
     EDITTEXT        IDC_STYLEEDIT_HELP,197,54,252,74,ES_MULTILINE | ES_READONLY | NOT WS_BORDER
-    SCROLLBAR       IDC_RESIZEGRIP,7,233,10,10
 END
 
 IDD_MUI_TABSETTINGS DIALOGEX 0, 0, 174, 114
diff --git a/language/np3_pt_pt/dialogs_pt_pt.rc b/language/np3_pt_pt/dialogs_pt_pt.rc
index d62bf0ed2..1239862fb 100644
--- a/language/np3_pt_pt/dialogs_pt_pt.rc
+++ b/language/np3_pt_pt/dialogs_pt_pt.rc
@@ -66,7 +66,7 @@ BEGIN
     LTEXT           "IDC_TRANSL_AUTH",IDC_TRANSL_AUTH,80,64,218,8
     LTEXT           "",IDC_WEBPAGE2,190,55,100,8,NOT WS_VISIBLE | WS_DISABLED
     CONTROL         "",IDC_WEBPAGE,"SysLink",WS_TABSTOP,200,52,100,10
-    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,305,7, 75, 24,WS_EX_TRANSPARENT
+    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,300,7,88,24,WS_EX_TRANSPARENT
     PUSHBUTTON      "Copiar texto da versão",IDC_COPYVERSTRG,304,35,76,14,BS_FLAT
     CONTROL         "",IDC_RICHEDITABOUT,RICHEDIT_CONTROL_VER,WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | 0x29c4,20,80,360,170
 END
@@ -111,7 +111,6 @@ BEGIN
     CONTROL         "<a>(?)</a>",IDC_WILDCARDHELP,"SysLink",0x0,191,97,14,10
     CONTROL         "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,142,259,9,WS_EX_STATICEDGE
     PUSHBUTTON      "&Vista realçada",IDC_TOGGLE_VISIBILITY,211,77,55,14
-    SCROLLBAR       IDC_RESIZEGRIP,262,143,10,10
 END
 
 IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 180
@@ -151,7 +150,6 @@ BEGIN
     CONTROL         "<a>(?)</a>",IDC_WILDCARDHELP,"SysLink",0x0,191,126,14,10
     CONTROL         "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,168,259,9,WS_EX_STATICEDGE
     PUSHBUTTON      "&Vista realçada",IDC_TOGGLE_VISIBILITY,211,106,55,14
-    SCROLLBAR       IDC_RESIZEGRIP,262,169,10,10
 END
 
 IDD_MUI_RUN DIALOGEX 0, 0, 229, 96
@@ -324,7 +322,6 @@ BEGIN
     GROUPBOX        "Info",IDC_INFO_GROUPBOX,180,7,280,127
     LTEXT           "Personalizar esquemas",IDC_TITLE,264,25,180,12
     EDITTEXT        IDC_STYLEEDIT_HELP,197,54,252,74,ES_MULTILINE | ES_READONLY | NOT WS_BORDER
-    SCROLLBAR       IDC_RESIZEGRIP,7,233,10,10
 END
 
 IDD_MUI_TABSETTINGS DIALOGEX 0, 0, 174, 114
diff --git a/language/np3_ru_ru/dialogs_ru_ru.rc b/language/np3_ru_ru/dialogs_ru_ru.rc
index 5f7a9ada0..cc77f3b27 100644
--- a/language/np3_ru_ru/dialogs_ru_ru.rc
+++ b/language/np3_ru_ru/dialogs_ru_ru.rc
@@ -66,7 +66,7 @@ BEGIN
     LTEXT           "IDC_TRANSL_AUTH",IDC_TRANSL_AUTH,80,64,218,8
     LTEXT           "",IDC_WEBPAGE2,190,55,100,8,NOT WS_VISIBLE | WS_DISABLED
     CONTROL         "",IDC_WEBPAGE,"SysLink",WS_TABSTOP,200,52,100,10
-    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,305,7, 75, 24,WS_EX_TRANSPARENT
+    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,300,7,88,24,WS_EX_TRANSPARENT
     PUSHBUTTON      "Копировать версию",IDC_COPYVERSTRG,304,35,76,14,BS_FLAT
     CONTROL         "",IDC_RICHEDITABOUT,RICHEDIT_CONTROL_VER,WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | 0x29c4,20,80,360,170
 END
@@ -324,7 +324,6 @@ BEGIN
     GROUPBOX        "Информация",IDC_INFO_GROUPBOX,180,7,280,127
     LTEXT           "Настройка схем",IDC_TITLE,264,25,180,12
     EDITTEXT        IDC_STYLEEDIT_HELP,197,54,252,74,ES_MULTILINE | ES_READONLY | NOT WS_BORDER
-    SCROLLBAR       IDC_RESIZEGRIP,7,233,10,10
 END
 
 IDD_MUI_TABSETTINGS DIALOGEX 0, 0, 192, 114
diff --git a/language/np3_sk_sk/dialogs_sk_sk.rc b/language/np3_sk_sk/dialogs_sk_sk.rc
index d8f340e6a..166a807df 100644
--- a/language/np3_sk_sk/dialogs_sk_sk.rc
+++ b/language/np3_sk_sk/dialogs_sk_sk.rc
@@ -66,7 +66,7 @@ BEGIN
     LTEXT           "IDC_TRANSL_AUTH",IDC_TRANSL_AUTH,80,64,218,8
     LTEXT           "",IDC_WEBPAGE2,190,55,100,8,NOT WS_VISIBLE | WS_DISABLED
     CONTROL         "",IDC_WEBPAGE,"SysLink",WS_TABSTOP,200,52,100,10
-    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,305,7, 75, 24,WS_EX_TRANSPARENT
+    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,300,7,88,24,WS_EX_TRANSPARENT
     PUSHBUTTON      "Kopírovať text verzie",IDC_COPYVERSTRG,304,35,76,14,BS_FLAT
     CONTROL         "",IDC_RICHEDITABOUT,RICHEDIT_CONTROL_VER,WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | 0x29c4,20,80,360,170
 END
@@ -111,7 +111,6 @@ BEGIN
     CONTROL         "<a>(?)</a>",IDC_WILDCARDHELP,"SysLink",0x0,191,97,14,10
     CONTROL         "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,142,259,9,WS_EX_STATICEDGE
     PUSHBUTTON      "Za&meranie",IDC_TOGGLE_VISIBILITY,211,77,55,14
-    SCROLLBAR       IDC_RESIZEGRIP,262,143,10,10
 END
 
 IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 180
@@ -151,7 +150,6 @@ BEGIN
     CONTROL         "<a>(?)</a>",IDC_WILDCARDHELP,"SysLink",0x0,191,126,14,10
     CONTROL         "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,168,259,9,WS_EX_STATICEDGE
     PUSHBUTTON      "Za&meranie",IDC_TOGGLE_VISIBILITY,211,106,55,14
-    SCROLLBAR       IDC_RESIZEGRIP,262,169,10,10
 END
 
 IDD_MUI_RUN DIALOGEX 0, 0, 229, 96
@@ -324,7 +322,6 @@ BEGIN
     GROUPBOX        " Informácie ",IDC_INFO_GROUPBOX,180,7,280,127
     LTEXT           "Prispôsobenie schémy",IDC_TITLE,264,25,180,12
     EDITTEXT        IDC_STYLEEDIT_HELP,197,54,252,74,ES_MULTILINE | ES_READONLY | NOT WS_BORDER
-    SCROLLBAR       IDC_RESIZEGRIP,7,233,10,10
 END
 
 IDD_MUI_TABSETTINGS DIALOGEX 0, 0, 174, 114
diff --git a/language/np3_sv_se/dialogs_sv_se.rc b/language/np3_sv_se/dialogs_sv_se.rc
index 19fe69ad7..daa8ee591 100644
--- a/language/np3_sv_se/dialogs_sv_se.rc
+++ b/language/np3_sv_se/dialogs_sv_se.rc
@@ -66,7 +66,7 @@ BEGIN
     LTEXT           "IDC_TRANSL_AUTH",IDC_TRANSL_AUTH,80,64,218,8
     LTEXT           "",IDC_WEBPAGE2,190,55,100,8,NOT WS_VISIBLE | WS_DISABLED
     CONTROL         "",IDC_WEBPAGE,"SysLink",WS_TABSTOP,200,52,100,10
-    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,305,7, 75, 24,WS_EX_TRANSPARENT
+    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,300,7,88,24,WS_EX_TRANSPARENT
     PUSHBUTTON      "Kopiera versionstext",IDC_COPYVERSTRG,304,35,76,14,BS_FLAT
     CONTROL         "",IDC_RICHEDITABOUT,RICHEDIT_CONTROL_VER,WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | 0x29c4,20,80,360,170
 END
@@ -111,7 +111,6 @@ BEGIN
     CONTROL         "<a>(?)</a>",IDC_WILDCARDHELP,"SysLink",0x0,195,97,14,10
     CONTROL         "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,142,259,9,WS_EX_STATICEDGE
     PUSHBUTTON      "Fokuserad vy",IDC_TOGGLE_VISIBILITY,211,77,55,14
-    SCROLLBAR       IDC_RESIZEGRIP,262,143,10,10
 END
 
 IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 180
@@ -151,7 +150,6 @@ BEGIN
     CONTROL         "<a>(?)</a>",IDC_WILDCARDHELP,"SysLink",0x0,195,126,14,10
     CONTROL         "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,168,259,9,WS_EX_STATICEDGE
     PUSHBUTTON      "Fokuserad vy",IDC_TOGGLE_VISIBILITY,211,106,55,14
-    SCROLLBAR       IDC_RESIZEGRIP,262,169,10,10
 END
 
 IDD_MUI_RUN DIALOGEX 0, 0, 229, 96
@@ -324,7 +322,6 @@ BEGIN
     GROUPBOX        "Info",IDC_INFO_GROUPBOX,180,7,280,127
     LTEXT           "Anpassa scheman",IDC_TITLE,264,25,180,12
     EDITTEXT        IDC_STYLEEDIT_HELP,197,54,252,74,ES_MULTILINE | ES_READONLY | NOT WS_BORDER
-    SCROLLBAR       IDC_RESIZEGRIP,7,233,10,10
 END
 
 IDD_MUI_TABSETTINGS DIALOGEX 0, 0, 174, 114
diff --git a/language/np3_tr_tr/dialogs_tr_tr.rc b/language/np3_tr_tr/dialogs_tr_tr.rc
index 0572fa6a1..bc26ae708 100644
--- a/language/np3_tr_tr/dialogs_tr_tr.rc
+++ b/language/np3_tr_tr/dialogs_tr_tr.rc
@@ -66,7 +66,7 @@ BEGIN
     LTEXT           "IDC_TRANSL_AUTH",IDC_TRANSL_AUTH,80,64,218,8
     LTEXT           "",IDC_WEBPAGE2,190,55,100,8,NOT WS_VISIBLE | WS_DISABLED
     CONTROL         "",IDC_WEBPAGE,"SysLink",WS_TABSTOP,200,52,100,10
-    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,305,7, 75, 24,WS_EX_TRANSPARENT
+    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,300,7,88,24,WS_EX_TRANSPARENT
     PUSHBUTTON      "Copy Version Text",IDC_COPYVERSTRG,304,35,76,14,BS_FLAT
     CONTROL         "",IDC_RICHEDITABOUT,RICHEDIT_CONTROL_VER,WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | 0x29c4,20,80,360,170
 END
@@ -111,7 +111,6 @@ BEGIN
     CONTROL         "<a>(?)</a>",IDC_WILDCARDHELP,"SysLink",0x0,191,97,14,10
     CONTROL         "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,142,259,9,WS_EX_STATICEDGE
     PUSHBUTTON      "Focused &View",IDC_TOGGLE_VISIBILITY,211,77,55,14
-    SCROLLBAR       IDC_RESIZEGRIP,262,143,10,10
 END
 
 IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 180
@@ -151,7 +150,6 @@ BEGIN
     CONTROL         "<a>(?)</a>",IDC_WILDCARDHELP,"SysLink",0x0,191,126,14,10
     CONTROL         "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,168,259,9,WS_EX_STATICEDGE
     PUSHBUTTON      "Focused &View",IDC_TOGGLE_VISIBILITY,211,106,55,14
-    SCROLLBAR       IDC_RESIZEGRIP,262,169,10,10
 END
 
 IDD_MUI_RUN DIALOGEX 0, 0, 229, 96
@@ -324,7 +322,6 @@ BEGIN
     GROUPBOX        "Info",IDC_INFO_GROUPBOX,180,7,280,127
     LTEXT           "Customise Schemes",IDC_TITLE,264,25,180,12
     EDITTEXT        IDC_STYLEEDIT_HELP,197,54,252,74,ES_MULTILINE | ES_READONLY | NOT WS_BORDER
-    SCROLLBAR       IDC_RESIZEGRIP,7,233,10,10
 END
 
 IDD_MUI_TABSETTINGS DIALOGEX 0, 0, 174, 114
diff --git a/language/np3_vi_vn/dialogs_vi_vn.rc b/language/np3_vi_vn/dialogs_vi_vn.rc
index 7dec30d4c..5116cb9b3 100644
--- a/language/np3_vi_vn/dialogs_vi_vn.rc
+++ b/language/np3_vi_vn/dialogs_vi_vn.rc
@@ -66,7 +66,7 @@ BEGIN
     LTEXT           "IDC_TRANSL_AUTH",IDC_TRANSL_AUTH,80,64,218,8
     LTEXT           "",IDC_WEBPAGE2,190,55,100,8,NOT WS_VISIBLE | WS_DISABLED
     CONTROL         "",IDC_WEBPAGE,"SysLink",WS_TABSTOP,200,52,100,10
-    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,305,7, 75, 24,WS_EX_TRANSPARENT
+    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,300,7,88,24,WS_EX_TRANSPARENT
     PUSHBUTTON      "Copy Version Text",IDC_COPYVERSTRG,304,35,76,14,BS_FLAT
     CONTROL         "",IDC_RICHEDITABOUT,RICHEDIT_CONTROL_VER,WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | 0x29c4,20,80,360,170
 END
@@ -111,7 +111,6 @@ BEGIN
     CONTROL         "<a>(?)</a>",IDC_WILDCARDHELP,"SysLink",0x0,191,97,14,10
     CONTROL         "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,142,259,9,WS_EX_STATICEDGE
     PUSHBUTTON      "Focused &View",IDC_TOGGLE_VISIBILITY,211,77,55,14
-    SCROLLBAR       IDC_RESIZEGRIP,262,143,10,10
 END
 
 IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 180
@@ -151,7 +150,6 @@ BEGIN
     CONTROL         "<a>(?)</a>",IDC_WILDCARDHELP,"SysLink",0x0,191,126,14,10
     CONTROL         "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,168,259,9,WS_EX_STATICEDGE
     PUSHBUTTON      "Focused &View",IDC_TOGGLE_VISIBILITY,211,106,55,14
-    SCROLLBAR       IDC_RESIZEGRIP,262,169,10,10
 END
 
 IDD_MUI_RUN DIALOGEX 0, 0, 229, 96
@@ -324,7 +322,6 @@ BEGIN
     GROUPBOX        "Info",IDC_INFO_GROUPBOX,180,7,280,127
     LTEXT           "Customise Schemes",IDC_TITLE,264,25,180,12
     EDITTEXT        IDC_STYLEEDIT_HELP,197,54,252,74,ES_MULTILINE | ES_READONLY | NOT WS_BORDER
-    SCROLLBAR       IDC_RESIZEGRIP,7,233,10,10
 END
 
 IDD_MUI_TABSETTINGS DIALOGEX 0, 0, 174, 114
diff --git a/language/np3_zh_cn/dialogs_zh_cn.rc b/language/np3_zh_cn/dialogs_zh_cn.rc
index d4dd591c4..8e96a8d3d 100644
--- a/language/np3_zh_cn/dialogs_zh_cn.rc
+++ b/language/np3_zh_cn/dialogs_zh_cn.rc
@@ -66,7 +66,7 @@ BEGIN
     LTEXT           "IDC_TRANSL_AUTH",IDC_TRANSL_AUTH,80,64,218,8
     LTEXT           "",IDC_WEBPAGE2,190,55,100,8,NOT WS_VISIBLE | WS_DISABLED
     CONTROL         "",IDC_WEBPAGE,"SysLink",WS_TABSTOP,200,52,100,10
-    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,305,7, 75, 24,WS_EX_TRANSPARENT
+    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,300,7,88,24,WS_EX_TRANSPARENT
     PUSHBUTTON      "复制版本信息(&C)",IDC_COPYVERSTRG,304,35,76,14,BS_FLAT
     CONTROL         "",IDC_RICHEDITABOUT,RICHEDIT_CONTROL_VER,WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | 0x29c4,20,80,360,171
 END
@@ -111,7 +111,6 @@ BEGIN
     CONTROL         "<a>(?)</a>",IDC_WILDCARDHELP,"SysLink",0x0,191,97,14,10
     CONTROL         "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,142,259,9,WS_EX_STATICEDGE
     PUSHBUTTON      "仅显示匹配行(&V)",IDC_TOGGLE_VISIBILITY,211,77,55,14
-    SCROLLBAR       IDC_RESIZEGRIP,262,143,10,10
 END
 
 IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 180
@@ -151,7 +150,6 @@ BEGIN
     CONTROL         "<a>(?)</a>",IDC_WILDCARDHELP,"SysLink",0x0,191,126,14,10
     CONTROL         "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,168,259,9,WS_EX_STATICEDGE
     PUSHBUTTON      "仅显示匹配行(&V)",IDC_TOGGLE_VISIBILITY,211,106,55,14
-    SCROLLBAR       IDC_RESIZEGRIP,262,169,10,10
 END
 
 IDD_MUI_RUN DIALOGEX 0, 0, 229, 96
@@ -324,7 +322,6 @@ BEGIN
     GROUPBOX        "提示信息",IDC_INFO_GROUPBOX,180,7,280,127
     LTEXT           "自定义语法高亮方案",IDC_TITLE,264,25,180,12
     EDITTEXT        IDC_STYLEEDIT_HELP,197,54,252,74,ES_MULTILINE | ES_READONLY | NOT WS_BORDER
-    SCROLLBAR       IDC_RESIZEGRIP,7,233,10,10
 END
 
 IDD_MUI_TABSETTINGS DIALOGEX 0, 0, 174, 114
diff --git a/language/np3_zh_tw/dialogs_zh_tw.rc b/language/np3_zh_tw/dialogs_zh_tw.rc
index 621066c76..2b29057f0 100644
--- a/language/np3_zh_tw/dialogs_zh_tw.rc
+++ b/language/np3_zh_tw/dialogs_zh_tw.rc
@@ -66,7 +66,7 @@ BEGIN
     LTEXT           "IDC_TRANSL_AUTH",IDC_TRANSL_AUTH,80,64,218,8
     LTEXT           "",IDC_WEBPAGE2,190,55,100,8,NOT WS_VISIBLE | WS_DISABLED
     CONTROL         "",IDC_WEBPAGE,"SysLink",WS_TABSTOP,200,52,100,10
-    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,305,7, 75, 24,WS_EX_TRANSPARENT
+    CONTROL         IDR_RIZBITMAP,IDC_RIZONEBMP,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZECONTROL,300,7,88,24,WS_EX_TRANSPARENT
     PUSHBUTTON      "Copy Version Text",IDC_COPYVERSTRG,304,35,76,14,BS_FLAT
     CONTROL         "",IDC_RICHEDITABOUT,RICHEDIT_CONTROL_VER,WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | 0x29c4,20,80,360,170
 END
@@ -111,7 +111,6 @@ BEGIN
     CONTROL         "<a>(?)</a>",IDC_WILDCARDHELP,"SysLink",0x0,191,97,14,10
     CONTROL         "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,142,259,9,WS_EX_STATICEDGE
     PUSHBUTTON      "Focused &View",IDC_TOGGLE_VISIBILITY,211,77,55,14
-    SCROLLBAR       IDC_RESIZEGRIP,262,143,10,10
 END
 
 IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 180
@@ -151,7 +150,6 @@ BEGIN
     CONTROL         "<a>(?)</a>",IDC_WILDCARDHELP,"SysLink",0x0,191,126,14,10
     CONTROL         "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,168,259,9,WS_EX_STATICEDGE
     PUSHBUTTON      "Focused &View",IDC_TOGGLE_VISIBILITY,211,106,55,14
-    SCROLLBAR       IDC_RESIZEGRIP,262,169,10,10
 END
 
 IDD_MUI_RUN DIALOGEX 0, 0, 229, 96
@@ -324,7 +322,6 @@ BEGIN
     GROUPBOX        "Info",IDC_INFO_GROUPBOX,180,7,280,127
     LTEXT           "Customise Schemes",IDC_TITLE,264,25,180,12
     EDITTEXT        IDC_STYLEEDIT_HELP,197,54,252,74,ES_MULTILINE | ES_READONLY | NOT WS_BORDER
-    SCROLLBAR       IDC_RESIZEGRIP,7,233,10,10
 END
 
 IDD_MUI_TABSETTINGS DIALOGEX 0, 0, 174, 114
diff --git a/res/rizonesoft_t.bmp b/res/rizonesoft_t.bmp
new file mode 100644
index 000000000..5ffea49a4
Binary files /dev/null and b/res/rizonesoft_t.bmp differ
diff --git a/src/Config/Config.cpp b/src/Config/Config.cpp
index c6c61fb6f..c2700974f 100644
--- a/src/Config/Config.cpp
+++ b/src/Config/Config.cpp
@@ -1407,12 +1407,9 @@ void LoadSettings()
     GET_INT_VALUE_FROM_INISECTION(FavoritesDlgSizeY, 281, INT_MIN, INT_MAX);
     GET_INT_VALUE_FROM_INISECTION(AddToFavDlgSizeX, 317, INT_MIN, INT_MAX);
 
-    GET_INT_VALUE_FROM_INISECTION(FindReplaceDlgSizeX, 494, INT_MIN, INT_MAX);
     GET_INT_VALUE_FROM_INISECTION(FindReplaceDlgPosX, CW_USEDEFAULT, INT_MIN, INT_MAX);
     GET_INT_VALUE_FROM_INISECTION(FindReplaceDlgPosY, CW_USEDEFAULT, INT_MIN, INT_MAX);
 
-    GET_INT_VALUE_FROM_INISECTION(CustomSchemesDlgSizeX, 833, INT_MIN, INT_MAX);
-    GET_INT_VALUE_FROM_INISECTION(CustomSchemesDlgSizeY, 515, INT_MIN, INT_MAX);
     GET_INT_VALUE_FROM_INISECTION(CustomSchemesDlgPosX, CW_USEDEFAULT, INT_MIN, INT_MAX);
     GET_INT_VALUE_FROM_INISECTION(CustomSchemesDlgPosY, CW_USEDEFAULT, INT_MIN, INT_MAX);
 
@@ -1845,12 +1842,9 @@ static bool _SaveSettings(bool bForceSaveSettings)
   SAVE_VALUE_IF_NOT_EQ_DEFAULT(Int, FavoritesDlgSizeY);
   SAVE_VALUE_IF_NOT_EQ_DEFAULT(Int, AddToFavDlgSizeX);
 
-  SAVE_VALUE_IF_NOT_EQ_DEFAULT(Int, FindReplaceDlgSizeX);
   SAVE_VALUE_IF_NOT_EQ_DEFAULT(Int, FindReplaceDlgPosX);
   SAVE_VALUE_IF_NOT_EQ_DEFAULT(Int, FindReplaceDlgPosY);
 
-  SAVE_VALUE_IF_NOT_EQ_DEFAULT(Int, CustomSchemesDlgSizeX);
-  SAVE_VALUE_IF_NOT_EQ_DEFAULT(Int, CustomSchemesDlgSizeY);
   SAVE_VALUE_IF_NOT_EQ_DEFAULT(Int, CustomSchemesDlgPosX);
   SAVE_VALUE_IF_NOT_EQ_DEFAULT(Int, CustomSchemesDlgPosY);
 
@@ -1894,7 +1888,7 @@ static bool _SaveSettings(bool bForceSaveSettings)
 
   switch (Globals.idxSelectedTheme) {
     case 1: 
-      Style_ToIniSection(Globals.bIniFileFromScratch); // Scintilla Styles
+      Style_ToIniSection(Globals.bIniFileFromScratch, true); // Scintilla Styles
       // fall trough
     case 0:
       IniSectionDelete(IniSecStyles, Constants.StylingThemeName, false);
@@ -2004,16 +1998,20 @@ __try {
       }
     }
 
+    if (Globals.idxSelectedTheme == 1) {
+      Style_SaveSettings(bForceSaveSettings);
+    }
+
+  }
+  __finally {
+    ok = CloseSettingsFile(true, false);
+  }
+
   // separate INI files for Style-Themes
   if (Globals.idxSelectedTheme >= 2) {
     Style_SaveSettings(bForceSaveSettings);
   }
 
-}
-  __finally {
-    ok = CloseSettingsFile(true, false);
-  }
-
   EndWaitCursor();
   return ok;
 }
diff --git a/src/Dialogs.c b/src/Dialogs.c
index 09e62e070..ea594d8f8 100644
--- a/src/Dialogs.c
+++ b/src/Dialogs.c
@@ -1088,7 +1088,7 @@ static INT_PTR CALLBACK OpenWithDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM
         SetWindowLongPtr(hwnd, DWLP_USER, (LONG_PTR)lParam);
         SET_NP3_DLG_ICON_SMALL(hwnd);
 
-        ResizeDlg_Init(hwnd,Settings.OpenWithDlgSizeX,Settings.OpenWithDlgSizeY,IDC_RESIZEGRIP);
+        ResizeDlg_Init(hwnd,Settings.OpenWithDlgSizeX,Settings.OpenWithDlgSizeY,IDC_RESIZEGRIP,RSZ_BOTH);
 
         LVCOLUMN lvc = { LVCF_FMT | LVCF_TEXT, LVCFMT_LEFT, 0, L"", -1, 0, 0, 0 };
 
@@ -1286,7 +1286,7 @@ static INT_PTR CALLBACK FavoritesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARA
         SetWindowLongPtr(hwnd, DWLP_USER, (LONG_PTR)lParam);
         SET_NP3_DLG_ICON_SMALL(hwnd);
 
-        ResizeDlg_Init(hwnd,Settings.FavoritesDlgSizeX,Settings.FavoritesDlgSizeY,IDC_RESIZEGRIP);
+        ResizeDlg_Init(hwnd,Settings.FavoritesDlgSizeX,Settings.FavoritesDlgSizeY,IDC_RESIZEGRIP,RSZ_BOTH);
 
         LVCOLUMN lvc = { LVCF_FMT | LVCF_TEXT, LVCFMT_LEFT, 0, L"", -1, 0, 0, 0 };
 
@@ -1459,7 +1459,7 @@ static INT_PTR CALLBACK AddToFavDlgProc(HWND hwnd, UINT umsg, WPARAM wParam, LPA
       SetWindowLongPtr(hwnd, DWLP_USER, (LONG_PTR)lParam);
       SET_NP3_DLG_ICON_SMALL(hwnd);
 
-      ResizeDlg_InitX(hwnd, Settings.AddToFavDlgSizeX, IDC_RESIZEGRIP);
+      ResizeDlg_Init(hwnd, Settings.AddToFavDlgSizeX, Settings.AddToFavDlgSizeX, IDC_RESIZEGRIP, RSZ_ONLY_X);
 
       LPCWSTR const pszName = (LPCWSTR)lParam;
       SendDlgItemMessage(hwnd, IDC_ADDFAV_FILES, EM_LIMITTEXT, MAX_PATH - 1, 0);
@@ -1687,7 +1687,7 @@ static INT_PTR CALLBACK FileMRUDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM
           lpit->hExitThread = CreateEvent(NULL, true, false, NULL);
           lpit->hTerminatedThread = CreateEvent(NULL, true, true, NULL);
         }
-        ResizeDlg_Init(hwnd,Settings.FileMRUDlgSizeX,Settings.FileMRUDlgSizeY,IDC_RESIZEGRIP);
+        ResizeDlg_Init(hwnd,Settings.FileMRUDlgSizeX,Settings.FileMRUDlgSizeY,IDC_RESIZEGRIP,RSZ_BOTH);
 
         ListView_SetImageList(GetDlgItem(hwnd,IDC_FILEMRU),
           (HIMAGELIST)SHGetFileInfo(L"C:\\",FILE_ATTRIBUTE_DIRECTORY,
@@ -2733,7 +2733,7 @@ static INT_PTR CALLBACK SelectEncodingDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,
 
         PENCODEDLG const pdd = (PENCODEDLG)lParam;
         LVCOLUMN lvc = { LVCF_FMT | LVCF_TEXT, LVCFMT_LEFT, 0, L"", -1, 0, 0, 0 };
-        ResizeDlg_Init(hwnd,pdd->cxDlg,pdd->cyDlg,IDC_RESIZEGRIP);
+        ResizeDlg_Init(hwnd,pdd->cxDlg,pdd->cyDlg,IDC_RESIZEGRIP,RSZ_BOTH);
 
         hwndLV = GetDlgItem(hwnd,IDC_ENCODINGLIST);
 
@@ -3960,7 +3960,7 @@ typedef struct _resizeDlg {
 
 typedef const RESIZEDLG* LPCRESIZEDLG;
 
-void ResizeDlg_InitEx(HWND hwnd, int cxFrame, int cyFrame, int nIdGrip, int iDirection) 
+void ResizeDlg_Init(HWND hwnd, int cxFrame, int cyFrame, int nIdGrip, RSZ_DLG_DIR iDirection)
 {
   RESIZEDLG* const pm = (RESIZEDLG*)AllocMem(sizeof(RESIZEDLG), HEAP_ZERO_MEMORY);
   pm->direction = iDirection;
@@ -3970,16 +3970,21 @@ void ResizeDlg_InitEx(HWND hwnd, int cxFrame, int cyFrame, int nIdGrip, int iDir
   pm->cxClient = rc.right - rc.left;
   pm->cyClient = rc.bottom - rc.top;
 
-  AdjustWindowRectEx(&rc, GetWindowLong(hwnd, GWL_STYLE) | WS_THICKFRAME, FALSE, 0);
+
+  if (pm->direction < 0)
+    AdjustWindowRectEx(&rc, GetWindowLong(hwnd, GWL_STYLE) & ~WS_THICKFRAME, FALSE, 0);
+  else  
+    AdjustWindowRectEx(&rc, GetWindowLong(hwnd, GWL_STYLE) | WS_THICKFRAME, FALSE, 0);
+
   pm->mmiPtMinX = rc.right - rc.left;
   pm->mmiPtMinY = rc.bottom - rc.top;
   
   // only one direction
   switch (iDirection) {
-  case ResizeDlgDirection_OnlyX:
+  case RSZ_ONLY_X:
     pm->mmiPtMaxY = pm->mmiPtMinY;
     break;
-  case ResizeDlgDirection_OnlyY:
+  case RSZ_ONLY_Y:
     pm->mmiPtMaxX = pm->mmiPtMinX;
     break;
   }
@@ -3991,7 +3996,11 @@ void ResizeDlg_InitEx(HWND hwnd, int cxFrame, int cyFrame, int nIdGrip, int iDir
 
   SetWindowPos(hwnd, NULL, rc.left, rc.top, cxFrame, cyFrame, SWP_NOZORDER);
 
-  SetWindowLongPtr(hwnd, GWL_STYLE, GetWindowLongPtr(hwnd, GWL_STYLE) | WS_THICKFRAME);
+  if (pm->direction < 0)
+    SetWindowLongPtr(hwnd, GWL_STYLE, GetWindowLongPtr(hwnd, GWL_STYLE) & ~WS_THICKFRAME);
+  else  
+    SetWindowLongPtr(hwnd, GWL_STYLE, GetWindowLongPtr(hwnd, GWL_STYLE) | WS_THICKFRAME);
+
   SetWindowPos(hwnd, NULL, 0, 0, 0, 0, SWP_NOZORDER | SWP_NOMOVE | SWP_NOSIZE | SWP_FRAMECHANGED);
 
   WCHAR wch[MAX_PATH];
@@ -3999,11 +4008,14 @@ void ResizeDlg_InitEx(HWND hwnd, int cxFrame, int cyFrame, int nIdGrip, int iDir
   InsertMenu(GetSystemMenu(hwnd, FALSE), SC_CLOSE, MF_BYCOMMAND | MF_STRING | MF_ENABLED, SC_SIZE, wch);
   InsertMenu(GetSystemMenu(hwnd, FALSE), SC_CLOSE, MF_BYCOMMAND | MF_SEPARATOR, 0, NULL);
 
-  HWND const hwndCtl = GetDlgItem(hwnd, nIdGrip);
-  SetWindowLongPtr(hwndCtl, GWL_STYLE, GetWindowLongPtr(hwndCtl, GWL_STYLE) | SBS_SIZEGRIP | WS_CLIPSIBLINGS);
-
-  const int cGrip = Scintilla_GetSystemMetricsEx(hwnd, SM_CXHTHUMB);
-  SetWindowPos(hwndCtl, NULL, pm->cxClient - cGrip, pm->cyClient - cGrip, cGrip, cGrip, SWP_NOZORDER);
+  if ((pm->direction >= 0)) {
+    HWND const hwndCtl = GetDlgItem(hwnd, nIdGrip);
+    if (hwndCtl) {
+      SetWindowLongPtr(hwndCtl, GWL_STYLE, GetWindowLongPtr(hwndCtl, GWL_STYLE) | SBS_SIZEGRIP | WS_CLIPSIBLINGS);
+      const int cGrip = Scintilla_GetSystemMetricsEx(hwnd, SM_CXHTHUMB);
+      SetWindowPos(hwndCtl, NULL, pm->cxClient - cGrip, pm->cyClient - cGrip, cGrip, cGrip, SWP_NOZORDER);
+    }
+  }
 }
 
 
@@ -4048,11 +4060,10 @@ void ResizeDlg_GetMinMaxInfo(HWND hwnd, LPARAM lParam)
 
   // only one direction
   switch (pm->direction) {
-  case ResizeDlgDirection_OnlyX:
+  case RSZ_ONLY_X:
     lpmmi->ptMaxTrackSize.y = pm->mmiPtMaxY;
     break;
-
-  case ResizeDlgDirection_OnlyY:
+  case RSZ_ONLY_Y:
     lpmmi->ptMaxTrackSize.x = pm->mmiPtMaxX;
     break;
   }
@@ -4542,7 +4553,7 @@ void UpdateWindowLayoutForDPI(HWND hWnd, int x_96dpi, int y_96dpi, int w_96dpi,
   LONG const height = rc.bottom - rc.top;
   int dpiScaledX = MulDiv(rc.left, wndDPI.x, USER_DEFAULT_SCREEN_DPI);
   int dpiScaledY = MulDiv(rc.top, wndDPI.y, USER_DEFAULT_SCREEN_DPI);
-  int dpiScaledWidth = MulDiv(width, wndDPI.y, USER_DEFAULT_SCREEN_DPI);
+  int dpiScaledWidth = MulDiv(width, wndDPI.x, USER_DEFAULT_SCREEN_DPI);
   int dpiScaledHeight = MulDiv(height, wndDPI.y, USER_DEFAULT_SCREEN_DPI);
 
   SetWindowPos(hWnd, NULL, dpiScaledX, dpiScaledY, dpiScaledWidth, dpiScaledHeight,
diff --git a/src/Dialogs.h b/src/Dialogs.h
index 50497acb2..447b5e177 100644
--- a/src/Dialogs.h
+++ b/src/Dialogs.h
@@ -68,19 +68,10 @@ void GetDlgPos(HWND hDlg, LPINT xDlg, LPINT yDlg);
 void SetDlgPos(HWND hDlg, int xDlg, int yDlg);
 //void SnapToDefaultButton(HWND);
 
-#define ResizeDlgDirection_Both		0
-#define ResizeDlgDirection_OnlyX	1
-#define ResizeDlgDirection_OnlyY	2
-void ResizeDlg_InitEx(HWND hwnd, int cxFrame, int cyFrame, int nIdGrip, int iDirection);
-inline void ResizeDlg_Init(HWND hwnd, int cxFrame, int cyFrame, int nIdGrip) {
-  ResizeDlg_InitEx(hwnd, cxFrame, cyFrame, nIdGrip, ResizeDlgDirection_Both);
-}
-inline void ResizeDlg_InitX(HWND hwnd, int cxFrame, int nIdGrip) {
-  ResizeDlg_InitEx(hwnd, cxFrame, 0, nIdGrip, ResizeDlgDirection_OnlyX);
-}
-inline void ResizeDlg_InitY(HWND hwnd, int cyFrame, int nIdGrip) {
-  ResizeDlg_InitEx(hwnd, 0, cyFrame, nIdGrip, ResizeDlgDirection_OnlyY);
-}
+// resize dialog directions
+typedef enum { RSZ_NONE = -1, RSZ_BOTH = 0, RSZ_ONLY_X = 1, RSZ_ONLY_Y = 2 } RSZ_DLG_DIR;
+
+void ResizeDlg_Init(HWND hwnd, int cxFrame, int cyFrame, int nIdGrip, RSZ_DLG_DIR iDirection);
 void ResizeDlg_Destroy(HWND hwnd, int* cxFrame, int* cyFrame);
 void ResizeDlg_Size(HWND hwnd, LPARAM lParam, int* cx, int* cy);
 void ResizeDlg_GetMinMaxInfo(HWND hwnd, LPARAM lParam);
@@ -89,9 +80,9 @@ void ResizeDlg_GetMinMaxInfo(HWND hwnd, LPARAM lParam);
 void ResizeDlg_SetAttr(HWND hwnd, int index, int value);
 int ResizeDlg_GetAttr(HWND hwnd, int index);
 
-void ResizeDlg_InitY2Ex(HWND hwnd, int cxFrame, int cyFrame, int nIdGrip, int iDirection, int nCtlId1, int nCtlId2);
+void ResizeDlg_InitY2Ex(HWND hwnd, int cxFrame, int cyFrame, int nIdGrip, RSZ_DLG_DIR iDirection, int nCtlId1, int nCtlId2);
 inline void ResizeDlg_InitY2(HWND hwnd, int cxFrame, int cyFrame, int nIdGrip, int nCtlId1, int nCtlId2) {
-  ResizeDlg_InitY2Ex(hwnd, cxFrame, cyFrame, nIdGrip, ResizeDlgDirection_Both, nCtlId1, nCtlId2);
+  ResizeDlg_InitY2Ex(hwnd, cxFrame, cyFrame, nIdGrip, RSZ_BOTH, nCtlId1, nCtlId2);
 }
 int ResizeDlg_CalcDeltaY2(HWND hwnd, int dy, int cy, int nCtlId1, int nCtlId2);
 void ResizeDlgCtl(HWND hwndDlg, int nCtlId, int dx, int dy);
diff --git a/src/Edit.c b/src/Edit.c
index e2d1d2491..920f129f1 100644
--- a/src/Edit.c
+++ b/src/Edit.c
@@ -5675,7 +5675,7 @@ static INT_PTR CALLBACK EditFindReplaceDlgProc(HWND hwnd,UINT umsg,WPARAM wParam
 
       EditSetCaretToSelectionStart(); // avoid search text selection jumps to next match (before ResizeDlg_InitX())
 
-      ResizeDlg_InitX(hwnd, Settings.FindReplaceDlgSizeX, IDC_RESIZEGRIP);
+      ResizeDlg_Init(hwnd, 0, 0, IDC_RESIZEGRIP, RSZ_NONE);
 
       sg_pefrData = (LPEDITFINDREPLACE)GetWindowLongPtr(hwnd, DWLP_USER);
 
@@ -5910,13 +5910,14 @@ static INT_PTR CALLBACK EditFindReplaceDlgProc(HWND hwnd,UINT umsg,WPARAM wParam
       DeleteObject(hBrushRed);
       DeleteObject(hBrushGreen);
       DeleteObject(hBrushBlue);
-      ResizeDlg_Destroy(hwnd, &Settings.FindReplaceDlgSizeX, NULL);
+      ResizeDlg_Destroy(hwnd, NULL, NULL);
       sg_pefrData = NULL;
       Globals.hwndDlgFindReplace = NULL;
     }
     return 0;
 
 
+#if 0
   case WM_SIZE: {
       int dx;
       bool const isReplace = (GetDlgItem(hwnd, IDC_REPLACETEXT) != NULL);
@@ -5940,6 +5941,7 @@ static INT_PTR CALLBACK EditFindReplaceDlgProc(HWND hwnd,UINT umsg,WPARAM wParam
       EndDeferWindowPos(hdwp);
     }
     return true;
+#endif
 
 
   case WM_GETMINMAXINFO:
diff --git a/src/Styles.c b/src/Styles.c
index c0d488851..767788d65 100644
--- a/src/Styles.c
+++ b/src/Styles.c
@@ -325,8 +325,7 @@ void Style_DynamicThemesMenuCmd(int cmd)
     }
     else if (PathFileExists(Theme_Files[Globals.idxSelectedTheme].szFilePath))
     {
-      bool const bIndependentFromStandardSettings = true;
-      Style_ExportToFile(Theme_Files[Globals.idxSelectedTheme].szFilePath, bIndependentFromStandardSettings);
+      Style_ExportToFile(Theme_Files[Globals.idxSelectedTheme].szFilePath, false);
     }
   }
 
@@ -613,9 +612,10 @@ bool Style_ImportFromFile(const WCHAR* szFile)
         Lexer_Section = (iLexer == 0) ? L"Default Text" : L"2nd Default Text";
       }
 
-      IniSectionGetString(Lexer_Section, L"FileNameExtensions", g_pLexArray[iLexer]->pszDefExt,
-        g_pLexArray[iLexer]->szExtensions, COUNTOF(g_pLexArray[iLexer]->szExtensions));
-
+      if (bIsStdIniFile) {
+        IniSectionGetString(Lexer_Section, L"FileNameExtensions", g_pLexArray[iLexer]->pszDefExt,
+          g_pLexArray[iLexer]->szExtensions, COUNTOF(g_pLexArray[iLexer]->szExtensions));
+      }
       // don't allow empty extensions settings => use default ext
       if (StrIsEmpty(g_pLexArray[iLexer]->szExtensions)) {
         StringCchCopy(g_pLexArray[iLexer]->szExtensions, COUNTOF(g_pLexArray[iLexer]->szExtensions), g_pLexArray[iLexer]->pszDefExt);
@@ -631,7 +631,7 @@ bool Style_ImportFromFile(const WCHAR* szFile)
         ++i;
       }
 
-      if (Globals.iCfgVersionRead < CFG_VER_0004)
+      if (bIsStdIniFile && (Globals.iCfgVersionRead < CFG_VER_0004))
       {
         // handling "Text Files" lexer
         if (StringCchCompareXI(L"Text Files", g_pLexArray[iLexer]->pszName) == 0)
@@ -707,15 +707,14 @@ bool Style_Export(HWND hwnd)
 //  Style_ToIniSection()
 //
 
-#define SAVE_STYLE_IF_NOT_EQ_DEFAULT(TYPE, VARNAME, VALUE, DEFAULT)        \
-  if ((VALUE) != (DEFAULT)) {                                              \
+#define SAVE_STYLE_IF_NOT_EQ_DEFAULT(TYPE, VARNAME, VALUE, DEFAULT)      \
+  if ((VALUE) != (DEFAULT)) {                                            \
     IniSectionSet##TYPE(IniSecStyles, _W(_STRG(VARNAME)), (VALUE));      \
-  } else {                                                                 \
+  } else {                                                               \
     IniSectionDelete(IniSecStyles, _W(_STRG(VARNAME)), false);           \
   }
 
-
-void Style_ToIniSection(bool bForceAll)
+void Style_ToIniSection(bool bForceAll, bool bIsStdIniFile)
 {
   // Custom colors
   const WCHAR* const CustomColors_Section = L"Custom Colors";
@@ -772,7 +771,7 @@ void Style_ToIniSection(bool bForceAll)
   {
     LPCWSTR const Lexer_Section = g_pLexArray[iLexer]->pszName;
 
-    if (bForceAll || (StringCchCompareXI(g_pLexArray[iLexer]->szExtensions, g_pLexArray[iLexer]->pszDefExt) != 0))
+    if (bForceAll || (bIsStdIniFile && (StringCchCompareXI(g_pLexArray[iLexer]->szExtensions, g_pLexArray[iLexer]->pszDefExt) != 0)))
     {
       IniSectionSetString(Lexer_Section, L"FileNameExtensions", g_pLexArray[iLexer]->szExtensions);
     }
@@ -825,10 +824,13 @@ bool Style_ExportToFile(const WCHAR* szFile, bool bForceAll)
   NormalizePathEx(szFilePathNorm, COUNTOF(szFilePathNorm), true, false);
 
   bool ok = false;
+  bool bIsStdIniFile = false;
+
   if (StringCchCompareXI(szFilePathNorm, Globals.IniFile) == 0) {
     bool bOpendByMe = false;
+    bIsStdIniFile = true;
     if (OpenSettingsFile(&bOpendByMe)) {
-      Style_ToIniSection(bForceAll);
+      Style_ToIniSection(bForceAll, bIsStdIniFile);
       ok = CloseSettingsFile(true, bOpendByMe);
     }
   }
@@ -844,7 +846,7 @@ bool Style_ExportToFile(const WCHAR* szFile, bool bForceAll)
         }
       }
       if (LoadIniFileCache(szFilePathNorm)) {
-        Style_ToIniSection(bForceAll);
+        Style_ToIniSection(bForceAll, bIsStdIniFile);
         ok = SaveIniFileCache(szFilePathNorm);
         ResetIniFileCache();
       }
@@ -3777,7 +3779,7 @@ INT_PTR CALLBACK Style_CustomizeSchemesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam
       {
         SET_NP3_DLG_ICON_SMALL(hwnd);
 
-        ResizeDlg_Init(hwnd, Settings.CustomSchemesDlgSizeX, Settings.CustomSchemesDlgSizeY, IDC_RESIZEGRIP);
+        ResizeDlg_Init(hwnd, 0, 0, IDC_RESIZEGRIP, RSZ_NONE);
 
         GetLngString(IDS_MUI_STYLEEDIT_HELP, tchTmpBuffer, COUNTOF(tchTmpBuffer));
         SetDlgItemText(hwnd, IDC_STYLEEDIT_HELP, tchTmpBuffer);
@@ -3898,7 +3900,7 @@ INT_PTR CALLBACK Style_CustomizeSchemesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam
         DeleteBitmapButton(hwnd, IDC_STYLEBACK);
         DeleteBitmapButton(hwnd, IDC_PREVSTYLE);
         DeleteBitmapButton(hwnd, IDC_NEXTSTYLE);
-        ResizeDlg_Destroy(hwnd, &Settings.CustomSchemesDlgSizeX, &Settings.CustomSchemesDlgSizeY);
+        ResizeDlg_Destroy(hwnd, NULL, NULL);
 
         // free old backup
         int cnt = 0;
@@ -4479,7 +4481,7 @@ INT_PTR CALLBACK Style_SelectLexerDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPAR
       {
         SET_NP3_DLG_ICON_SMALL(hwnd);
 
-        ResizeDlg_Init(hwnd, s_cxStyleSelectDlg, s_cyStyleSelectDlg, IDC_RESIZEGRIP);
+        ResizeDlg_Init(hwnd, s_cxStyleSelectDlg, s_cyStyleSelectDlg, IDC_RESIZEGRIP, RSZ_BOTH);
 
         hwndLV = GetDlgItem(hwnd,IDC_STYLELIST);
 
@@ -4532,13 +4534,6 @@ INT_PTR CALLBACK Style_SelectLexerDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPAR
       return !0;
 
 
-    case WM_DPICHANGED:
-      {
-        UpdateWindowLayoutForDPI(hwnd, 0, 0, 0, 0);
-      }
-      return !0;
-
-
     case WM_DESTROY:
       {
         ResizeDlg_Destroy(hwnd, &s_cxStyleSelectDlg, &s_cyStyleSelectDlg);
@@ -4546,18 +4541,25 @@ INT_PTR CALLBACK Style_SelectLexerDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPAR
       return 0;
 
 
+    case WM_DPICHANGED:
+      {
+        UpdateWindowLayoutForDPI(hwnd, 0, 0, 0, 0);
+      }
+      return !0;
+
+
     case WM_SIZE:
       {
         ResizeDlg_Size(hwnd, lParam, &cxClient, &cyClient);
 
         HDWP hdwp;
         hdwp = BeginDeferWindowPos(6);
-        hdwp = DeferCtlPos(hdwp, hwnd, IDC_RESIZEGRIP, cxClient, cyClient, SWP_NOSIZE);
         hdwp = DeferCtlPos(hdwp, hwnd, IDOK, cxClient, cyClient, SWP_NOSIZE);
         hdwp = DeferCtlPos(hdwp, hwnd, IDCANCEL, cxClient, cyClient, SWP_NOSIZE);
         hdwp = DeferCtlPos(hdwp, hwnd, IDC_STYLELIST, 0, cyClient, SWP_NOMOVE);
-        hdwp = DeferCtlPos(hdwp, hwnd, IDC_DEFAULTSCHEME, 0, cyClient, SWP_NOSIZE);
-        hdwp = DeferCtlPos(hdwp, hwnd, IDC_AUTOSELECT, 0, cyClient, SWP_NOSIZE);
+        hdwp = DeferCtlPos(hdwp, hwnd, IDC_DEFAULTSCHEME, cxClient, cyClient, SWP_NOSIZE);
+        hdwp = DeferCtlPos(hdwp, hwnd, IDC_AUTOSELECT, cxClient, cyClient, SWP_NOSIZE);
+        hdwp = DeferCtlPos(hdwp, hwnd, IDC_RESIZEGRIP, cxClient, cyClient, SWP_NOSIZE);
         EndDeferWindowPos(hdwp);
     
         ListView_SetColumnWidth(GetDlgItem(hwnd, IDC_STYLELIST), 0, LVSCW_AUTOSIZE_USEHEADER);
diff --git a/src/Styles.h b/src/Styles.h
index 21c2a0af6..ef7e7b4ee 100644
--- a/src/Styles.h
+++ b/src/Styles.h
@@ -35,7 +35,7 @@ bool   Style_Import(HWND hwnd);
 bool   Style_ImportFromFile(const WCHAR* szFile);
 void   Style_SaveSettings(bool bForceSaveSettings);
 bool   Style_Export(HWND hwnd);
-void   Style_ToIniSection(bool bForceAll);
+void   Style_ToIniSection(bool bForceAll, bool bIsStdIniFile);
 bool   Style_ExportToFile(const WCHAR* szFile, bool bForceAll);
 
 unsigned ThemeItems_CountOf();
diff --git a/src/TypeDefs.h b/src/TypeDefs.h
index b6e775d95..aac3f75da 100644
--- a/src/TypeDefs.h
+++ b/src/TypeDefs.h
@@ -454,11 +454,8 @@ typedef struct _settings_t
   int FavoritesDlgSizeX;
   int FavoritesDlgSizeY;
   int AddToFavDlgSizeX;
-  int FindReplaceDlgSizeX;
   int FindReplaceDlgPosX;
   int FindReplaceDlgPosY;
-  int CustomSchemesDlgSizeX;
-  int CustomSchemesDlgSizeY;
   int CustomSchemesDlgPosX;
   int CustomSchemesDlgPosY;
   bool MuteMessageBeep;