diff --git a/Codist/Commands/VersionInfoBar.cs b/Codist/Commands/VersionInfoBar.cs
index cbb660d7..73545ee2 100644
--- a/Codist/Commands/VersionInfoBar.cs
+++ b/Codist/Commands/VersionInfoBar.cs
@@ -28,7 +28,7 @@ public bool ShowAfterUpdate() {
 						new InfoBarTextSpan(nameof(Codist) + " has been updated to " + Config.CurrentVersion + ". "),
 						new InfoBarHyperlink("Click to see what's new", "New"),
 						new InfoBarTextSpan(" or "),
-						new InfoBarHyperlink("dismiss this bar", "Close")
+						new InfoBarHyperlink("dismiss this notification", "Close")
 					},
 					KnownMonikers.StatusInformation));
 			}
diff --git a/Codist/Config.cs b/Codist/Config.cs
index 3901d9b6..7ba8cca5 100644
--- a/Codist/Config.cs
+++ b/Codist/Config.cs
@@ -15,7 +15,7 @@ namespace Codist
 {
 	sealed class Config
 	{
-		internal const string CurrentVersion = "5.4";
+		internal const string CurrentVersion = "5.5";
 		const string ThemePrefix = "res:";
 		const int DefaultIconSize = 20;
 		internal const string LightTheme = ThemePrefix + "Light", DarkTheme = ThemePrefix + "Dark", SimpleTheme = ThemePrefix + "Simple";
diff --git a/Codist/Options/ConfigPage.cs b/Codist/Options/ConfigPage.cs
index ed79db02..41aa97ac 100644
--- a/Codist/Options/ConfigPage.cs
+++ b/Codist/Options/ConfigPage.cs
@@ -53,6 +53,7 @@ protected override void OnDeactivate(CancelEventArgs e) {
 
 		protected override void Dispose(bool disposing) {
 			Control?.Dispose();
+			_DisabledNotice?.Dispose();
 			base.Dispose(disposing);
 		}
 
diff --git a/Codist/Options/SyntaxStyleOptionPage.Designer.cs b/Codist/Options/SyntaxStyleOptionPage.Designer.cs
index c7f57255..59fb3e50 100644
--- a/Codist/Options/SyntaxStyleOptionPage.Designer.cs
+++ b/Codist/Options/SyntaxStyleOptionPage.Designer.cs
@@ -84,7 +84,7 @@ private void InitializeComponent() {
 			this._StyleSettingsBox.Location = new System.Drawing.Point(248, 3);
 			this._StyleSettingsBox.Name = "_StyleSettingsBox";
 			this._StyleSettingsBox.Size = new System.Drawing.Size(271, 417);
-			this._StyleSettingsBox.TabIndex = 2;
+			this._StyleSettingsBox.TabIndex = 0;
 			this._StyleSettingsBox.TabStop = false;
 			this._StyleSettingsBox.Text = "Syntax Style";
 			// 
@@ -93,7 +93,7 @@ private void InitializeComponent() {
 			this._BackgroundOpacityButton.Location = new System.Drawing.Point(132, 163);
 			this._BackgroundOpacityButton.Name = "_BackgroundOpacityButton";
 			this._BackgroundOpacityButton.Size = new System.Drawing.Size(120, 23);
-			this._BackgroundOpacityButton.TabIndex = 21;
+			this._BackgroundOpacityButton.TabIndex = 11;
 			this._BackgroundOpacityButton.Text = "Opacity not set";
 			this._BackgroundOpacityButton.UseVisualStyleBackColor = true;
 			this._BackgroundOpacityButton.Value = ((byte)(0));
@@ -103,7 +103,7 @@ private void InitializeComponent() {
 			this._ForegroundOpacityButton.Location = new System.Drawing.Point(132, 134);
 			this._ForegroundOpacityButton.Name = "_ForegroundOpacityButton";
 			this._ForegroundOpacityButton.Size = new System.Drawing.Size(120, 23);
-			this._ForegroundOpacityButton.TabIndex = 21;
+			this._ForegroundOpacityButton.TabIndex = 9;
 			this._ForegroundOpacityButton.Text = "Opacity not set";
 			this._ForegroundOpacityButton.UseVisualStyleBackColor = true;
 			this._ForegroundOpacityButton.Value = ((byte)(0));
@@ -114,7 +114,7 @@ private void InitializeComponent() {
 			this._ResetButton.Location = new System.Drawing.Point(190, 0);
 			this._ResetButton.Name = "_ResetButton";
 			this._ResetButton.Size = new System.Drawing.Size(75, 23);
-			this._ResetButton.TabIndex = 20;
+			this._ResetButton.TabIndex = 14;
 			this._ResetButton.Text = "Reset";
 			this._ResetButton.UseVisualStyleBackColor = true;
 			// 
@@ -124,7 +124,7 @@ private void InitializeComponent() {
 			this.label2.Location = new System.Drawing.Point(6, 199);
 			this.label2.Name = "label2";
 			this.label2.Size = new System.Drawing.Size(95, 15);
-			this.label2.TabIndex = 19;
+			this.label2.TabIndex = 12;
 			this.label2.Text = "Background:";
 			// 
 			// _BackgroundEffectBox
@@ -134,7 +134,7 @@ private void InitializeComponent() {
 			this._BackgroundEffectBox.Location = new System.Drawing.Point(122, 196);
 			this._BackgroundEffectBox.Name = "_BackgroundEffectBox";
 			this._BackgroundEffectBox.Size = new System.Drawing.Size(130, 23);
-			this._BackgroundEffectBox.TabIndex = 18;
+			this._BackgroundEffectBox.TabIndex = 13;
 			// 
 			// _FontBox
 			// 
@@ -145,7 +145,7 @@ private void InitializeComponent() {
 			this._FontBox.Location = new System.Drawing.Point(66, 21);
 			this._FontBox.Name = "_FontBox";
 			this._FontBox.Size = new System.Drawing.Size(186, 23);
-			this._FontBox.TabIndex = 17;
+			this._FontBox.TabIndex = 1;
 			// 
 			// label8
 			// 
@@ -153,7 +153,7 @@ private void InitializeComponent() {
 			this.label8.Location = new System.Drawing.Point(6, 24);
 			this.label8.Name = "label8";
 			this.label8.Size = new System.Drawing.Size(47, 15);
-			this.label8.TabIndex = 16;
+			this.label8.TabIndex = 0;
 			this.label8.Text = "Font:";
 			// 
 			// _PreviewBox
@@ -176,7 +176,7 @@ private void InitializeComponent() {
 			this._BackColorButton.Name = "_BackColorButton";
 			this._BackColorButton.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
 			this._BackColorButton.Size = new System.Drawing.Size(120, 23);
-			this._BackColorButton.TabIndex = 12;
+			this._BackColorButton.TabIndex = 10;
 			this._BackColorButton.Text = "Background";
 			this._BackColorButton.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
 			this._BackColorButton.UseVisualStyleBackColor = true;
@@ -204,7 +204,7 @@ private void InitializeComponent() {
             -2147483648});
 			this._FontSizeBox.Name = "_FontSizeBox";
 			this._FontSizeBox.Size = new System.Drawing.Size(129, 25);
-			this._FontSizeBox.TabIndex = 6;
+			this._FontSizeBox.TabIndex = 3;
 			// 
 			// label4
 			// 
@@ -212,7 +212,7 @@ private void InitializeComponent() {
 			this.label4.Location = new System.Drawing.Point(6, 55);
 			this.label4.Name = "label4";
 			this.label4.Size = new System.Drawing.Size(87, 15);
-			this.label4.TabIndex = 5;
+			this.label4.TabIndex = 2;
 			this.label4.Text = "Font size:";
 			// 
 			// _StrikeBox
@@ -221,7 +221,7 @@ private void InitializeComponent() {
 			this._StrikeBox.Location = new System.Drawing.Point(123, 109);
 			this._StrikeBox.Name = "_StrikeBox";
 			this._StrikeBox.Size = new System.Drawing.Size(133, 19);
-			this._StrikeBox.TabIndex = 4;
+			this._StrikeBox.TabIndex = 7;
 			this._StrikeBox.Text = "Strikethrough";
 			this._StrikeBox.ThreeState = true;
 			this._StrikeBox.UseVisualStyleBackColor = true;
@@ -232,7 +232,7 @@ private void InitializeComponent() {
 			this._UnderlineBox.Location = new System.Drawing.Point(6, 109);
 			this._UnderlineBox.Name = "_UnderlineBox";
 			this._UnderlineBox.Size = new System.Drawing.Size(101, 19);
-			this._UnderlineBox.TabIndex = 3;
+			this._UnderlineBox.TabIndex = 6;
 			this._UnderlineBox.Text = "Underline";
 			this._UnderlineBox.ThreeState = true;
 			this._UnderlineBox.UseVisualStyleBackColor = true;
@@ -243,7 +243,7 @@ private void InitializeComponent() {
 			this._ItalicBox.Location = new System.Drawing.Point(123, 84);
 			this._ItalicBox.Name = "_ItalicBox";
 			this._ItalicBox.Size = new System.Drawing.Size(77, 19);
-			this._ItalicBox.TabIndex = 2;
+			this._ItalicBox.TabIndex = 5;
 			this._ItalicBox.Text = "Italic";
 			this._ItalicBox.ThreeState = true;
 			this._ItalicBox.UseVisualStyleBackColor = true;
@@ -254,7 +254,7 @@ private void InitializeComponent() {
 			this._BoldBox.Location = new System.Drawing.Point(6, 84);
 			this._BoldBox.Name = "_BoldBox";
 			this._BoldBox.Size = new System.Drawing.Size(61, 19);
-			this._BoldBox.TabIndex = 1;
+			this._BoldBox.TabIndex = 4;
 			this._BoldBox.Text = "Bold";
 			this._BoldBox.ThreeState = true;
 			this._BoldBox.UseVisualStyleBackColor = true;
diff --git a/Codist/source.extension.vsixmanifest b/Codist/source.extension.vsixmanifest
index d2ba03ee..320ae7b8 100644
--- a/Codist/source.extension.vsixmanifest
+++ b/Codist/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="Codist.WMJ.c7b93d20-621f-4b21-9d28-d51157ef0b94" Version="5.4.0.5001" Language="en-US" Publisher="WMJ" />
+    <Identity Id="Codist.WMJ.c7b93d20-621f-4b21-9d28-d51157ef0b94" Version="5.5.0.5144" Language="en-US" Publisher="WMJ" />
     <DisplayName>Codist</DisplayName>
     <Description xml:space="preserve">A productivity enhancer for C# programmers with advanced syntax highlight, Super Quick Info (code tooltip), Smart Bar (contextual toolbar), Navigation Bar, code structure markers on scrollbar, comment tagger, and more.</Description>
     <MoreInfo>https://github.com/wmjordan/Codist</MoreInfo>
diff --git a/README.md b/README.md
index 1134aed5..248f04fd 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ Check out this list to see what _Codist_ can do for you?
   * The font size of type and member declarations can be enlarged, font families are also changeable, so it is much easier to spot them.
   * Syntax highlight can be applied to braces and parentheses.
   * Various syntax identifiers have different styles, temporary elements such as method parameters and local variables are italic, `static` symbols are underlined.
-  * Comment content can be tagged (e.g. _note_).
+  * Comment content can be tagged (e.g. _note_) and highlighted with individual style.
   * Unnecessary code can be marked strike-through.
   * Keywords are categorized and highlighted with various styles (e.g. `abstract` and `sealed`, `return` and `throw`, etc.).
   * Overriding members (such as `ToString`) can be painted with gradient background color, so at a glance we know that the marked implementations have overrided their base classes.