From 17ede9711dfd6e19d8352b25306818e13fbdd9d8 Mon Sep 17 00:00:00 2001
From: Rainer Kottenhoff <rainer.kottenhoff@gmail.com>
Date: Sat, 9 May 2020 20:04:45 +0200
Subject: [PATCH] + fix: Theme scheme file handling (file extension
 inheritance)

---
 Build/Themes/Dark.ini               | 428 +--------------------
 Build/Themes/Obsidian.ini           | 430 +--------------------
 Build/Themes/Sombra.ini             | 558 ++++++++++++++++++++++++++++
 language/common_res.rc              |   3 +-
 language/np3_af_za/dialogs_af_za.rc |   3 +-
 language/np3_be_by/dialogs_be_by.rc |   3 +-
 language/np3_de_de/dialogs_de_de.rc |   5 +-
 language/np3_en_gb/dialogs_en_gb.rc |   5 +-
 language/np3_en_us/dialogs_en_us.rc |   5 +-
 language/np3_es_es/dialogs_es_es.rc |   5 +-
 language/np3_fr_fr/dialogs_fr_fr.rc |   5 +-
 language/np3_hu_hu/dialogs_hu_hu.rc |   5 +-
 language/np3_id_id/dialogs_id_id.rc |   5 +-
 language/np3_it_it/dialogs_it_it.rc |   3 +-
 language/np3_ja_jp/dialogs_ja_jp.rc |   5 +-
 language/np3_ko_kr/dialogs_ko_kr.rc |   3 +-
 language/np3_nl_nl/dialogs_nl_nl.rc |   5 +-
 language/np3_pl_pl/dialogs_pl_pl.rc |   5 +-
 language/np3_pt_br/dialogs_pt_br.rc |   5 +-
 language/np3_pt_pt/dialogs_pt_pt.rc |   5 +-
 language/np3_ru_ru/dialogs_ru_ru.rc |   3 +-
 language/np3_sk_sk/dialogs_sk_sk.rc |   5 +-
 language/np3_sv_se/dialogs_sv_se.rc |   5 +-
 language/np3_tr_tr/dialogs_tr_tr.rc |   5 +-
 language/np3_vi_vn/dialogs_vi_vn.rc |   5 +-
 language/np3_zh_cn/dialogs_zh_cn.rc |   5 +-
 language/np3_zh_tw/dialogs_zh_tw.rc |   5 +-
 res/rizonesoft_t.bmp                | Bin 0 -> 76086 bytes
 src/Config/Config.cpp               |  22 +-
 src/Dialogs.c                       |  49 ++-
 src/Dialogs.h                       |  21 +-
 src/Edit.c                          |   6 +-
 src/Styles.c                        |  56 +--
 src/Styles.h                        |   2 +-
 src/TypeDefs.h                      |   3 -
 35 files changed, 671 insertions(+), 1012 deletions(-)
 create mode 100644 Build/Themes/Sombra.ini
 create mode 100644 res/rizonesoft_t.bmp

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 0000000000000000000000000000000000000000..5ffea49a41e2aee4acfb551fa168be0656cbfed0
GIT binary patch
literal 76086
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

literal 0
HcmV?d00001

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;