diff --git a/Build/Changes.txt b/Build/Changes.txt
index 6091a6a92..d0568919e 100644
--- a/Build/Changes.txt
+++ b/Build/Changes.txt
@@ -2,6 +2,104 @@
Rizonesoft Notepad3 CHANGES
==================================================
+--------------------------------------------------
+Version 3.18.422.952 RC (23 April 2018)
+--------------------------------------------------
+
+- Enhancement: Non Modal Customize Schemes... dialog.
+- Enhancement: Added option to skip ANSI Code Page detection (tellenc) (default is ON to preserve historic behavior).
+- Fix: Replace in selection: Selection enlargement.
+- RFC: Encoding detection: Separated tables from code.
+- Enhancement: External cmd tool using Google's "Compact Encoding Detection" for encoding analysis.
+- Change: Replaced Tellenc by "Compact Encoding Detection" CED.
+- Fix: Y-CaretPolicy ([Settings2] CurrentLineVerticalSlop=0) default.
+- Added: X-CaretPolicy ([Settings2] CurrentLineHorizontalSlop=0).
+- Fix: Show replacement count info-box after UI update (extended selection, replaced pattern).
+- Updated: uthash library updated to current GitHub dev.
+- Fix: Issue regarding "Auto Complete Word" feature.
+- Change: Prep Scintilla "Position" value type changes for large file support.
+- Fix: Slow pasting of multiline clipboard.
+- Enhancement: Enable "Customize Schemes" Preview button only if selected lexer corresponds to opened file.
+- Enhancement: Added last find pattern to file history.
+- Enhancement: File history dependent last search pattern option combined with search history on/off option.
+- Fix: Style_SetLexer() should update line number margin width.
+- Fix: Minor issues regarding selection anchor/current_caret in Find Next/Previous.
+- Fix: Remember last search pattern on new files.
+- Added: Version info for Visual Studio 2017 v15.6.3 (VC v191326129).
+- Change: Rebases internally used code page on UTF-8 (Scintilla multi-byte conversions).
+- Added: Menu entries for (hidden) Accelerator Keys.
+- Fix: Notepad3 window positioning.
+- Fix: Initial window position handling (command line option "/pos").
+- Fix: Search Next (F3) handling (ver II).
+- Added: Names under Acknowledgments on About box.
+- Fix: Reset scroll width on font (size) changes (automatically adapted).
+- Added: Method to remove duplicate lines.
+- Fix: Missing menu shortcut for "Remove Duplicate Lines" ("o").
+- Fix: "Remove Duplicate Lines": wrong last line handling in case of no selection.
+- Fix: Using process heap allocation instead of global memory allocation method (according to MSDN guidelines).
+- Fix: "Remove Duplicate Lines": skipping line on progress to next compare when removing previous duplicate.
+- Fix: Toggle line comment on empty line.
+- Enhancement: Handling of F3 (find next - no F/R dialog).
+- Enhancement: Make Find Next Selected, Find Prev Selected as expected using modern Scintilla API methods (instead of hand made operation).
+- Enhancement: Strip First/Last Char within rectangular selection.
+- Fix: Issue in Strip First/Last Char within rectangular selection.
+- Enhancement: Strip Trailing Spaces within rectangular selection.
+- Enhancement: Compress White Spaces within rectangular selection.
+- Enhancement: Consistent rectangular selection restauration after block operations.
+- Change: Encoding of Notepad3 sources to UTF-8 (Sig).
+- Fix: Update Toolbar,Statusbar and LinNumber Margin on Observe NotifyEvent reactivation.
+- Enhancement: Int to DocPos type changes.
+- Enhancement: Added option to remove blank lines (containing blanks/tabs only).
+- Fix: Endless loop on "zero length match" at EOF.
+- Fix: Reverting file from storage - Preserve view, cancel selection.
+- Enhancement: Indication of find/replace state in FR dialog status bar.
+- Fix: Minor issue on display indication of find/replace state in FR dialog status bar.
+- Enhancement: Kind of "incremental search" : Find/Replace "Mark All Occ" active: typing search pattern scrolls to first match.
+- Fix: Small issues on Find/Replace Next/Previous operations.
+- Fix: Pad with spaces in case of rectangular selection.
+- Feature: 1st draft of "Toggle Visible" (hide non occurences lines).
+- Fix: HyperlinkHotspot handling while "Toggle Visibility" changes view.
+- Fix: Issue with "Toggle Visibility" drawing a selection on clicking into view.
+- Fix: Concurrency issue: main window vs. Find/Replace dialog.
+- Debug: Version to folding issue on hiding invisible/non-marked lines.
+- Fix: Folding level issue to hide non-occurrence match lines.
+- Optimization: Delayed "mark occurrences" multi-triggering.
+- Fix: Possible Deadlock.
+- Fix: Avoid deadlock of occurence marker task scheduler.
+- Fix: Enable FR state reset call from outside.
+- Fix: Enhance indicator (redraw needed) of re-apply "Mark All Occurrences".
+- Fix: "Compressed View": re-apply lexer styles on changed marked word.
+- Fix: Proper view reset after reverting from compressed view.
+- Fix: "Compressed View" - minor issues.
+- Fix: UTF-16 LE BOM (Unicode) for Notepad3.ini. - Notepad3.ini should have encoding UTF-16 LE BOM (Unicode) not the smaller UTF-8 Sig encoding format.
+- Fix: Scroll-to issue in case of incremental search.
+- Enhancement: Show or hide passphrase in dialog box.
+- Fix: Bug replacing reverse stream selection.
+- Enhancement: Enable "Toggle View" for main window.
+- Enhancement: "Toggle View" coop main window vs. F/R dialog.
+- Enhancement: F/R dialog - enable "Ctrl+BS" to delete word in search string.
+- Fix: Remove file-system/URL auto-completion from search box.
+- Fix: F/R dialog : minor corrections.
+- Enhancement: Added "Toggle View" button to toolbar.
+- Refactoring: Create a better "delayed command message queue".
+- Enhancement: Selectable (and copy-able) version info header of About-Box.
+- Fix: Occurrences marker counting.
+- Enhancement: Statusbar segmentation resizing.
+- Fix: default "Slop" values changed.
+- Change: Updated Scintilla library to ver. 404
+- Fix: Undo/Redo handling in case of discarding U/R-Stack.
+- Fix: Check "Toggle View" button in case of activation.
+- Fix: Restore correct fold margin.
+- Fix: Optimized "notify change" observation on clearing file buffer.
+- Changed: Renamed "Toggle View" to "Focused View".
+- Fix: Consistent "checked" for button and menu.
+- Fix: "Focused View": disable encoding identifier insertion menu entry.
+- Fix: Bug in toggle mechanism of "Toggle All Folds"
+- Enhancement: "Toggle All Folds" -> "Toggle Folds" (works on selection only too now).
+- Fix: "Toggle Folds": exclude fold point (headers) which have no children.
+- Fix: "Toggle Folds": selection must span at least two lines.
+- Enhancement: "Toggle Folds": Selection range (really) toggles folds.
+
--------------------------------------------------
Version 3.18.311.928 (11 March 2018)
--------------------------------------------------
diff --git a/Versions/build.txt b/Versions/build.txt
index 616005867..be1c55a35 100644
--- a/Versions/build.txt
+++ b/Versions/build.txt
@@ -1 +1 @@
-928
+952
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 593332041..d971329b6 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
Notepad3
diff --git a/res/Toolbar.bmp b/res/Toolbar.bmp
index 0976d591d..2a76087e6 100644
Binary files a/res/Toolbar.bmp and b/res/Toolbar.bmp differ
diff --git a/res/Toolbar2.bmp b/res/Toolbar2.bmp
index 255c471b6..aca0cefc4 100644
Binary files a/res/Toolbar2.bmp and b/res/Toolbar2.bmp differ
diff --git a/res/rizonesoft.bmp b/res/rizonesoft.bmp
index 958191f58..39e7fd7da 100644
Binary files a/res/rizonesoft.bmp and b/res/rizonesoft.bmp differ
diff --git a/src/VersionEx.h b/src/VersionEx.h
index eaa49d527..b3ff9f364 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -5,9 +5,9 @@
// //////////////////////////////////////////////////////////
#define VERSION_MAJOR 3
#define VERSION_MINOR 18
-#define VERSION_REV 418
-#define VERSION_BUILD 978
+#define VERSION_REV 422
+#define VERSION_BUILD 952
#define SCINTILLA_VER 404
#define ONIGMO_REGEX_VER 6.1.3
-#define VERSION_PATCH L" develop"
-#define VERSIONA_PATCH " develop"
+#define VERSION_PATCH L" RC"
+#define VERSIONA_PATCH " RC"