diff --git a/.gitignore b/.gitignore
index 467b75693..566314f1b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,7 +46,9 @@ Makefile.in
/localwin32.mk
/.lock-wscript
/ltmain.sh
-/m4/
+/m4/lt*.m4
+/m4/intltool.m4
+/m4/libtool.m4
/make_deb.sh
/missing
/mkinstalldirs
diff --git a/NEWS b/NEWS
index 2656242e6..b07624270 100644
--- a/NEWS
+++ b/NEWS
@@ -7,7 +7,8 @@ Geany 1.23 (unreleased)
* Fix too aggressive scope caching (#2142789, #2667917, #2868850).
Editor
- * Update Scintilla to version 3.2.2 (#2808638, #3540469).
+ * Update Scintilla to version 3.2.3 (#2808638, #2909124, #3094431,
+ #3233160, #3540469).
Search
* 'Mark All' now also uses the fully-featured PCRE engine (#3564132).
diff --git a/configure.ac b/configure.ac
index 257ea13d9..f9146aad5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -115,8 +115,16 @@ AC_CONFIG_FILES([
Makefile
icons/Makefile
icons/16x16/Makefile
+ icons/24x24/Makefile
+ icons/32x32/Makefile
icons/48x48/Makefile
icons/scalable/Makefile
+ icons/tango/Makefile
+ icons/tango/16x16/Makefile
+ icons/tango/24x24/Makefile
+ icons/tango/32x32/Makefile
+ icons/tango/48x48/Makefile
+ icons/tango/scalable/Makefile
tagmanager/Makefile
tagmanager/ctags/Makefile
tagmanager/mio/Makefile
diff --git a/data/filetype_extensions.conf b/data/filetype_extensions.conf
index 33eefe0ef..755eafeed 100644
--- a/data/filetype_extensions.conf
+++ b/data/filetype_extensions.conf
@@ -5,6 +5,7 @@
Abc=*.abc;*.abp;
ActionScript=*.as;
Ada=*.adb;*.ads;
+Asciidoc=*.asciidoc;
ASM=*.asm;
CAML=*.ml;*.mli;
C=*.c;*.h;
diff --git a/data/filetypes.asciidoc b/data/filetypes.asciidoc
new file mode 100644
index 000000000..94da6f04c
--- /dev/null
+++ b/data/filetypes.asciidoc
@@ -0,0 +1,35 @@
+# For complete documentation of this file, please see Geany's main documentation
+[styling]
+# no syntax highlighting yet
+
+[settings]
+# default extension used when saving files
+extension=asciidoc
+
+# the following characters are these which a "word" can contains, see documentation
+#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
+
+# single comments, like # in this file
+comment_single=//
+# multiline comments
+#comment_open=////
+#comment_close=////
+
+# set to false if a comment character/string should start at column 0 of a line, true uses any
+# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d
+ #command_example();
+# setting to false would generate this
+# command_example();
+# This setting works only for single line comments
+comment_use_indent=false
+
+# context action command (please see Geany's main documentation for details)
+context_action_cmd=
+
+# sort tags by appearance
+symbol_list_sort_mode=1
+
+[indentation]
+#width=4
+# 0 is spaces, 1 is tabs, 2 is tab & spaces
+#type=1
diff --git a/data/filetypes.c b/data/filetypes.c
index 291c2c1fa..fb39193a9 100644
--- a/data/filetypes.c
+++ b/data/filetypes.c
@@ -10,6 +10,7 @@ number=number_1
word=keyword_1
word2=keyword_2
string=string_1
+stringraw=string_2
character=character
uuid=other
preprocessor=preprocessor
diff --git a/data/filetypes.conf b/data/filetypes.conf
index 9b6617912..c0878eb5e 100644
--- a/data/filetypes.conf
+++ b/data/filetypes.conf
@@ -1,7 +1,7 @@
# For complete documentation of this file, please see Geany's main documentation
[styling]
# Edit these in the colorscheme .conf file instead
-default=value
+default=default
comment=comment
section=tag
key=attribute
diff --git a/data/filetypes.po b/data/filetypes.po
index b613f4c00..06271737a 100644
--- a/data/filetypes.po
+++ b/data/filetypes.po
@@ -3,13 +3,20 @@
# Edit these in the colorscheme .conf file instead
default=default
comment=comment
+programmer_comment=comment_doc
+reference=comment
+flags=comment
+fuzzy=comment_doc_keyword
msgid=keyword_1
msgid_text=string_1
+msgid_text_eol=string_eol
msgstr=keyword_2
msgstr_text=string_1
+msgstr_text_eol=string_eol
msgctxt=keyword_3
msgctxt_text=string_1
-fuzzy=comment_doc_keyword
+msgctxt_text_eol=string_eol
+error=error
[settings]
# default extension used when saving files
diff --git a/data/filetypes.restructuredtext b/data/filetypes.restructuredtext
index c9375f405..ce70288dc 100644
--- a/data/filetypes.restructuredtext
+++ b/data/filetypes.restructuredtext
@@ -10,7 +10,7 @@ extension=rst
#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
# single comments, like # in this file
-comment_single=..
+comment_single=..\s
# multiline comments
#comment_open=
#comment_close=
diff --git a/data/geany.glade b/data/geany.glade
index 01057fa51..cc220b95b 100644
--- a/data/geany.glade
+++ b/data/geany.glade
@@ -3,6 +3,13 @@
+