diff --git a/black_theme.xml b/black_theme.xml
index 6aebe18..1cca33d 100644
--- a/black_theme.xml
+++ b/black_theme.xml
@@ -182,7 +182,7 @@
 		ScaleNestedParens="1"
 		/>
 	<DisplayColors>
-		<Item Name="DefaultText" Color="#00bfbf" />
+		<Item Name="DefaultText" Color="#aaaa00" />
 		<Item Name="WindowBackground" Color="#202020" />
 		<Item Name="SelectionBar" Color="#292929" />
 		<Item Name="PrintedDefaultText" Color="#000000" />
@@ -2095,9 +2095,9 @@
 		<Style Name="Operator" TextColor="#ffffff" />
 		<Style Name="Delimiter" TextColor="#f2f48a" />
 		<Style Name="Comment" TextColor="#beb7ff" />
-		<Style Name="String" FixedWhiteSpace="0" TextColor="#ff7e40" />
+		<Style Name="String" FixedWhiteSpace="0" TextColor="#ea4d00" />
 		<Style Name="Keyword" TextColor="#37a6e1" />
-		<Style Name="Control" Bold="1" TextColor="#ff8040" />
+		<Style Name="Control" Bold="1" TextColor="#bf0060" />
 		<Style Name="Special" Bold="1" Italic="1" />
 		<Style Name="Boolean" TextColor="#f37af3" />
 		<Style Name="Debug" TextColor="#ff0000" Italic="1" Underline="Dotted" />
@@ -2110,7 +2110,7 @@
 		<Style Name="Declaration" Bold="1" TextColor="#11bb66" />
 		<Style
 			Name="Ref To Local"
-			TextColor="#00d5d5"
+			TextColor="#00b5b5"
 			ParentStyle="Reference"
 			/>
 		<Style Name="Reference" TextColor="#11bb5e" />
@@ -2143,7 +2143,7 @@
 		<Style
 			Name="Ref to Parameter"
 			Bold="1"
-			TextColor="#00bfbf"
+			TextColor="#00aaaa"
 			ParentStyle="Ref To Local"
 			/>
 		<Style Name="Declare Template" ParentStyle="Declare Function" />
@@ -2161,7 +2161,7 @@
 		<Style Name="Ref to Namespace" ParentStyle="Reference" />
 		<Style
 			Name="Declare Local"
-			TextColor="#00bfbf"
+			TextColor="#00aaaa"
 			ParentStyle="Declaration"
 			/>
 		<Style
@@ -2179,7 +2179,7 @@
 			Name="Declare Function"
 			Scale="100"
 			KeepWithNextLine="1"
-			TextColor="#bfbf00"
+			TextColor="#aaaa00"
 			ParentStyle="Declaration"
 			/>
 		<Style Name="Declare Macro" ParentStyle="Declaration" />
@@ -2198,7 +2198,11 @@
 			ParentStyle="Declare Struct"
 			/>
 		<Style Name="Declare Class" Scale="120" ParentStyle="Declare Struct" />
-		<Style Name="Declare Var" ParentStyle="Declaration" />
+		<Style
+			Name="Declare Var"
+			TextColor="#00aaaa"
+			ParentStyle="Declaration"
+			/>
 		<Style
 			Name="Declare Constant"
 			TextColor="#ef5656"
@@ -2233,7 +2237,7 @@
 		<Style
 			Name="Ref to Func"
 			Bold="1"
-			TextColor="#bfbf00"
+			TextColor="#aaaa00"
 			ParentStyle="Reference"
 			/>
 		<Style
@@ -2249,7 +2253,7 @@
 		<Style Name="Ref to Union" ParentStyle="Ref to Struct" />
 		<Style
 			Name="Ref to Typedef"
-			TextColor="#37a6e1"
+			TextColor="#219cde"
 			ParentStyle="Ref to Struct"
 			/>
 		<Style
@@ -2260,7 +2264,7 @@
 			/>
 		<Style
 			Name="Ref to Const"
-			TextColor="#ef5656"
+			TextColor="#ee5151"
 			ParentStyle="Reference"
 			/>
 		<Style Name="Ref to Enum" ParentStyle="Reference" />
@@ -2276,7 +2280,7 @@
 		<Style
 			Name="Ref to Member"
 			Italic="0"
-			TextColor="#00d5d5"
+			TextColor="#00b5b5"
 			ParentStyle="Reference"
 			/>
 		<Style Name="Ref to Interface" ParentStyle="Ref to Class" />
@@ -2326,7 +2330,7 @@
 		<Style
 			Name="Declare Parameter"
 			Underline="Single"
-			TextColor="#00bfbf"
+			TextColor="#00aaaa"
 			ParentStyle="Declare Local"
 			/>
 		<Style
@@ -7927,13 +7931,13 @@
 		</SymbolTypes>
 	</ProjectReport>
 	<SymbolPane
-		Width="285"
-		TextColor="#d0d0d0"
+		Width="324"
+		TextColor="#d4d4d4"
 		BackColor="#303030"
 		ShowChanges="1"
 		ShowLongFunctions="1"
 		>
-		<Font name="Segoe UI" psize="11" fpfamily="34" charset="0" />
+		<Font name="Segoe UI" psize="10" fpfamily="34" charset="0" />
 		<SymbolTypes All="1" />
 		<SymbolSorting
 			SortMode="1"
@@ -8312,7 +8316,7 @@
 			TextColor="#d0d0d0"
 			BackColor="#303030"
 			>
-			<Font name="Segoe UI" psize="8" fpfamily="34" charset="0" />
+			<Font name="Segoe UI" psize="10" fpfamily="34" charset="0" />
 		</ListDisplay>
 	</ProjectFileWindow>
 	<ProjectFileTypeWindow
@@ -8338,10 +8342,10 @@
 		SplitPercent="50"
 		>
 		<ListDisplay
-			TextColor="#d0d0d0"
+			TextColor="#dfdfdf"
 			BackColor="#303030"
 			>
-			<Font name="Segoe UI" psize="8" fpfamily="34" charset="0" />
+			<Font name="Segoe UI" psize="10" fpfamily="34" charset="0" />
 		</ListDisplay>
 	</ProjectFolderWindow>
 	<ProjectSymbolWindow
@@ -8349,13 +8353,72 @@
 		ShowFile="1"
 		Metric="Lines of Code"
 		>
-		<SymbolTypes All="1" />
+		<SymbolTypes>
+			<Type Name="Function" />
+			<Type Name="Macro" />
+			<Type Name="Structure" />
+			<Type Name="Union" />
+			<Type Name="Type Definition" />
+			<Type Name="Variable" />
+			<Type Name="Constant" />
+			<Type Name="Enumeration" />
+			<Type Name="Custom Tag" />
+			<Type Name="Editor Macro" />
+			<Type Name="Class" />
+			<Type Name="Member Function" />
+			<Type Name="Enum Constant" />
+			<Type Name="Function Prototype" />
+			<Type Name="#-Directive" />
+			<Type Name="Search Result" />
+			<Type Name="Label" />
+			<Type Name="Data Member" />
+			<Type Name="Interface" />
+			<Type Name="Resource" />
+			<Type Name="File" />
+			<Type Name="Directory" />
+			<Type Name="Function Template" />
+			<Type Name="Class Template" />
+			<Type Name="Package" />
+			<Type Name="Namespace" />
+			<Type Name="Token Macro" />
+			<Type Name="Code Block" />
+			<Type Name="Parameter" />
+			<Type Name="Parsing Error" />
+			<Type Name="HTML or XML Element" />
+			<Type Name="HTML Title" />
+			<Type Name="Member Function Prototype" />
+			<Type Name="IDL Module" />
+			<Type Name="IDL Library" />
+			<Type Name="IDL Interface" />
+			<Type Name="C++ Template" />
+			<Type Name="Template Parameter" />
+			<Type Name="CSS Rule Selector" />
+			<Type Name="C# Class Property" />
+			<Type Name="C# Indexer" />
+			<Type Name="C# Event" />
+			<Type Name="VHDL Entity" />
+			<Type Name="VHDL Architecture" />
+			<Type Name="VHDL Component" />
+			<Type Name="VHDL Process" />
+			<Type Name="VHDL Configuration" />
+			<Type Name="Type Reference" />
+			<Type Name="External Variable" />
+			<Type Name="Alias" />
+			<Type Name="Alias Target" />
+			<Type Name="Type Parameter" />
+			<Type Name="Macro Event" />
+			<Type Name="Captured Variable" />
+			<Type Name="Clip" />
+			<Type Name="Snippet" />
+			<Type Name="Editor Macro Function" />
+			<Type Name="Locals inside functions" />
+		</SymbolTypes>
 		<Sort SortType="6" Invert="0" />
 		<ListDisplay
 			TextColor="#d0d0d0"
 			BackColor="#303030"
 			>
-			<Font name="Segoe UI" psize="8" fpfamily="34" charset="0" />
+			<Font name="Segoe UI" psize="10" fpfamily="34" charset="0" />
 		</ListDisplay>
 	</ProjectSymbolWindow>
 	<ProjectSymbolTypeWindow
@@ -8363,13 +8426,72 @@
 		ShowFile="1"
 		Metric="Lines of Code"
 		>
-		<SymbolTypes All="1" />
+		<SymbolTypes>
+			<Type Name="Function" />
+			<Type Name="Macro" />
+			<Type Name="Structure" />
+			<Type Name="Union" />
+			<Type Name="Type Definition" />
+			<Type Name="Variable" />
+			<Type Name="Constant" />
+			<Type Name="Enumeration" />
+			<Type Name="Custom Tag" />
+			<Type Name="Editor Macro" />
+			<Type Name="Class" />
+			<Type Name="Member Function" />
+			<Type Name="Enum Constant" />
+			<Type Name="Function Prototype" />
+			<Type Name="#-Directive" />
+			<Type Name="Search Result" />
+			<Type Name="Label" />
+			<Type Name="Data Member" />
+			<Type Name="Interface" />
+			<Type Name="Resource" />
+			<Type Name="File" />
+			<Type Name="Directory" />
+			<Type Name="Function Template" />
+			<Type Name="Class Template" />
+			<Type Name="Package" />
+			<Type Name="Namespace" />
+			<Type Name="Token Macro" />
+			<Type Name="Code Block" />
+			<Type Name="Parameter" />
+			<Type Name="Parsing Error" />
+			<Type Name="HTML or XML Element" />
+			<Type Name="HTML Title" />
+			<Type Name="Member Function Prototype" />
+			<Type Name="IDL Module" />
+			<Type Name="IDL Library" />
+			<Type Name="IDL Interface" />
+			<Type Name="C++ Template" />
+			<Type Name="Template Parameter" />
+			<Type Name="CSS Rule Selector" />
+			<Type Name="C# Class Property" />
+			<Type Name="C# Indexer" />
+			<Type Name="C# Event" />
+			<Type Name="VHDL Entity" />
+			<Type Name="VHDL Architecture" />
+			<Type Name="VHDL Component" />
+			<Type Name="VHDL Process" />
+			<Type Name="VHDL Configuration" />
+			<Type Name="Type Reference" />
+			<Type Name="External Variable" />
+			<Type Name="Alias" />
+			<Type Name="Alias Target" />
+			<Type Name="Type Parameter" />
+			<Type Name="Macro Event" />
+			<Type Name="Captured Variable" />
+			<Type Name="Clip" />
+			<Type Name="Snippet" />
+			<Type Name="Editor Macro Function" />
+			<Type Name="Locals inside functions" />
+		</SymbolTypes>
 		<Sort SortType="6" Invert="0" />
 		<ListDisplay
 			TextColor="#d0d0d0"
 			BackColor="#303030"
 			>
-			<Font name="Segoe UI" psize="8" fpfamily="34" charset="0" />
+			<Font name="Segoe UI" psize="10" fpfamily="34" charset="0" />
 		</ListDisplay>
 	</ProjectSymbolTypeWindow>
 	<WindowListWindow