diff --git a/PowerEditor/bin/SourceCodePro-Regular.otf b/PowerEditor/bin/SourceCodePro-Regular.otf
deleted file mode 100644
index 4e3b9d0bc..000000000
Binary files a/PowerEditor/bin/SourceCodePro-Regular.otf and /dev/null differ
diff --git a/PowerEditor/installer/nativeLang/english.xml b/PowerEditor/installer/nativeLang/english.xml
index e17f659dc..54f1da0f3 100644
--- a/PowerEditor/installer/nativeLang/english.xml
+++ b/PowerEditor/installer/nativeLang/english.xml
@@ -358,7 +358,7 @@
                 <Item id="1659" name="In hidden folders"/>
                 <Item id="1624" name="Search mode"/>
                 <Item id="1625" name="Normal"/>
-                <Item id="1626" name="Extended (\n, \r, \t, \0, \x...)"/>
+                <Item id="1626" name="Extended (\r, \n, \t, \x..., \0)"/>
                 <Item id="1660" name="Replace in Files"/>
                 <Item id="1661" name="Follow current doc."/>
                 <Item id="1641" name="Find All in Current Document"/>
diff --git a/PowerEditor/installer/nativeLang/german.xml b/PowerEditor/installer/nativeLang/german.xml
index 56213db6a..69ecf0111 100644
--- a/PowerEditor/installer/nativeLang/german.xml
+++ b/PowerEditor/installer/nativeLang/german.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 
 <!--
-	German localization for Notepad++ 6.7.9.x, 
-	last modified 2015-07-10 by Jan Schreiber. 
+	German localization for Notepad++ 6.8, 
+	last modified 2015-08-03 by Jan Schreiber. 
 
 	Please e-mail errors, suggestions etc. to janschreiber(at)users.sf.net. 
 
@@ -332,7 +332,7 @@
 		<!-- Dialog Windows: -->
 		<Dialog>
 			<!-- Find and Replace Dialog: -->
-			<Find title="Suchen &amp; Ersetzen" titleFind="Suchen" titleReplace="Ersetzen" titleFindInFiles="In Dateien suchen" titleMark="Vorkommnisse markieren">
+			<Find title="Suchen und ersetzen" titleFind="Suchen" titleReplace="Ersetzen" titleFindInFiles="In Dateien suchen" titleMark="Vorkommnisse markieren">
 				<Item id="1" name="&amp;Weitersuchen"/>
 				<Item id="2" name="&amp;Schließen"/>
 				<Item id="1603" name="Nur &amp;ganze Wörter suchen"/>
@@ -341,7 +341,7 @@
 				<Item id="1606" name="Am Ende von vorn &amp;beginnen"/>
 				<Item id="1608" name="&amp;Ersetzen"/>
 				<Item id="1609" name="Alle erse&amp;tzen"/>
-				<Item id="1611" name="Erset&amp;zen durch"/>
+				<Item id="1611" name="Erset&amp;zen durch:"/>
 				<Item id="1612" name="R&amp;ückwärts"/>
 				<Item id="1613" name="&amp;Vorwärts"/>
 				<Item id="1614" name="Z&amp;ählen"/>
@@ -349,11 +349,11 @@
 				<Item id="1616" name="&amp;Lesezeichen setzen"/>
 				<Item id="1617" name="&amp;Treffer markieren"/>
 				<Item id="1618" name="Für &amp;jede Suche löschen"/>
-				<Item id="1620" name="Suchen &amp;nach"/>
+				<Item id="1620" name="Suchen &amp;nach:"/>
 				<Item id="1621" name="Suchrichtung"/>
 				<Item id="1624" name="Suchmodus"/>
 				<Item id="1625" name="Norma&amp;l"/>
-				<Item id="1626" name="Erwe&amp;itert (\n, \r, \t, \0, \x...)"/>
+				<Item id="1626" name="Erwe&amp;itert (\r, \n, \t, \x..., \0)"/>
 				<Item id="1627" name="Unten"/>
 				<Item id="1632" name="In &amp;Markierung"/>
 				<Item id="1633" name="Zurücksetzen"/>
@@ -362,8 +362,8 @@
 				<Item id="1637" name="In Dateien suchen"/>
 				<Item id="1640" name="Umschaltdialog"/>
 				<Item id="1641" name="Alle in aktiver &amp;Datei suchen"/>
-				<Item id="1654" name="Filter"/>
-				<Item id="1655" name="Verzeichnis"/>
+				<Item id="1654" name="Filter:"/>
+				<Item id="1655" name="Verzeichnis:"/>
 				<Item id="1656" name="Alle su&amp;chen"/>
 				<Item id="1658" name="&amp;Unterverzeichnisse"/>
 				<Item id="1659" name="&amp;Versteckte Ordner"/>
@@ -655,6 +655,7 @@
 					<Item id="6212" name="vertikale Linie"/>
 					<Item id="6213" name="farbiger Hintergrund"/>
 					<Item id="6214" name="Aktuelle Zeile hervorheben"/>
+					<Item id="6215" name="Kantenglättung der Schriftarten"/>
 					<Item id="6216" name="Cursoreinstellungen"/>
 					<Item id="6217" name="Breite"/>
 					<Item id="6219" name="Geschwindigkeit"/>
@@ -798,9 +799,7 @@
 				<Cloud title="Cloud-Einstellungen">
 					<Item id="6262" name="Einstellungen in der Cloud speichern"/>
 					<Item id="6263" name="aus"/>
-					<Item id="6264" name="Dropbox"/>
-					<Item id="6265" name="OneDrive"/>
-					<Item id="6266" name="Google Drive"/>
+					<Item id="6267" name="Netzwerkpfad:"/>
 				</Cloud>
 				<AutoCompletion title="Autovervollständigung">
 					<Item id="6807" name="Autovervollständigung"/>
diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc
index 945fb034c..133c68f65 100644
--- a/PowerEditor/src/Notepad_plus.rc
+++ b/PowerEditor/src/Notepad_plus.rc
@@ -51,7 +51,7 @@ BEGIN
             VALUE    "FileDescription",    "Notepad++ : a free (GNU) source code editor\0"
             VALUE    "FileVersion",        VERSION_VALUE
             VALUE    "InternalName",       "npp.exe\0"
-            VALUE    "LegalCopyright",     "Copyleft 1998-2013 by Don HO\0"
+            VALUE    "LegalCopyright",     "Copyleft 1998-2015 by Don HO\0"
             VALUE    "OriginalFilename",   "Notepad++.exe\0"
             VALUE    "ProductName",        "Notepad++\0"
             VALUE    "ProductVersion",     VERSION_VALUE
diff --git a/PowerEditor/src/WinControls/ToolBar/ToolBar.cpp b/PowerEditor/src/WinControls/ToolBar/ToolBar.cpp
index 2439d852a..8e4f3fee0 100644
--- a/PowerEditor/src/WinControls/ToolBar/ToolBar.cpp
+++ b/PowerEditor/src/WinControls/ToolBar/ToolBar.cpp
@@ -200,8 +200,8 @@ int ToolBar::getWidth() const {
 
 int ToolBar::getHeight() const {
 	DWORD size = (DWORD)SendMessage(_hSelf, TB_GETBUTTONSIZE, 0, 0);
-    DWORD padding = (DWORD)SendMessage(_hSelf, TB_GETPADDING, 0,0);
-	int totalHeight = HIWORD(size) + HIWORD(padding);
+	DWORD padding = (DWORD)SendMessage(_hSelf, TB_GETPADDING, 0, 0);
+	int totalHeight = HIWORD(size) + HIWORD(padding) - 3;
 	return totalHeight;
 }
 
@@ -393,7 +393,7 @@ void ToolBar::addToRebar(ReBar * rebar)
 	_rbBand.fMask   = RBBIM_STYLE | RBBIM_CHILD | RBBIM_CHILDSIZE |
 					  RBBIM_SIZE | RBBIM_IDEALSIZE | RBBIM_ID;
 
-	_rbBand.fStyle		= RBBS_VARIABLEHEIGHT | RBBS_USECHEVRON;
+	_rbBand.fStyle		= RBBS_VARIABLEHEIGHT | RBBS_USECHEVRON | RBBS_NOGRIPPER;
 	_rbBand.hwndChild	= getHSelf();
 	_rbBand.wID			= REBAR_BAR_TOOLBAR;	//ID REBAR_BAR_TOOLBAR for toolbar
 	_rbBand.cxMinChild	= 0;
diff --git a/PowerEditor/src/functionList.xml b/PowerEditor/src/functionList.xml
index 0b93653b4..8f5057d9d 100644
--- a/PowerEditor/src/functionList.xml
+++ b/PowerEditor/src/functionList.xml
@@ -93,7 +93,7 @@ http://notepad-plus-plus.org/features/function-list.html
 
 			<parser id="c_function" displayName="C source" commentExpr="((/\*.*?\*)/|(//.*?$))">
 				<function
-				    mainExpr="^[\t ]*((static|const|virtual)[\s]+)?[\w:]+([\s]+[\w]+)?([\s]+|\*[\s]+|[\s]+\*|[\s]+\*[\s]+)([\w_]+[\s]*::)?(?!(if|while|for))[\w_]+[\s]*\([^\)\(]*\)([\s]*const[\s]*)?[\n\s]*\{"
+				    mainExpr="^[\t ]*((static|const|virtual)[\s]+)?[\w:]+([\s]+[\w]+)?([\s]+|(\*|\*\*)[\s]+|[\s]+(\*|\*\*)|[\s]+(\*|\*\*)[\s]+)([\w_]+[\s]*::)?(?!(if|while|for))[\w_]+[\s]*\([^\)\(]*\)([\s]*const[\s]*)?[\n\s]*\{"
 					displayMode="$functionName">
 					<functionName>
 						<nameExpr expr="(?!(if|while|for))[\w_~]+[\s]*\("/>
@@ -131,7 +131,7 @@ http://notepad-plus-plus.org/features/function-list.html
 						<nameExpr expr="[\w]+"/>
 					</className>
 					<function
-						mainExpr="^[\t ]*((static|const|virtual)[\s]+)?([\w]+([\s]+[\w]+)?([\s]+|\*[\s]+|[\s]+\*|[\s]+\*[\s]+))?([\w_]+[\s]*::)?(?!(if|while|for|switch))[\w_~]+[\s]*\([^\)\(]*\)([\s]*const[\s]*)?[\n\s]*\{">
+						mainExpr="^[\t ]*((static|const|virtual)[\s]+)?([\w]+([\s]+[\w]+)?([\s]+|(\*|\*\*|&amp;)[\s]+|[\s]+(\*|\*\*|&amp;)|[\s]+(\*|\*\*|&amp;)[\s]+))?([\w_]+[\s]*::)?(?!(if|while|for|switch))[\w_~]+[\s]*\([^\)\(]*\)([\s]*const[\s]*)?[\n\s]*\{">
 						<functionName>
 							<funcNameExpr expr="(?!(if|while|for|switch))[\w_~]+[\s]*\("/>
 							<funcNameExpr expr="(?!(if|while|for|switch))[\w_~]+"/>
@@ -139,7 +139,7 @@ http://notepad-plus-plus.org/features/function-list.html
 					</function>
 				</classRange>
 				<function
-				    mainExpr="^[\t ]*((static|const|virtual)[\s]+)?[\w]+([\s]+[\w]+)?([\s]+|\*[\s]+|[\s]+\*|[\s]+\*[\s]+)([\w_]+[\s]*::)?(?!(if|while|for))[\w_]+[\s]*\([^\)\(]*\)([\s]*const[\s]*)?[\n\s]*\{"
+				    mainExpr="^[\t ]*((static|const|virtual)[\s]+)?[\w]+([\s]+[\w]+)?([\s]+|(\*|\*\*|&amp;)[\s]+|[\s]+(\*|\*\*|&amp;)|[\s]+(\*|\*\*|&amp;)[\s]+)([\w_]+[\s]*::)?(?!(if|while|for))[\w_]+[\s]*\([^\)\(]*\)([\s]*const[\s]*)?[\n\s]*\{"
 					displayMode="$className->$functionName">
 					<functionName>
 						<nameExpr expr="(?!(if|while|for))[\w_]+[\s]*\("/>