diff --git a/PdfiumViewer.Demo/MainForm.Designer.cs b/PdfiumViewer.Demo/MainForm.Designer.cs
index 7537f774..a219eb46 100644
--- a/PdfiumViewer.Demo/MainForm.Designer.cs
+++ b/PdfiumViewer.Demo/MainForm.Designer.cs
@@ -92,6 +92,8 @@ private void InitializeComponent()
             this.copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.selectAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.pdfViewer1 = new PdfiumViewer.PdfViewer();
+            this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
+            this._textMode = new System.Windows.Forms.ToolStripButton();
             this.menuStrip1.SuspendLayout();
             this.toolStrip1.SuspendLayout();
             this.statusStrip1.SuspendLayout();
@@ -119,46 +121,46 @@ private void InitializeComponent()
             this.toolStripMenuItem3,
             this.exitToolStripMenuItem});
             this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
-            this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
+            this.fileToolStripMenuItem.Size = new System.Drawing.Size(36, 20);
             this.fileToolStripMenuItem.Text = "&File";
             // 
             // openToolStripMenuItem
             // 
             this.openToolStripMenuItem.Name = "openToolStripMenuItem";
             this.openToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
-            this.openToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.openToolStripMenuItem.Size = new System.Drawing.Size(173, 22);
             this.openToolStripMenuItem.Text = "&Open";
             this.openToolStripMenuItem.Click += new System.EventHandler(this.openToolStripMenuItem_Click);
             // 
             // toolStripMenuItem1
             // 
             this.toolStripMenuItem1.Name = "toolStripMenuItem1";
-            this.toolStripMenuItem1.Size = new System.Drawing.Size(177, 6);
+            this.toolStripMenuItem1.Size = new System.Drawing.Size(170, 6);
             // 
             // printPreviewToolStripMenuItem
             // 
             this.printPreviewToolStripMenuItem.Name = "printPreviewToolStripMenuItem";
-            this.printPreviewToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.printPreviewToolStripMenuItem.Size = new System.Drawing.Size(173, 22);
             this.printPreviewToolStripMenuItem.Text = "Print Preview";
             this.printPreviewToolStripMenuItem.Click += new System.EventHandler(this.printPreviewToolStripMenuItem_Click);
             // 
             // printMultiplePagesToolStripMenuItem
             // 
             this.printMultiplePagesToolStripMenuItem.Name = "printMultiplePagesToolStripMenuItem";
-            this.printMultiplePagesToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.printMultiplePagesToolStripMenuItem.Size = new System.Drawing.Size(173, 22);
             this.printMultiplePagesToolStripMenuItem.Text = "Print Multiple Pages";
             this.printMultiplePagesToolStripMenuItem.Click += new System.EventHandler(this.printMultiplePagesToolStripMenuItem_Click);
             // 
             // toolStripMenuItem3
             // 
             this.toolStripMenuItem3.Name = "toolStripMenuItem3";
-            this.toolStripMenuItem3.Size = new System.Drawing.Size(177, 6);
+            this.toolStripMenuItem3.Size = new System.Drawing.Size(170, 6);
             // 
             // exitToolStripMenuItem
             // 
             this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
             this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4)));
-            this.exitToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.exitToolStripMenuItem.Size = new System.Drawing.Size(173, 22);
             this.exitToolStripMenuItem.Text = "E&xit";
             this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
             // 
@@ -179,57 +181,57 @@ private void InitializeComponent()
             this.toolStripMenuItem6,
             this.informationToolStripMenuItem});
             this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem";
-            this.toolsToolStripMenuItem.Size = new System.Drawing.Size(47, 20);
+            this.toolsToolStripMenuItem.Size = new System.Drawing.Size(45, 20);
             this.toolsToolStripMenuItem.Text = "&Tools";
             // 
             // findToolStripMenuItem
             // 
             this.findToolStripMenuItem.Name = "findToolStripMenuItem";
             this.findToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F)));
-            this.findToolStripMenuItem.Size = new System.Drawing.Size(244, 22);
+            this.findToolStripMenuItem.Size = new System.Drawing.Size(232, 22);
             this.findToolStripMenuItem.Text = "&Find";
             this.findToolStripMenuItem.Click += new System.EventHandler(this.findToolStripMenuItem_Click);
             // 
             // toolStripMenuItem7
             // 
             this.toolStripMenuItem7.Name = "toolStripMenuItem7";
-            this.toolStripMenuItem7.Size = new System.Drawing.Size(241, 6);
+            this.toolStripMenuItem7.Size = new System.Drawing.Size(229, 6);
             // 
             // renderToBitmapsToolStripMenuItem
             // 
             this.renderToBitmapsToolStripMenuItem.Name = "renderToBitmapsToolStripMenuItem";
-            this.renderToBitmapsToolStripMenuItem.Size = new System.Drawing.Size(244, 22);
+            this.renderToBitmapsToolStripMenuItem.Size = new System.Drawing.Size(232, 22);
             this.renderToBitmapsToolStripMenuItem.Text = "&Render to Bitmaps";
             this.renderToBitmapsToolStripMenuItem.Click += new System.EventHandler(this.renderToBitmapsToolStripMenuItem_Click);
             // 
             // toolStripMenuItem2
             // 
             this.toolStripMenuItem2.Name = "toolStripMenuItem2";
-            this.toolStripMenuItem2.Size = new System.Drawing.Size(241, 6);
+            this.toolStripMenuItem2.Size = new System.Drawing.Size(229, 6);
             // 
             // cutMarginsWhenPrintingToolStripMenuItem
             // 
             this.cutMarginsWhenPrintingToolStripMenuItem.Name = "cutMarginsWhenPrintingToolStripMenuItem";
-            this.cutMarginsWhenPrintingToolStripMenuItem.Size = new System.Drawing.Size(244, 22);
+            this.cutMarginsWhenPrintingToolStripMenuItem.Size = new System.Drawing.Size(232, 22);
             this.cutMarginsWhenPrintingToolStripMenuItem.Text = "Cut margins when printing";
             this.cutMarginsWhenPrintingToolStripMenuItem.Click += new System.EventHandler(this.cutMarginsWhenPrintingToolStripMenuItem_Click);
             // 
             // shrinkToMarginsWhenPrintingToolStripMenuItem
             // 
             this.shrinkToMarginsWhenPrintingToolStripMenuItem.Name = "shrinkToMarginsWhenPrintingToolStripMenuItem";
-            this.shrinkToMarginsWhenPrintingToolStripMenuItem.Size = new System.Drawing.Size(244, 22);
+            this.shrinkToMarginsWhenPrintingToolStripMenuItem.Size = new System.Drawing.Size(232, 22);
             this.shrinkToMarginsWhenPrintingToolStripMenuItem.Text = "Shrink to margins when printing";
             this.shrinkToMarginsWhenPrintingToolStripMenuItem.Click += new System.EventHandler(this.shrinkToMarginsWhenPrintingToolStripMenuItem_Click);
             // 
             // toolStripMenuItem4
             // 
             this.toolStripMenuItem4.Name = "toolStripMenuItem4";
-            this.toolStripMenuItem4.Size = new System.Drawing.Size(241, 6);
+            this.toolStripMenuItem4.Size = new System.Drawing.Size(229, 6);
             // 
             // deleteCurrentPageToolStripMenuItem
             // 
             this.deleteCurrentPageToolStripMenuItem.Name = "deleteCurrentPageToolStripMenuItem";
-            this.deleteCurrentPageToolStripMenuItem.Size = new System.Drawing.Size(244, 22);
+            this.deleteCurrentPageToolStripMenuItem.Size = new System.Drawing.Size(232, 22);
             this.deleteCurrentPageToolStripMenuItem.Text = "Delete Current Page";
             this.deleteCurrentPageToolStripMenuItem.Click += new System.EventHandler(this.deleteCurrentPageToolStripMenuItem_Click);
             // 
@@ -241,58 +243,58 @@ private void InitializeComponent()
             this.rotate180ToolStripMenuItem,
             this.rotate270ToolStripMenuItem});
             this.rotateCurrentPageToolStripMenuItem.Name = "rotateCurrentPageToolStripMenuItem";
-            this.rotateCurrentPageToolStripMenuItem.Size = new System.Drawing.Size(244, 22);
+            this.rotateCurrentPageToolStripMenuItem.Size = new System.Drawing.Size(232, 22);
             this.rotateCurrentPageToolStripMenuItem.Text = "Rotate Current Page";
             // 
             // rotate0ToolStripMenuItem
             // 
             this.rotate0ToolStripMenuItem.Name = "rotate0ToolStripMenuItem";
-            this.rotate0ToolStripMenuItem.Size = new System.Drawing.Size(134, 22);
+            this.rotate0ToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
             this.rotate0ToolStripMenuItem.Text = "Rotate 0°";
             this.rotate0ToolStripMenuItem.Click += new System.EventHandler(this.rotate0ToolStripMenuItem_Click);
             // 
             // rotate90ToolStripMenuItem
             // 
             this.rotate90ToolStripMenuItem.Name = "rotate90ToolStripMenuItem";
-            this.rotate90ToolStripMenuItem.Size = new System.Drawing.Size(134, 22);
+            this.rotate90ToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
             this.rotate90ToolStripMenuItem.Text = "Rotate 90°";
             this.rotate90ToolStripMenuItem.Click += new System.EventHandler(this.rotate90ToolStripMenuItem_Click);
             // 
             // rotate180ToolStripMenuItem
             // 
             this.rotate180ToolStripMenuItem.Name = "rotate180ToolStripMenuItem";
-            this.rotate180ToolStripMenuItem.Size = new System.Drawing.Size(134, 22);
+            this.rotate180ToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
             this.rotate180ToolStripMenuItem.Text = "Rotate 180°";
             this.rotate180ToolStripMenuItem.Click += new System.EventHandler(this.rotate180ToolStripMenuItem_Click);
             // 
             // rotate270ToolStripMenuItem
             // 
             this.rotate270ToolStripMenuItem.Name = "rotate270ToolStripMenuItem";
-            this.rotate270ToolStripMenuItem.Size = new System.Drawing.Size(134, 22);
+            this.rotate270ToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
             this.rotate270ToolStripMenuItem.Text = "Rotate 270°";
             this.rotate270ToolStripMenuItem.Click += new System.EventHandler(this.rotate270ToolStripMenuItem_Click);
             // 
             // toolStripMenuItem5
             // 
             this.toolStripMenuItem5.Name = "toolStripMenuItem5";
-            this.toolStripMenuItem5.Size = new System.Drawing.Size(241, 6);
+            this.toolStripMenuItem5.Size = new System.Drawing.Size(229, 6);
             // 
             // showRangeOfPagesToolStripMenuItem
             // 
             this.showRangeOfPagesToolStripMenuItem.Name = "showRangeOfPagesToolStripMenuItem";
-            this.showRangeOfPagesToolStripMenuItem.Size = new System.Drawing.Size(244, 22);
+            this.showRangeOfPagesToolStripMenuItem.Size = new System.Drawing.Size(232, 22);
             this.showRangeOfPagesToolStripMenuItem.Text = "Show range of pages";
             this.showRangeOfPagesToolStripMenuItem.Click += new System.EventHandler(this.showRangeOfPagesToolStripMenuItem_Click);
             // 
             // toolStripMenuItem6
             // 
             this.toolStripMenuItem6.Name = "toolStripMenuItem6";
-            this.toolStripMenuItem6.Size = new System.Drawing.Size(241, 6);
+            this.toolStripMenuItem6.Size = new System.Drawing.Size(229, 6);
             // 
             // informationToolStripMenuItem
             // 
             this.informationToolStripMenuItem.Name = "informationToolStripMenuItem";
-            this.informationToolStripMenuItem.Size = new System.Drawing.Size(244, 22);
+            this.informationToolStripMenuItem.Size = new System.Drawing.Size(232, 22);
             this.informationToolStripMenuItem.Text = "Information";
             this.informationToolStripMenuItem.Click += new System.EventHandler(this.informationToolStripMenuItem_Click);
             // 
@@ -318,6 +320,8 @@ private void InitializeComponent()
             this._rotateLeft,
             this._rotateRight,
             this.toolStripSeparator6,
+            this._textMode,
+            this.toolStripSeparator4,
             this._showToolbar,
             this._showBookmarks,
             this._getTextFromPage});
@@ -330,7 +334,7 @@ private void InitializeComponent()
             // toolStripLabel1
             // 
             this.toolStripLabel1.Name = "toolStripLabel1";
-            this.toolStripLabel1.Size = new System.Drawing.Size(36, 22);
+            this.toolStripLabel1.Size = new System.Drawing.Size(32, 22);
             this.toolStripLabel1.Text = "Page:";
             // 
             // _page
@@ -372,7 +376,7 @@ private void InitializeComponent()
             // toolStripLabel2
             // 
             this.toolStripLabel2.Name = "toolStripLabel2";
-            this.toolStripLabel2.Size = new System.Drawing.Size(42, 22);
+            this.toolStripLabel2.Size = new System.Drawing.Size(35, 22);
             this.toolStripLabel2.Text = "Zoom:";
             // 
             // _zoom
@@ -417,7 +421,7 @@ private void InitializeComponent()
             this._fitWidth.Image = ((System.Drawing.Image)(resources.GetObject("_fitWidth.Image")));
             this._fitWidth.ImageTransparentColor = System.Drawing.Color.Magenta;
             this._fitWidth.Name = "_fitWidth";
-            this._fitWidth.Size = new System.Drawing.Size(59, 22);
+            this._fitWidth.Size = new System.Drawing.Size(55, 22);
             this._fitWidth.Text = "Fit Width";
             this._fitWidth.Click += new System.EventHandler(this._fitWidth_Click);
             // 
@@ -427,7 +431,7 @@ private void InitializeComponent()
             this._fitHeight.Image = ((System.Drawing.Image)(resources.GetObject("_fitHeight.Image")));
             this._fitHeight.ImageTransparentColor = System.Drawing.Color.Magenta;
             this._fitHeight.Name = "_fitHeight";
-            this._fitHeight.Size = new System.Drawing.Size(63, 22);
+            this._fitHeight.Size = new System.Drawing.Size(60, 22);
             this._fitHeight.Text = "Fit Height";
             this._fitHeight.Click += new System.EventHandler(this._fitHeight_Click);
             // 
@@ -437,7 +441,7 @@ private void InitializeComponent()
             this._fitBest.Image = ((System.Drawing.Image)(resources.GetObject("_fitBest.Image")));
             this._fitBest.ImageTransparentColor = System.Drawing.Color.Magenta;
             this._fitBest.Name = "_fitBest";
-            this._fitBest.Size = new System.Drawing.Size(49, 22);
+            this._fitBest.Size = new System.Drawing.Size(51, 22);
             this._fitBest.Text = "Fit Best";
             this._fitBest.Click += new System.EventHandler(this._fitBest_Click);
             // 
@@ -452,7 +456,7 @@ private void InitializeComponent()
             this._rotateLeft.Image = ((System.Drawing.Image)(resources.GetObject("_rotateLeft.Image")));
             this._rotateLeft.ImageTransparentColor = System.Drawing.Color.Magenta;
             this._rotateLeft.Name = "_rotateLeft";
-            this._rotateLeft.Size = new System.Drawing.Size(68, 22);
+            this._rotateLeft.Size = new System.Drawing.Size(67, 22);
             this._rotateLeft.Text = "Rotate Left";
             this._rotateLeft.Click += new System.EventHandler(this._rotateLeft_Click);
             // 
@@ -462,7 +466,7 @@ private void InitializeComponent()
             this._rotateRight.Image = ((System.Drawing.Image)(resources.GetObject("_rotateRight.Image")));
             this._rotateRight.ImageTransparentColor = System.Drawing.Color.Magenta;
             this._rotateRight.Name = "_rotateRight";
-            this._rotateRight.Size = new System.Drawing.Size(76, 22);
+            this._rotateRight.Size = new System.Drawing.Size(74, 22);
             this._rotateRight.Text = "Rotate Right";
             this._rotateRight.Click += new System.EventHandler(this._rotateRight_Click);
             // 
@@ -478,7 +482,7 @@ private void InitializeComponent()
             this._showToolbar.Image = ((System.Drawing.Image)(resources.GetObject("_showToolbar.Image")));
             this._showToolbar.ImageTransparentColor = System.Drawing.Color.Magenta;
             this._showToolbar.Name = "_showToolbar";
-            this._showToolbar.Size = new System.Drawing.Size(83, 22);
+            this._showToolbar.Size = new System.Drawing.Size(78, 22);
             this._showToolbar.Text = "Show Toolbar";
             this._showToolbar.Click += new System.EventHandler(this._hideToolbar_Click);
             // 
@@ -489,7 +493,7 @@ private void InitializeComponent()
             this._showBookmarks.Image = ((System.Drawing.Image)(resources.GetObject("_showBookmarks.Image")));
             this._showBookmarks.ImageTransparentColor = System.Drawing.Color.Magenta;
             this._showBookmarks.Name = "_showBookmarks";
-            this._showBookmarks.Size = new System.Drawing.Size(102, 22);
+            this._showBookmarks.Size = new System.Drawing.Size(97, 22);
             this._showBookmarks.Text = "Show Bookmarks";
             this._showBookmarks.Click += new System.EventHandler(this._hideBookmarks_Click);
             // 
@@ -499,7 +503,7 @@ private void InitializeComponent()
             this._getTextFromPage.Image = ((System.Drawing.Image)(resources.GetObject("_getTextFromPage.Image")));
             this._getTextFromPage.ImageTransparentColor = System.Drawing.Color.Magenta;
             this._getTextFromPage.Name = "_getTextFromPage";
-            this._getTextFromPage.Size = new System.Drawing.Size(53, 22);
+            this._getTextFromPage.Size = new System.Drawing.Size(54, 22);
             this._getTextFromPage.Text = "Get Text";
             this._getTextFromPage.ToolTipText = "Get Text From Current Page";
             this._getTextFromPage.Click += new System.EventHandler(this._getTextFromPage_Click);
@@ -511,7 +515,7 @@ private void InitializeComponent()
             this._pageToolStripLabel,
             this.toolStripStatusLabel2,
             this._coordinatesToolStripLabel});
-            this.statusStrip1.Location = new System.Drawing.Point(0, 573);
+            this.statusStrip1.Location = new System.Drawing.Point(0, 527);
             this.statusStrip1.Name = "statusStrip1";
             this.statusStrip1.Size = new System.Drawing.Size(1128, 22);
             this.statusStrip1.TabIndex = 3;
@@ -520,25 +524,25 @@ private void InitializeComponent()
             // toolStripStatusLabel1
             // 
             this.toolStripStatusLabel1.Name = "toolStripStatusLabel1";
-            this.toolStripStatusLabel1.Size = new System.Drawing.Size(36, 17);
+            this.toolStripStatusLabel1.Size = new System.Drawing.Size(32, 17);
             this.toolStripStatusLabel1.Text = "Page:";
             // 
             // _pageToolStripLabel
             // 
             this._pageToolStripLabel.Name = "_pageToolStripLabel";
-            this._pageToolStripLabel.Size = new System.Drawing.Size(41, 17);
+            this._pageToolStripLabel.Size = new System.Drawing.Size(37, 17);
             this._pageToolStripLabel.Text = "(page)";
             // 
             // toolStripStatusLabel2
             // 
             this.toolStripStatusLabel2.Name = "toolStripStatusLabel2";
-            this.toolStripStatusLabel2.Size = new System.Drawing.Size(74, 17);
+            this.toolStripStatusLabel2.Size = new System.Drawing.Size(68, 17);
             this.toolStripStatusLabel2.Text = "Coordinates:";
             // 
             // _coordinatesToolStripLabel
             // 
             this._coordinatesToolStripLabel.Name = "_coordinatesToolStripLabel";
-            this._coordinatesToolStripLabel.Size = new System.Drawing.Size(77, 17);
+            this._coordinatesToolStripLabel.Size = new System.Drawing.Size(72, 17);
             this._coordinatesToolStripLabel.Text = "(coordinates)";
             // 
             // pdfViewerContextMenu
@@ -547,20 +551,20 @@ private void InitializeComponent()
             this.copyToolStripMenuItem,
             this.selectAllToolStripMenuItem});
             this.pdfViewerContextMenu.Name = "pdfViewerContextMenu";
-            this.pdfViewerContextMenu.Size = new System.Drawing.Size(123, 48);
+            this.pdfViewerContextMenu.Size = new System.Drawing.Size(121, 48);
             this.pdfViewerContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.pdfViewerContextMenu_Opening);
             // 
             // copyToolStripMenuItem
             // 
             this.copyToolStripMenuItem.Name = "copyToolStripMenuItem";
-            this.copyToolStripMenuItem.Size = new System.Drawing.Size(122, 22);
+            this.copyToolStripMenuItem.Size = new System.Drawing.Size(120, 22);
             this.copyToolStripMenuItem.Text = "&Copy";
             this.copyToolStripMenuItem.Click += new System.EventHandler(this.copyToolStripMenuItem_Click);
             // 
             // selectAllToolStripMenuItem
             // 
             this.selectAllToolStripMenuItem.Name = "selectAllToolStripMenuItem";
-            this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(122, 22);
+            this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(120, 22);
             this.selectAllToolStripMenuItem.Text = "Select &All";
             this.selectAllToolStripMenuItem.Click += new System.EventHandler(this.selectAllToolStripMenuItem_Click);
             // 
@@ -569,14 +573,30 @@ private void InitializeComponent()
             this.pdfViewer1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.pdfViewer1.Location = new System.Drawing.Point(0, 49);
             this.pdfViewer1.Name = "pdfViewer1";
-            this.pdfViewer1.Size = new System.Drawing.Size(1128, 524);
+            this.pdfViewer1.Size = new System.Drawing.Size(1128, 478);
             this.pdfViewer1.TabIndex = 0;
             // 
+            // toolStripSeparator4
+            // 
+            this.toolStripSeparator4.Name = "toolStripSeparator4";
+            this.toolStripSeparator4.Size = new System.Drawing.Size(6, 25);
+            // 
+            // _textMode
+            // 
+            this._textMode.CheckOnClick = true;
+            this._textMode.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+            this._textMode.Image = ((System.Drawing.Image)(resources.GetObject("_textMode.Image")));
+            this._textMode.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this._textMode.Name = "_textMode";
+            this._textMode.Size = new System.Drawing.Size(67, 22);
+            this._textMode.Text = "Text　Mode";
+            this._textMode.Click += new System.EventHandler(this._textMode_Click);
+            // 
             // MainForm
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1128, 595);
+            this.ClientSize = new System.Drawing.Size(1128, 549);
             this.Controls.Add(this.pdfViewer1);
             this.Controls.Add(this.statusStrip1);
             this.Controls.Add(this.toolStrip1);
@@ -657,6 +677,8 @@ private void InitializeComponent()
         private System.Windows.Forms.ContextMenuStrip pdfViewerContextMenu;
         private System.Windows.Forms.ToolStripMenuItem copyToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem selectAllToolStripMenuItem;
+        private System.Windows.Forms.ToolStripButton _textMode;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
     }
 }
 
diff --git a/PdfiumViewer.Demo/MainForm.cs b/PdfiumViewer.Demo/MainForm.cs
index 87dd7b70..c0a39649 100644
--- a/PdfiumViewer.Demo/MainForm.cs
+++ b/PdfiumViewer.Demo/MainForm.cs
@@ -280,15 +280,9 @@ private void _hideBookmarks_Click(object sender, EventArgs e)
 
         private void deleteCurrentPageToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            // PdfRenderer does not support changes to the loaded document,
-            // so we fake it by reloading the document into the renderer.
-
             int page = pdfViewer1.Renderer.Page;
-            var document = pdfViewer1.Document;
-            pdfViewer1.Document = null;
-            document.DeletePage(page);
-            pdfViewer1.Document = document;
-            pdfViewer1.Renderer.Page = page;
+            pdfViewer1.Document.DeletePage(page);
+            pdfViewer1.Renderer.ReloadDocument();
         }
 
         private void rotate0ToolStripMenuItem_Click(object sender, EventArgs e)
@@ -313,15 +307,9 @@ private void rotate270ToolStripMenuItem_Click(object sender, EventArgs e)
 
         private void Rotate(PdfRotation rotate)
         {
-            // PdfRenderer does not support changes to the loaded document,
-            // so we fake it by reloading the document into the renderer.
-
             int page = pdfViewer1.Renderer.Page;
-            var document = pdfViewer1.Document;
-            pdfViewer1.Document = null;
-            document.RotatePage(page, rotate);
-            pdfViewer1.Document = document;
-            pdfViewer1.Renderer.Page = page;
+            pdfViewer1.Document.RotatePage(page, rotate);
+            pdfViewer1.Renderer.ReloadDocument();
         }
 
         private void showRangeOfPagesToolStripMenuItem_Click(object sender, EventArgs e)
@@ -395,5 +383,10 @@ private void pdfViewerContextMenu_Opening(object sender, CancelEventArgs e)
         {
             copyToolStripMenuItem.Enabled = pdfViewer1.Renderer.IsTextSelected;
         }
+
+        private void _textMode_Click(object sender, EventArgs e)
+        {
+            pdfViewer1.Renderer.CursorMode = (pdfViewer1.Renderer.CursorMode == PdfCursorMode.Pan) ? PdfCursorMode.TextSelection : PdfCursorMode.Pan;
+        }
     }
 }
diff --git a/PdfiumViewer.Demo/MainForm.resx b/PdfiumViewer.Demo/MainForm.resx
index c32d9b38..35df8487 100644
--- a/PdfiumViewer.Demo/MainForm.resx
+++ b/PdfiumViewer.Demo/MainForm.resx
@@ -257,6 +257,21 @@
         mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
         kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
         TgDQASA1MVpwzwAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="_textMode.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+        YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
+        0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
+        bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
+        VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
+        c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
+        Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
+        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
+        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
+        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="_showToolbar.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
diff --git a/PdfiumViewer.Demo/PdfRangeDocument.cs b/PdfiumViewer.Demo/PdfRangeDocument.cs
index 3dee0e6f..1d0c43a0 100644
--- a/PdfiumViewer.Demo/PdfRangeDocument.cs
+++ b/PdfiumViewer.Demo/PdfRangeDocument.cs
@@ -303,11 +303,6 @@ public int CountCharacters(int page)
             return _document.CountCharacters(page);
         }
 
-        public List<PdfRectangle> GetTextRectangles(int page, int startIndex, int count)
-        {
-            return _document.GetTextRectangles(page, startIndex, count);
-        }
-
         private int TranslatePage(int page)
         {
             if (page < 0 || page >= PageCount)
diff --git a/PdfiumViewer.Demo/PdfiumViewer.Demo.csproj b/PdfiumViewer.Demo/PdfiumViewer.Demo.csproj
index 54f680ee..443da779 100644
--- a/PdfiumViewer.Demo/PdfiumViewer.Demo.csproj
+++ b/PdfiumViewer.Demo/PdfiumViewer.Demo.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\PdfiumViewer.Native.x86.v8-xfa.2017.11.2.204\build\PdfiumViewer.Native.x86.v8-xfa.props" Condition="Exists('..\packages\PdfiumViewer.Native.x86.v8-xfa.2017.11.2.204\build\PdfiumViewer.Native.x86.v8-xfa.props')" />
-  <Import Project="..\packages\PdfiumViewer.Native.x86_64.v8-xfa.2017.11.2.204\build\PdfiumViewer.Native.x86_64.v8-xfa.props" Condition="Exists('..\packages\PdfiumViewer.Native.x86_64.v8-xfa.2017.11.2.204\build\PdfiumViewer.Native.x86_64.v8-xfa.props')" />
+  <Import Project="..\packages\PDFium.x86.v8-xfa.4194.0.0\Build\pdfium.x86.v8-xfa.props" Condition="Exists('..\packages\PDFium.x86.v8-xfa.4194.0.0\Build\pdfium.x86.v8-xfa.props')" />
+  <Import Project="..\packages\PDFium.x64.v8-xfa.4194.0.0\Build\pdfium.x64.v8-xfa.props" Condition="Exists('..\packages\PDFium.x64.v8-xfa.4194.0.0\Build\pdfium.x64.v8-xfa.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -160,8 +160,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\PdfiumViewer.Native.x86_64.v8-xfa.2017.11.2.204\build\PdfiumViewer.Native.x86_64.v8-xfa.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PdfiumViewer.Native.x86_64.v8-xfa.2017.11.2.204\build\PdfiumViewer.Native.x86_64.v8-xfa.props'))" />
-    <Error Condition="!Exists('..\packages\PdfiumViewer.Native.x86.v8-xfa.2017.11.2.204\build\PdfiumViewer.Native.x86.v8-xfa.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PdfiumViewer.Native.x86.v8-xfa.2017.11.2.204\build\PdfiumViewer.Native.x86.v8-xfa.props'))" />
+    <Error Condition="!Exists('..\packages\PDFium.x64.v8-xfa.4194.0.0\Build\pdfium.x64.v8-xfa.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PDFium.x64.v8-xfa.4194.0.0\Build\pdfium.x64.v8-xfa.props'))" />
+    <Error Condition="!Exists('..\packages\PDFium.x86.v8-xfa.4194.0.0\Build\pdfium.x86.v8-xfa.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PDFium.x86.v8-xfa.4194.0.0\Build\pdfium.x86.v8-xfa.props'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/PdfiumViewer.Demo/packages.config b/PdfiumViewer.Demo/packages.config
index 60ebdc94..049ddf1d 100644
--- a/PdfiumViewer.Demo/packages.config
+++ b/PdfiumViewer.Demo/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="PdfiumViewer.Native.x86.v8-xfa" version="2017.11.2.204" targetFramework="net20" />
-  <package id="PdfiumViewer.Native.x86_64.v8-xfa" version="2017.11.2.204" targetFramework="net20" />
+  <package id="PDFium.x64.v8-xfa" version="4194.0.0" targetFramework="net20" />
+  <package id="PDFium.x86.v8-xfa" version="4194.0.0" targetFramework="net20" />
 </packages>
\ No newline at end of file
diff --git a/PdfiumViewer.Test/PdfiumViewer.Test.csproj b/PdfiumViewer.Test/PdfiumViewer.Test.csproj
index c10d65d8..1737ce6e 100644
--- a/PdfiumViewer.Test/PdfiumViewer.Test.csproj
+++ b/PdfiumViewer.Test/PdfiumViewer.Test.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>PdfiumViewer.Test</RootNamespace>
     <AssemblyName>PdfiumViewer.Test</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -20,6 +21,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -28,6 +30,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="nunit.framework">
diff --git a/PdfiumViewer.Test/packages.config b/PdfiumViewer.Test/packages.config
index 512ce05d..24af581c 100644
--- a/PdfiumViewer.Test/packages.config
+++ b/PdfiumViewer.Test/packages.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="NUnit" version="2.6.4" targetFramework="net40" />
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NUnit" version="2.6.4" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/PdfiumViewer.WPFDemo/App.config b/PdfiumViewer.WPFDemo/App.config
index 8e156463..5ffd8f8e 100644
--- a/PdfiumViewer.WPFDemo/App.config
+++ b/PdfiumViewer.WPFDemo/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
-    </startup>
-</configuration>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
+    </startup>
+</configuration>
diff --git a/PdfiumViewer.WPFDemo/PdfiumViewer.WPFDemo.csproj b/PdfiumViewer.WPFDemo/PdfiumViewer.WPFDemo.csproj
index 614d2b7d..91b93d48 100644
--- a/PdfiumViewer.WPFDemo/PdfiumViewer.WPFDemo.csproj
+++ b/PdfiumViewer.WPFDemo/PdfiumViewer.WPFDemo.csproj
@@ -9,10 +9,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>PdfiumViewer.WPFDemo</RootNamespace>
     <AssemblyName>PdfiumViewer.WPFDemo</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
diff --git a/PdfiumViewer.WPFDemo/Properties/Resources.Designer.cs b/PdfiumViewer.WPFDemo/Properties/Resources.Designer.cs
index 0c40e3a1..d7904b37 100644
--- a/PdfiumViewer.WPFDemo/Properties/Resources.Designer.cs
+++ b/PdfiumViewer.WPFDemo/Properties/Resources.Designer.cs
@@ -1,71 +1,63 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.36323
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace PdfiumViewer.WPFDemo.Properties
-{
-
-
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources
-    {
-
-        private static global::System.Resources.ResourceManager resourceMan;
-
-        private static global::System.Globalization.CultureInfo resourceCulture;
-
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources()
-        {
-        }
-
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager
-        {
-            get
-            {
-                if ((resourceMan == null))
-                {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("PdfiumViewer.WPFDemo.Properties.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture
-        {
-            get
-            {
-                return resourceCulture;
-            }
-            set
-            {
-                resourceCulture = value;
-            }
-        }
-    }
-}
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     このコードはツールによって生成されました。
+//     ランタイム バージョン:4.0.30319.42000
+//
+//     このファイルへの変更は、以下の状況下で不正な動作の原因になったり、
+//     コードが再生成されるときに損失したりします。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace PdfiumViewer.WPFDemo.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   ローカライズされた文字列などを検索するための、厳密に型指定されたリソース クラスです。
+    /// </summary>
+    // このクラスは StronglyTypedResourceBuilder クラスが ResGen
+    // または Visual Studio のようなツールを使用して自動生成されました。
+    // メンバーを追加または削除するには、.ResX ファイルを編集して、/str オプションと共に
+    // ResGen を実行し直すか、または VS プロジェクトをビルドし直します。
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   このクラスで使用されているキャッシュされた ResourceManager インスタンスを返します。
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("PdfiumViewer.WPFDemo.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   すべてについて、現在のスレッドの CurrentUICulture プロパティをオーバーライドします
+        ///   現在のスレッドの CurrentUICulture プロパティをオーバーライドします。
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+    }
+}
diff --git a/PdfiumViewer.WPFDemo/Properties/Settings.Designer.cs b/PdfiumViewer.WPFDemo/Properties/Settings.Designer.cs
index 638c15f4..badfdf10 100644
--- a/PdfiumViewer.WPFDemo/Properties/Settings.Designer.cs
+++ b/PdfiumViewer.WPFDemo/Properties/Settings.Designer.cs
@@ -1,30 +1,26 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.36323
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace PdfiumViewer.WPFDemo.Properties
-{
-
-
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
-    {
-
-        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
-        public static Settings Default
-        {
-            get
-            {
-                return defaultInstance;
-            }
-        }
-    }
-}
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     このコードはツールによって生成されました。
+//     ランタイム バージョン:4.0.30319.42000
+//
+//     このファイルへの変更は、以下の状況下で不正な動作の原因になったり、
+//     コードが再生成されるときに損失したりします。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace PdfiumViewer.WPFDemo.Properties {
+    
+    
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.4.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+        
+        public static Settings Default {
+            get {
+                return defaultInstance;
+            }
+        }
+    }
+}
diff --git a/PdfiumViewer/CustomScrollControl.cs b/PdfiumViewer/CustomScrollControl.cs
index 7abd6e02..285fd046 100644
--- a/PdfiumViewer/CustomScrollControl.cs
+++ b/PdfiumViewer/CustomScrollControl.cs
@@ -15,6 +15,8 @@ public class CustomScrollControl : Control
     {
         private Size _displaySize;
         private Rectangle _displayRect;
+        private double _displayRect_X;	// Patch: Repeated magnification causes the display position to shift due to rounding error.
+        private double _displayRect_Y;	// Patch: Same as Above
         private readonly ScrollProperties _verticalScroll;
         private readonly ScrollProperties _horizontalScroll;
 
@@ -123,6 +125,11 @@ private bool ApplyScrollbarChanges()
             var fullClient = ClientRectangle;
             var minClient = fullClient;
 
+            if (fullClient.Height == 0)
+            {
+                return false;
+            }
+
             if (HScroll)
                 fullClient.Height += SystemInformation.HorizontalScrollBarHeight;
             else
@@ -239,12 +246,12 @@ public void SetDisplayRectLocation(Point offset, bool preserveContents)
             SyncScrollbars();
         }
 
-        private void SetDisplayRectLocation(int x, int y)
+        private void SetDisplayRectLocation(double x, double y)
         {
             SetDisplayRectLocation(x, y, true);
         }
 
-        private void SetDisplayRectLocation(int x, int y, bool preserveContents)
+        private void SetDisplayRectLocation(double x, double y, bool preserveContents)
         {
             int xDelta = 0;
             int yDelta = 0;
@@ -264,13 +271,15 @@ private void SetDisplayRectLocation(int x, int y, bool preserveContents)
                 y = minY;
 
             if (displayRectangle.X != x)
-                xDelta = x - displayRectangle.X;
+                xDelta = (int)(x - _displayRect_X);
             if (displayRectangle.Y != y)
-                yDelta = y - displayRectangle.Y;
-
-            _displayRect.X = x;
-            _displayRect.Y = y;
+                yDelta = (int)(y - _displayRect_Y);
 
+            _displayRect_X = x;
+            _displayRect_Y = y;
+            _displayRect.X = (int)x;
+            _displayRect.Y = (int)y;
+            
             if ((xDelta != 0 || yDelta != 0) && IsHandleCreated && preserveContents)
             {
                 var cr = ClientRectangle;
@@ -317,8 +326,8 @@ private bool SetVisibleScrollbars(bool horiz, bool vert)
 
             if (needLayout)
             {
-                int x = _displayRect.X;
-                int y = _displayRect.Y;
+                double x = _displayRect_X;
+                double y = _displayRect_Y;
 
                 if (!horiz)
                     x = 0;
@@ -349,7 +358,7 @@ private bool SetDisplayRectangleSize(int width, int height)
         {
             bool needLayout = false;
 
-            double hScale = (double)width / _displayRect.Height;
+            double hScale = (double)width / _displayRect.Width;
             double vScale = (double)height / _displayRect.Height;
 
             if (_displayRect.Width != width || _displayRect.Height != height)
@@ -368,8 +377,8 @@ private bool SetDisplayRectangleSize(int width, int height)
             if (minY > 0)
                 minY = 0;
 
-            int x = (int)(_displayRect.X * hScale);
-            int y = (int)(_displayRect.Y * vScale);
+            double x = (_displayRect_X * hScale);
+            double y = (_displayRect_Y * vScale);
 
             if (!HScroll || x > 0)
                 x = 0;
@@ -381,7 +390,7 @@ private bool SetDisplayRectangleSize(int width, int height)
             if (y < minY)
                 y = minY;
 
-            SetDisplayRectLocation(x, y);
+            SetDisplayRectLocation(x, y, false);
 
             return needLayout;
         }
diff --git a/PdfiumViewer/IPdfDocument.cs b/PdfiumViewer/IPdfDocument.cs
index 92a137c9..d311e752 100644
--- a/PdfiumViewer/IPdfDocument.cs
+++ b/PdfiumViewer/IPdfDocument.cs
@@ -280,10 +280,11 @@ public interface IPdfDocument : IDisposable
         int CountCharacters(int page);
 
         /// <summary>
-        /// Gets the rectangular areas occupied by a segment of text
+        /// Retrieves the text style information for a specific character on a page.
         /// </summary>
-        /// <param name="page">The page to get the rectangles from</param>
-        /// <returns>The rectangular areas occupied by a segment of text</returns>
-        List<PdfRectangle> GetTextRectangles(int page, int startIndex, int count);
+        /// <param name="page">The page number.</param>
+        /// <param name="charIndex">The character index on the page.</param>
+        /// <returns>A PdfTextStyle object containing style information.</returns>
+        PdfTextStyle GetTextStyle(int page, int charIndex);
     }
 }
diff --git a/PdfiumViewer/IPdfMarker.cs b/PdfiumViewer/IPdfMarker.cs
index c8c2dd5b..f22b2209 100644
--- a/PdfiumViewer/IPdfMarker.cs
+++ b/PdfiumViewer/IPdfMarker.cs
@@ -15,6 +15,11 @@ public interface IPdfMarker
         /// </summary>
         int Page { get; }
 
+        /// <summary>
+        /// The marker Tag by purpose.
+        /// </summary>
+        int Tag { get; }
+
         /// <summary>
         /// Draw the marker.
         /// </summary>
diff --git a/PdfiumViewer/Key.snk b/PdfiumViewer/Key.snk
deleted file mode 100644
index 7526af7a..00000000
Binary files a/PdfiumViewer/Key.snk and /dev/null differ
diff --git a/PdfiumViewer/NativeMethods.Pdfium.cs b/PdfiumViewer/NativeMethods.Pdfium.cs
index 54aa47ba..f126afa5 100644
--- a/PdfiumViewer/NativeMethods.Pdfium.cs
+++ b/PdfiumViewer/NativeMethods.Pdfium.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.Text;
@@ -19,19 +19,27 @@ partial class NativeMethods
         // threads, even when there are multiple AppDomain's in play.
         private static readonly string LockString = String.Intern("e362349b-001d-4cb2-bf55-a71606a3e36f");
 
-        public static void FPDF_AddRef()
+        public static void FPDF_InitLibrary()
         {
             lock (LockString)
             {
-                Imports.FPDF_AddRef();
+                Imports.FPDF_InitLibrary();
             }
         }
 
-        public static void FPDF_Release()
+        public static void FPDF_InitEmbeddedLibraries()
         {
             lock (LockString)
             {
-                Imports.FPDF_Release();
+                Imports.FPDF_InitEmbeddedLibraries();
+            }
+        }
+
+        public static void FPDF_DestroyLibrary()
+        {
+            lock (LockString)
+            {
+                Imports.FPDF_DestroyLibrary();
             }
         }
 
@@ -275,11 +283,19 @@ public static int FPDFText_GetSchCount(IntPtr handle)
             }
         }
 
-        public static int FPDFText_GetText(IntPtr page, int start_index, int count, byte[] result)
+        public static int FPDFText_CountChars(IntPtr page)
         {
             lock (LockString)
             {
-                return Imports.FPDFText_GetText(page, start_index, count, result);
+                return Imports.FPDFText_CountChars(page);
+            }
+        }
+
+        public static char FPDFText_GetUnicode(IntPtr page, int index)
+        {
+            lock (LockString)
+            {
+                return Imports.FPDFText_GetUnicode(page, index);
             }
         }
 
@@ -290,6 +306,22 @@ public static void FPDFText_GetCharBox(IntPtr page, int index, out double left,
                 Imports.FPDFText_GetCharBox(page, index, out left, out right, out bottom, out top);
             }
         }
+        
+        public static bool FPDFText_GetLooseCharBox(IntPtr page, int index, out FS_RECTF rect)
+        {
+            lock (LockString)
+            {
+                return Imports.FPDFText_GetLooseCharBox(page, index, out rect);
+            }
+        }
+
+        public static void FPDFText_GetCharOrigin(IntPtr page, int index, out double x, out double y)
+        {
+            lock (LockString)
+            {
+                Imports.FPDFText_GetCharOrigin(page, index, out x, out y);
+            }
+        }
 
         public static int FPDFText_GetCharIndexAtPos(IntPtr page, double x, double y, double xTolerance, double yTolerance)
         {
@@ -302,11 +334,28 @@ public static int FPDFText_GetCharIndexAtPos(IntPtr page, double x, double y, do
             }
         }
 
-        public static int FPDFText_CountChars(IntPtr page)
+        public static int FPDFText_GetText(IntPtr page, int start_index, int count, byte[] result)
         {
             lock (LockString)
             {
-                return Imports.FPDFText_CountChars(page);
+                return Imports.FPDFText_GetText(page, start_index, count, result);
+            }
+        }
+
+
+        public static int FPDFText_CountRects(IntPtr page, int start_index, int count)
+        {
+            lock (LockString)
+            {
+                return Imports.FPDFText_CountRects(page, start_index, count);
+            }
+        }
+
+        public static void FPDFText_GetRect(IntPtr page, int rect_index, out double left, out double top, out double right, out double bottom)
+        {
+            lock (LockString)
+            {
+                Imports.FPDFText_GetRect(page, rect_index, out left, out top, out right, out bottom);
             }
         }
 
@@ -336,14 +385,6 @@ public static List<PdfRectangle> FPDFText_GetRectangles(IntPtr page, int pageInd
             }
         }
 
-        public static char FPDFText_GetUnicode(IntPtr page, int index)
-        {
-            lock (LockString)
-            {
-                return Imports.FPDFText_GetUnicode(page, index);
-            }
-        }
-
         public static bool FPDFText_FindNext(IntPtr handle)
         {
             lock (LockString)
@@ -376,19 +417,19 @@ public static IntPtr FPDFLink_GetDest(IntPtr document, IntPtr link)
             }
         }
 
-        public static uint FPDFDest_GetPageIndex(IntPtr document, IntPtr dest)
+        public static uint FPDFDest_GetDestPageIndex(IntPtr document, IntPtr dest)
         {
             lock (LockString)
             {
-                return Imports.FPDFDest_GetPageIndex(document, dest);
+                return Imports.FPDFDest_GetDestPageIndex(document, dest);
             }
         }
 
-        public static bool FPDFLink_GetAnnotRect(IntPtr linkAnnot, FS_RECTF rect)
+        public static bool FPDFLink_GetAnnotRect(IntPtr linkAnnot, out FS_RECTF rect)
         {
             lock (LockString)
             {
-                return Imports.FPDFLink_GetAnnotRect(linkAnnot, rect);
+                return Imports.FPDFLink_GetAnnotRect(linkAnnot, out rect);
             }
         }
 
@@ -501,8 +542,122 @@ public static uint FPDF_GetMetaText(IntPtr document, string tag, byte[] buffer,
             }
         }
 
+        #region Experimental APIs
+        public static void FPDFText_GetFillColor(IntPtr page, int index, out Color fillColor)
+        {
+            lock (LockString)
+            {
+                uint r, g, b, a;
+                Imports.FPDFText_GetFillColor(page, index, out r, out g, out b, out a);
+                fillColor = Color.FromArgb((int)a, (int)r, (int)g, (int)b);
+            }
+        }
+
+        public static void FPDFText_GetStrokeColor(IntPtr page, int index, out Color strokeColor)
+        {
+            lock (LockString)
+            {
+                uint r, g, b, a;
+                Imports.FPDFText_GetStrokeColor(page, index, out r, out g, out b, out a);
+                strokeColor = Color.FromArgb((int)a, (int)r, (int)g, (int)b);
+            }
+        }
+
+        public static int FPDFPage_GetAnnotCount(IntPtr page)
+        {
+            lock (LockString)
+            {
+                return Imports.FPDFPage_GetAnnotCount(page);
+            }
+        }
+
+        public static IntPtr FPDFPage_GetAnnot(IntPtr page, int index)
+        {
+            lock (LockString)
+            {
+                return Imports.FPDFPage_GetAnnot(page, index);
+            }
+        }
+
+        public static void FPDFPage_CloseAnnot(IntPtr annot)
+        {
+            lock (LockString)
+            {
+                Imports.FPDFPage_CloseAnnot(annot);
+            }
+        }
+
+        public static FPDF_ANNOTATION_SUBTYPE FPDFAnnot_GetSubtype(IntPtr annot)
+        {
+            lock (LockString)
+            {
+                return Imports.FPDFAnnot_GetSubtype(annot);
+            }
+        }
+
+        public static void FPDFAnnot_GetColor(IntPtr annot, FPDFANNOT_COLORTYPE type, out Color annotColor)
+        {
+            lock (LockString)
+            {
+                uint r, g, b, a;
+                Imports.FPDFAnnot_GetColor(annot, type, out r, out g, out b, out a);
+                annotColor = Color.FromArgb((int)a, (int)r, (int)g, (int)b);
+            }
+        }
+
+        public static UIntPtr FPDFAnnot_CountAttachmentPoints(IntPtr annot)
+        {
+            lock (LockString)
+            {
+                return Imports.FPDFAnnot_CountAttachmentPoints(annot);
+            }
+        }
+
+        public static bool FPDFAnnot_GetAttachmentPoints(IntPtr annot, UIntPtr quad_index, out FS_QUADPOINTSF quad_points)
+        {
+            lock (LockString)
+            {
+                return Imports.FPDFAnnot_GetAttachmentPoints(annot, quad_index, out quad_points);
+            }
+        }
+
+        public static int FPDFPath_CountSegments(IntPtr pathObj)
+        {
+            lock (LockString)
+            {
+                return Imports.FPDFPath_CountSegments(pathObj);
+            }
+        }
+
+        public static IntPtr FPDFPath_GetPathSegment(IntPtr pathObj, int index)
+        {
+            lock (LockString)
+            {
+                return Imports.FPDFPath_GetPathSegment(pathObj, index);
+            }
+        }
+
+        public static FPDF_SEGMENT FPDFPathSegment_GetType(IntPtr pathSegment)
+        {
+            lock (LockString)
+            {
+                return Imports.FPDFPathSegment_GetType(pathSegment);
+            }
+        }
+
+        #endregion
+
+
         #region Save / Edit Methods
 
+        public static PdfRotation FPDFPage_GetRotation(IntPtr page)
+        {
+            lock (LockString)
+            {
+                return (PdfRotation)Imports.FPDFPage_GetRotation(page);
+            }
+        }
+
         public static void FPDFPage_SetRotation(IntPtr page, PdfRotation rotation)
         {
             lock (LockString)
@@ -511,6 +666,51 @@ public static void FPDFPage_SetRotation(IntPtr page, PdfRotation rotation)
             }
         }
 
+        public static int FPDFPage_CountObjects(IntPtr page)
+        {
+            lock (LockString)
+                return Imports.FPDFPage_CountObjects(page);
+        }
+        
+        public static IntPtr FPDFPage_GetObject(IntPtr page, int index)
+        {
+            lock (LockString)
+                return Imports.FPDFPage_GetObject(page, index);
+        }
+
+        public static FPDF_PAGEOBJ FPDFPageObj_GetType(IntPtr pageObject)
+        {
+            lock (LockString)
+                return (FPDF_PAGEOBJ)Imports.FPDFPageObj_GetType(pageObject);
+        }
+        
+        public static bool FPDFPageObj_GetBounds(IntPtr pageObject,
+            out float left, out float bottom, out float right, out float top)
+        {
+            lock (LockString)
+                return Imports.FPDFPageObj_GetBounds(pageObject, out left, out bottom, out right, out top);
+        }
+        
+        public static bool FPDFPageObj_GetFillColor(IntPtr pageObject,
+            out uint r, out uint g, out uint b, out uint a)
+        {
+            lock (LockString)
+                return Imports.FPDFPageObj_GetFillColor(pageObject, out r, out g, out b, out a);
+        }
+        
+        public static bool FPDFPageObj_GetStrokeColor(IntPtr pageObject,
+            out uint r, out uint g, out uint b, out uint a)
+        {
+            lock (LockString)
+                return Imports.FPDFPageObj_GetStrokeColor(pageObject, out r, out g, out b, out a);
+        }
+
+        public static bool FPDFPageObj_GetStrokeWidth(IntPtr pageObject, out float width)
+        {
+            lock (LockString)
+                return Imports.FPDFPageObj_GetStrokeWidth(pageObject, out width);
+        }
+
         public static bool FPDFPage_GenerateContent(IntPtr page)
         {
             lock (LockString)
@@ -638,10 +838,13 @@ private static int FPDF_SaveBlock(IntPtr fileWrite, IntPtr data, uint size)
         private static class Imports
         {
             [DllImport("pdfium.dll")]
-            public static extern void FPDF_AddRef();
+            public static extern void FPDF_InitLibrary();
 
             [DllImport("pdfium.dll")]
-            public static extern void FPDF_Release();
+            public static extern void FPDF_InitEmbeddedLibraries();
+
+            [DllImport("pdfium.dll")]
+            public static extern void FPDF_DestroyLibrary();
 
             [DllImport("pdfium.dll", CharSet = CharSet.Ansi)]            
             public static extern IntPtr FPDF_LoadCustomDocument([MarshalAs(UnmanagedType.LPStruct)]FPDF_FILEACCESS access, string password);
@@ -739,14 +942,20 @@ private static class Imports
             [DllImport("pdfium.dll")]
             public static extern int FPDFText_GetText(IntPtr page, int start_index, int count, byte[] result);
 
+            [DllImport("pdfium.dll")]
+            public static extern int FPDFText_CountChars(IntPtr page);
+
+            [DllImport("pdfium.dll", CharSet = CharSet.Unicode)]
+            public static extern char FPDFText_GetUnicode(IntPtr page, int index);
+
             [DllImport("pdfium.dll")]
             public static extern void FPDFText_GetCharBox(IntPtr page, int index, out double left, out double right, out double bottom, out double top);
 
             [DllImport("pdfium.dll")]
-            public static extern int FPDFText_GetCharIndexAtPos(IntPtr page, double x, double y, double xTolerance, double yTolerance);
+            public static extern void FPDFText_GetCharOrigin(IntPtr page, int index, out double x, out double y);
 
             [DllImport("pdfium.dll")]
-            public static extern int FPDFText_CountChars(IntPtr page);
+            public static extern int FPDFText_GetCharIndexAtPos(IntPtr page, double x, double y, double xTolerance, double yTolerance);
 
             [DllImport("pdfium.dll")]
             public static extern int FPDFText_CountRects(IntPtr page, int startIndex, int count);
@@ -754,9 +963,6 @@ private static class Imports
             [DllImport("pdfium.dll")]
             public static extern bool FPDFText_GetRect(IntPtr page, int index, out double left, out double top, out double right, out double bottom);
 
-            [DllImport("pdfium.dll", CharSet = CharSet.Unicode)]
-            public static extern char FPDFText_GetUnicode(IntPtr page, int index);
-
             [DllImport("pdfium.dll")]
             public static extern bool FPDFText_FindNext(IntPtr handle);
 
@@ -770,10 +976,10 @@ private static class Imports
             public static extern IntPtr FPDFLink_GetDest(IntPtr document, IntPtr link);
 
             [DllImport("pdfium.dll")]
-            public static extern uint FPDFDest_GetPageIndex(IntPtr document, IntPtr dest);
+            public static extern uint FPDFDest_GetDestPageIndex(IntPtr document, IntPtr dest);
 
             [DllImport("pdfium.dll")]
-            public static extern bool FPDFLink_GetAnnotRect(IntPtr linkAnnot, FS_RECTF rect);
+            public static extern bool FPDFLink_GetAnnotRect(IntPtr linkAnnot, out FS_RECTF rect);
 
             [DllImport("pdfium.dll")]
             public static extern void FPDF_DeviceToPage(IntPtr page, int start_x, int start_y, int size_x, int size_y, int rotate, int device_x, int device_y, out double page_x, out double page_y);
@@ -811,6 +1017,50 @@ private static class Imports
             [DllImport("pdfium.dll")]
             public static extern uint FPDF_GetMetaText(IntPtr document, string tag, byte[] buffer, uint buflen);
 
+            #region Experimental APIs
+            [DllImport("pdfium.dll")]
+            public static extern bool FPDFText_GetFillColor(IntPtr page, int index, out uint R, out uint G, out uint B, out uint A);
+
+            [DllImport("pdfium.dll")]
+            public static extern bool FPDFText_GetStrokeColor(IntPtr page, int index, out uint R, out uint G, out uint B, out uint A);
+
+            [DllImport("pdfium.dll")]
+            public static extern bool FPDFText_GetLooseCharBox(IntPtr page, int index, out FS_RECTF rect);
+
+            [DllImport("pdfium.dll")]
+            public static extern int FPDFPage_GetAnnotCount(IntPtr page);
+            
+            [DllImport("pdfium.dll")]
+            public static extern IntPtr FPDFPage_GetAnnot(IntPtr page, int index);
+
+            [DllImport("pdfium.dll")]
+            public static extern void FPDFPage_CloseAnnot(IntPtr annot);
+
+            [DllImport("pdfium.dll")]
+            public static extern FPDF_ANNOTATION_SUBTYPE FPDFAnnot_GetSubtype(IntPtr annot);
+            
+            [DllImport("pdfium.dll", CharSet = CharSet.Unicode)]
+            public static extern uint FPDFAnnot_GetStringValue(IntPtr annot, [MarshalAs(UnmanagedType.LPStr)]string key, StringBuilder buffer, uint buflen);
+
+            [DllImport("pdfium.dll")]
+            public static extern bool FPDFAnnot_GetColor(IntPtr annot, FPDFANNOT_COLORTYPE type, out uint R, out uint G, out uint B, out uint A);
+
+            [DllImport("pdfium.dll")]
+            public static extern UIntPtr FPDFAnnot_CountAttachmentPoints(IntPtr annot);
+            
+            [DllImport("pdfium.dll")]
+            public static extern bool FPDFAnnot_GetAttachmentPoints(IntPtr annot, UIntPtr quad_index, out FS_QUADPOINTSF quad_points);
+
+            [DllImport("pdfium.dll")]
+            public static extern int FPDFPath_CountSegments(IntPtr pathObj);
+
+            [DllImport("pdfium.dll")]
+            public static extern IntPtr FPDFPath_GetPathSegment(IntPtr pathObj, int index);
+
+            [DllImport("pdfium.dll")]
+            public static extern FPDF_SEGMENT FPDFPathSegment_GetType(IntPtr pathSegment);
+            #endregion
+
             #region Save/Edit APIs
 
             [DllImport("pdfium.dll")]
@@ -839,6 +1089,30 @@ public static extern bool FPDF_SaveWithVersion(IntPtr doc,
             [DllImport("pdfium.dll")]
             public static extern void FPDFPage_SetRotation(IntPtr page, int rotate);
 
+            [DllImport("pdfium.dll")]
+            public static extern int FPDFPage_CountObjects(IntPtr page);
+            
+            [DllImport("pdfium.dll")]
+            public static extern IntPtr FPDFPage_GetObject(IntPtr page, int index);
+            
+            [DllImport("pdfium.dll")]
+            public static extern int FPDFPageObj_GetType(IntPtr page_object);
+            
+            [DllImport("pdfium.dll")]
+            public static extern bool FPDFPageObj_GetBounds(IntPtr page_object,
+                out float left, out float bottom, out float right, out float top);
+            
+            [DllImport("pdfium.dll")]
+            public static extern bool FPDFPageObj_GetFillColor(IntPtr page_object,
+                out uint R, out uint G, out uint B, out uint A);
+            
+            [DllImport("pdfium.dll")]
+            public static extern bool FPDFPageObj_GetStrokeColor(IntPtr page_object,
+                out uint R, out uint G, out uint B, out uint A);
+
+            [DllImport("pdfium.dll")]
+            public static extern bool FPDFPageObj_GetStrokeWidth(IntPtr page, out float width);
+
             [DllImport("pdfium.dll")]
             public static extern IntPtr FPDF_CreateNewDocument();
 
@@ -990,7 +1264,7 @@ public enum FPDF_SEARCH_FLAGS
         }
 
         [StructLayout(LayoutKind.Sequential)]
-        public class FS_RECTF
+        public struct FS_RECTF
         {
             public float left;
             public float top;
@@ -998,16 +1272,70 @@ public class FS_RECTF
             public float bottom;
         }
 
+        [StructLayout(LayoutKind.Sequential)]
+        public struct FS_QUADPOINTSF
+        {
+            public float x1;
+            public float y1;
+            public float x2;
+            public float y2;
+            public float x3;
+            public float y3;
+            public float x4;
+            public float y4;
+        }
+
         public enum FPDF_ERR : uint
         {
-            FPDF_ERR_SUCCESS = 0,		// No error.
-            FPDF_ERR_UNKNOWN = 1,		// Unknown error.
-            FPDF_ERR_FILE = 2,		// File not found or could not be opened.
-            FPDF_ERR_FORMAT = 3,		// File not in PDF format or corrupted.
-            FPDF_ERR_PASSWORD = 4,		// Password required or incorrect password.
-            FPDF_ERR_SECURITY = 5,		// Unsupported security scheme.
-            FPDF_ERR_PAGE = 6		// Page not found or content error.
+            FPDF_ERR_SUCCESS = 0,       // No error.
+            FPDF_ERR_UNKNOWN = 1,       // Unknown error.
+            FPDF_ERR_FILE = 2,          // File not found or could not be opened.
+            FPDF_ERR_FORMAT = 3,        // File not in PDF format or corrupted.
+            FPDF_ERR_PASSWORD = 4,      // Password required or incorrect password.
+            FPDF_ERR_SECURITY = 5,      // Unsupported security scheme.
+            FPDF_ERR_PAGE = 6           // Page not found or content error.
+        }
+
+        #region Experimental APIs
+        public enum FPDF_ANNOTATION_SUBTYPE
+        {
+            UNKNOWN = 0,
+            TEXT = 1,
+            LINK = 2,
+            FREETEXT = 3,
+            LINE = 4,
+            SQUARE = 5,
+            CIRCLE = 6,
+            POLYGON = 7,
+            POLYLINE = 8,
+            HIGHLIGHT = 9,      // Highlight
+            UNDERLINE = 10,     // Underline
+            SQUIGGLY = 11,      // Squiggly
+            STRIKEOUT = 12,     // Strikeout
+            STAMP = 13,
+            CARET = 14,
+            INK = 15,
+            POPUP = 16,
+            FILEATTACHMENT = 17,
+            SOUND = 18,
+            MOVIE = 19,
+            WIDGET = 20,
+            SCREEN = 21,
+            PRINTERMARK = 22,
+            TRAPNET = 23,
+            WATERMARK = 24,
+            THREED = 25,
+            RICHMEDIA = 26,
+            XFAWIDGET = 27,
+            REDACT = 28
+        }
+
+        public enum FPDFANNOT_COLORTYPE
+        {
+            Color = 0,
+            InteriorColor = 1
         }
+        #endregion
 
         #region Save/Edit Structs and Flags
         [Flags]
@@ -1018,6 +1346,24 @@ public enum FPDF_SAVE_FLAGS
             FPDF_REMOVE_SECURITY = 3
         }
 
+        public enum FPDF_PAGEOBJ
+        {
+            UNKNOWN = 0,
+            TEXT = 1,
+            PATH = 2,
+            IMAGE = 3,
+            SHADING = 4,
+            FORMXOBJECT = 5
+        }
+
+        public enum FPDF_SEGMENT
+        {
+            UNKNOWN = -1,
+            LINETO = 0,
+            BEZIERTO = 1,
+            MOVETO = 2
+        }
+
         [StructLayout(LayoutKind.Sequential)]
         public class FPDF_FILEACCESS
         {
diff --git a/PdfiumViewer/PanningZoomingScrollControl.cs b/PdfiumViewer/PanningZoomingScrollControl.cs
index a87132b0..a62b2e28 100644
--- a/PdfiumViewer/PanningZoomingScrollControl.cs
+++ b/PdfiumViewer/PanningZoomingScrollControl.cs
@@ -28,6 +28,7 @@ static PanningZoomingScrollControl()
         }
 
         private double _zoom = 1;
+        private bool _capture = false;
         private bool _canPan;
         private Point _dragStart;
         private Point _startOffset;
@@ -128,8 +129,6 @@ public void ZoomOut()
         /// <param name="e">A <see cref="T:System.Windows.Forms.MouseEventArgs"/> that contains the event data. </param>
         protected override void OnMouseWheel(MouseEventArgs e)
         {
-            base.OnMouseWheel(e);
-
             bool doZoom;
 
             switch (MouseWheelMode)
@@ -248,7 +247,7 @@ protected override void OnMouseDown(MouseEventArgs e)
             if (!MousePanningEnabled || e.Button != MouseButtons.Left || !_canPan)
                 return;
 
-            Capture = true;
+            _capture = true;
             _dragStart = e.Location;
             _startOffset = DisplayRectangle.Location;
         }
@@ -257,7 +256,7 @@ protected override void OnMouseMove(MouseEventArgs e)
         {
             base.OnMouseMove(e);
 
-            if (!MousePanningEnabled || !Capture)
+            if (!_capture)
                 return;
 
             var offset = new Point(e.Location.X - _dragStart.X, e.Location.Y - _dragStart.Y);
@@ -269,8 +268,7 @@ protected override void OnMouseUp(MouseEventArgs e)
         {
             base.OnMouseUp(e);
 
-            if (MousePanningEnabled)
-                Capture = false;
+            _capture = false;
         }
 
         private class WheelFilter : IMessageFilter
diff --git a/PdfiumViewer/PdfDocument.cs b/PdfiumViewer/PdfDocument.cs
index 2a6412d0..da136aac 100644
--- a/PdfiumViewer/PdfDocument.cs
+++ b/PdfiumViewer/PdfDocument.cs
@@ -542,13 +542,14 @@ public int CountCharacters(int page)
         }
 
         /// <summary>
-        /// Gets the rectangular areas occupied by a segment of text
+        /// Retrieves the text style information for a specific character on a page.
         /// </summary>
-        /// <param name="page">The page to get the rectangles from</param>
-        /// <returns>The rectangular areas occupied by a segment of text</returns>
-        public List<PdfRectangle> GetTextRectangles(int page, int startIndex, int count)
+        /// <param name="page">The page number.</param>
+        /// <param name="charIndex">The character index on the page.</param>
+        /// <returns>A PdfTextStyle object containing style information.</returns>
+        public PdfTextStyle GetTextStyle(int page, int charIndex)
         {
-            return _file.GetTextRectangles(page, startIndex, count);
+            return _file.GetTextStyle(page, charIndex);
         }
 
         /// <summary>
diff --git a/PdfiumViewer/PdfFile.cs b/PdfiumViewer/PdfFile.cs
index b3ee79f9..964c57a0 100644
--- a/PdfiumViewer/PdfFile.cs
+++ b/PdfiumViewer/PdfFile.cs
@@ -3,9 +3,12 @@
 using System.Diagnostics;
 using System.Drawing;
 using System.IO;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Text.RegularExpressions;
+using static PdfiumViewer.NativeMethods;
+using static System.Net.WebRequestMethods;
 
 namespace PdfiumViewer
 {
@@ -20,9 +23,7 @@ internal class PdfFile : IDisposable
         private GCHandle _formCallbacksHandle;
         private readonly int _id;
         private Stream _stream;
-
-        private PageData _currentPageData = null;
-        private int _currentPageDataPageNumber = -1;
+        private List<PageData> _pageData = null;
 
         public PdfFile(Stream stream, string password)
         {
@@ -48,7 +49,10 @@ public bool RenderPDFPageToDC(int pageNumber, IntPtr dc, int dpiX, int dpiY, int
             if (_disposed)
                 throw new ObjectDisposedException(GetType().Name);
 
-            NativeMethods.FPDF_RenderPage(dc, GetPageData(pageNumber).Page, boundsOriginX, boundsOriginY, boundsWidth, boundsHeight, 0, flags);
+            var pageData = GetPageData(_document, _form, pageNumber);
+            {
+                NativeMethods.FPDF_RenderPage(dc, pageData.Page, boundsOriginX, boundsOriginY, boundsWidth, boundsHeight, 0, flags);
+            }
 
             return true;
         }
@@ -58,14 +62,15 @@ public bool RenderPDFPageToBitmap(int pageNumber, IntPtr bitmapHandle, int dpiX,
             if (_disposed)
                 throw new ObjectDisposedException(GetType().Name);
 
-            var pageData = GetPageData(pageNumber);
-
-            NativeMethods.FPDF_RenderPageBitmap(bitmapHandle, pageData.Page, boundsOriginX, boundsOriginY, boundsWidth, boundsHeight, rotate, flags);
-
-            if (renderFormFill)
+            var pageData = GetPageData(_document, _form, pageNumber);
             {
-                flags &= ~NativeMethods.FPDF.ANNOT;
-                NativeMethods.FPDF_FFLDraw(_form, bitmapHandle, pageData.Page, boundsOriginX, boundsOriginY, boundsWidth, boundsHeight, rotate, flags);
+                NativeMethods.FPDF_RenderPageBitmap(bitmapHandle, pageData.Page, boundsOriginX, boundsOriginY, boundsWidth, boundsHeight, rotate, flags);
+
+                if (renderFormFill)
+                {
+                    flags &= ~NativeMethods.FPDF.ANNOT;
+                    NativeMethods.FPDF_FFLDraw(_form, bitmapHandle, pageData.Page, boundsOriginX, boundsOriginY, boundsWidth, boundsHeight, rotate, flags);
+                }
             }
 
             return true;
@@ -78,37 +83,38 @@ public PdfPageLinks GetPageLinks(int pageNumber, Size pageSize)
 
             var links = new List<PdfPageLink>();
 
-            int link = 0;
-            IntPtr annotation;
-
-            while (NativeMethods.FPDFLink_Enumerate(GetPageData(pageNumber).Page, ref link, out annotation))
+            var pageData = GetPageData(_document, _form, pageNumber);
             {
-                var destination = NativeMethods.FPDFLink_GetDest(_document, annotation);
-                int? target = null;
-                string uri = null;
-
-                if (destination != IntPtr.Zero)
-                    target = (int)NativeMethods.FPDFDest_GetPageIndex(_document, destination);
+                int link = 0;
+                IntPtr annotation;
 
-                var action = NativeMethods.FPDFLink_GetAction(annotation);
-                if (action != IntPtr.Zero)
+                while (NativeMethods.FPDFLink_Enumerate(pageData.Page, ref link, out annotation))
                 {
-                    const uint length = 1024;
-                    var sb = new StringBuilder(1024);
-                    NativeMethods.FPDFAction_GetURIPath(_document, action, sb, length);
+                    var destination = NativeMethods.FPDFLink_GetDest(_document, annotation);
+                    int? target = null;
+                    string uri = null;
 
-                    uri = sb.ToString();
-                }
+                    if (destination != IntPtr.Zero)
+                        target = (int)NativeMethods.FPDFDest_GetDestPageIndex(_document, destination);
 
-                var rect = new NativeMethods.FS_RECTF();
+                    var action = NativeMethods.FPDFLink_GetAction(annotation);
+                    if (action != IntPtr.Zero)
+                    {
+                        const uint length = 1024;
+                        var sb = new StringBuilder(1024);
+                        NativeMethods.FPDFAction_GetURIPath(_document, action, sb, length);
 
-                if (NativeMethods.FPDFLink_GetAnnotRect(annotation, rect) && (target.HasValue || uri != null))
-                {
-                    links.Add(new PdfPageLink(
-                        new RectangleF(rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top),
-                        target,
-                        uri
-                    ));
+                        uri = sb.ToString();
+                    }
+
+                    if (NativeMethods.FPDFLink_GetAnnotRect(annotation, out var rect) && (target.HasValue || uri != null))
+                    {
+                        links.Add(new PdfPageLink(
+                            new RectangleF(rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top),
+                            target,
+                            uri
+                        ));
+                    }
                 }
             }
 
@@ -122,10 +128,12 @@ public List<SizeF> GetPDFDocInfo()
 
             int pageCount = NativeMethods.FPDF_GetPageCount(_document);
             var result = new List<SizeF>(pageCount);
+            _pageData = new List<PageData>(pageCount);
 
             for (int i = 0; i < pageCount; i++)
             {
                 result.Add(GetPDFDocInfo(i));
+                _pageData.Add(null);
             }
 
             return result;
@@ -223,7 +231,7 @@ private uint GetBookmarkPageIndex(IntPtr bookmark)
         {
             IntPtr dest = NativeMethods.FPDF_BookmarkGetDest(_document, bookmark);
             if (dest != IntPtr.Zero)
-                return NativeMethods.FPDFDest_GetPageIndex(_document, dest);
+                return NativeMethods.FPDFDest_GetDestPageIndex(_document, dest);
 
             return 0;
         }
@@ -237,38 +245,39 @@ public PdfMatches Search(string text, bool matchCase, bool wholeWord, int startP
 
             for (int page = startPage; page <= endPage; page++)
             {
-                var pageData = GetPageData(page);
-
-                NativeMethods.FPDF_SEARCH_FLAGS flags = 0;
-                if (matchCase)
-                    flags |= NativeMethods.FPDF_SEARCH_FLAGS.FPDF_MATCHCASE;
-                if (wholeWord)
-                    flags |= NativeMethods.FPDF_SEARCH_FLAGS.FPDF_MATCHWHOLEWORD;
-
-                var handle = NativeMethods.FPDFText_FindStart(pageData.TextPage, FPDFEncoding.GetBytes(text), flags, 0);
-
-                try
+                var pageData = GetPageData(_document, _form, page);
                 {
-                    while (NativeMethods.FPDFText_FindNext(handle))
-                    {
-                        int index = NativeMethods.FPDFText_GetSchResultIndex(handle);
-
-                        int matchLength = NativeMethods.FPDFText_GetSchCount(handle);
+                    NativeMethods.FPDF_SEARCH_FLAGS flags = 0;
+                    if (matchCase)
+                        flags |= NativeMethods.FPDF_SEARCH_FLAGS.FPDF_MATCHCASE;
+                    if (wholeWord)
+                        flags |= NativeMethods.FPDF_SEARCH_FLAGS.FPDF_MATCHWHOLEWORD;
 
-                        var result = new byte[(matchLength + 1) * 2];
-                        NativeMethods.FPDFText_GetText(pageData.TextPage, index, matchLength, result);
-                        string match = FPDFEncoding.GetString(result, 0, matchLength * 2);
+                    var handle = NativeMethods.FPDFText_FindStart(pageData.TextPage, FPDFEncoding.GetBytes(text), flags, 0);
 
-                        matches.Add(new PdfMatch(
-                            match,
-                            new PdfTextSpan(page, index, matchLength),
-                            page
-                        ));
+                    try
+                    {
+                        while (NativeMethods.FPDFText_FindNext(handle))
+                        {
+                            int index = NativeMethods.FPDFText_GetSchResultIndex(handle);
+
+                            int matchLength = NativeMethods.FPDFText_GetSchCount(handle);
+
+                            var result = new byte[(matchLength + 1) * 2];
+                            NativeMethods.FPDFText_GetText(pageData.TextPage, index, matchLength, result);
+                            string match = FPDFEncoding.GetString(result, 0, matchLength * 2);
+
+                            matches.Add(new PdfMatch(
+                                match,
+                                new PdfTextSpan(page, index, matchLength),
+                                page
+                            ));
+                        }
+                    }
+                    finally
+                    {
+                        NativeMethods.FPDFText_FindClose(handle);
                     }
-                }
-                finally
-                {
-                    NativeMethods.FPDFText_FindClose(handle);
                 }
             }
 
@@ -277,122 +286,147 @@ public PdfMatches Search(string text, bool matchCase, bool wholeWord, int startP
 
         public IList<PdfRectangle> GetTextBounds(PdfTextSpan textSpan)
         {
-            return GetTextBounds(GetPageData(textSpan.Page).TextPage, textSpan.Page, textSpan.Offset, textSpan.Length);
+            var result = new List<PdfRectangle>();
+
+            var pageData = GetPageData(_document, _form, textSpan.Page);
+
+            {
+                int rect_count = NativeMethods.FPDFText_CountRects(pageData.TextPage, textSpan.Offset, textSpan.Length);
+
+                for (int i = 0; i < rect_count; i++)
+                {
+                    NativeMethods.FPDFText_GetRect(pageData.TextPage, i, out var left, out var top, out var right, out var bottom);
+
+                    RectangleF bounds = new RectangleF((float)left, (float)top, (float)(right - left), (float)(bottom - top));
+
+                    result.Add(new PdfRectangle(textSpan.Page, bounds));
+                }
+
+                return result;
+            }
         }
 
         public Point PointFromPdf(int page, PointF point)
         {
-            var pageData = GetPageData(page);
-            NativeMethods.FPDF_PageToDevice(
-                pageData.Page,
-                0,
-                0,
-                (int)pageData.Width,
-                (int)pageData.Height,
-                0,
-                point.X,
-                point.Y,
-                out var deviceX,
-                out var deviceY
-            );
-
-            return new Point(deviceX, deviceY);
+            var pageData = GetPageData(_document, _form, page);
+            {
+                NativeMethods.FPDF_PageToDevice(
+                    pageData.Page,
+                    0,
+                    0,
+                    (int)pageData.Width,
+                    (int)pageData.Height,
+                    0,
+                    point.X,
+                    point.Y,
+                    out var deviceX,
+                    out var deviceY
+                );
+
+                return new Point(deviceX, deviceY);
+            }
         }
 
         public Rectangle RectangleFromPdf(int page, RectangleF rect)
         {
-            var pageData = GetPageData(page);
-            NativeMethods.FPDF_PageToDevice(
-                pageData.Page,
-                0,
-                0,
-                (int)pageData.Width,
-                (int)pageData.Height,
-                0,
-                rect.Left,
-                rect.Top,
-                out var deviceX1,
-                out var deviceY1
-            );
-
-            NativeMethods.FPDF_PageToDevice(
-                pageData.Page,
-                0,
-                0,
-                (int)pageData.Width,
-                (int)pageData.Height,
-                0,
-                rect.Right,
-                rect.Bottom,
-                out var deviceX2,
-                out var deviceY2
-            );
-
-            return new Rectangle(
-                deviceX1,
-                deviceY1,
-                deviceX2 - deviceX1,
-                deviceY2 - deviceY1
-            );
+            var pageData = GetPageData(_document, _form, page);
+            {
+                NativeMethods.FPDF_PageToDevice(
+                    pageData.Page,
+                    0,
+                    0,
+                    (int)pageData.Width,
+                    (int)pageData.Height,
+                    0,
+                    rect.Left,
+                    rect.Top,
+                    out var deviceX1,
+                    out var deviceY1
+                );
+
+                NativeMethods.FPDF_PageToDevice(
+                    pageData.Page,
+                    0,
+                    0,
+                    (int)pageData.Width,
+                    (int)pageData.Height,
+                    0,
+                    rect.Right,
+                    rect.Bottom,
+                    out var deviceX2,
+                    out var deviceY2
+                );
+
+                return new Rectangle(
+                    deviceX1,
+                    deviceY1,
+                    deviceX2 - deviceX1,
+                    deviceY2 - deviceY1
+                );
+            }
         }
 
         public PointF PointToPdf(int page, Point point)
         {
-            var pageData = GetPageData(page);
-            NativeMethods.FPDF_DeviceToPage(
-                pageData.Page,
-                0,
-                0,
-                (int)pageData.Width,
-                (int)pageData.Height,
-                0,
-                point.X,
-                point.Y,
-                out var deviceX,
-                out var deviceY
-            );
-
-            return new PointF((float)deviceX, (float)deviceY);
+            var pageData = GetPageData(_document, _form, page);
+            {
+                NativeMethods.FPDF_DeviceToPage(
+                    pageData.Page,
+                    0,
+                    0,
+                    (int)pageData.Width,
+                    (int)pageData.Height,
+                    0,
+                    point.X,
+                    point.Y,
+                    out var deviceX,
+                    out var deviceY
+                );
+
+                return new PointF((float)deviceX, (float)deviceY);
+            }
         }
 
         public RectangleF RectangleToPdf(int page, Rectangle rect)
         {
-            var pageData = GetPageData(page);
-            NativeMethods.FPDF_DeviceToPage(
-                pageData.Page,
-                0,
-                0,
-                (int)pageData.Width,
-                (int)pageData.Height,
-                0,
-                rect.Left,
-                rect.Top,
-                out var deviceX1,
-                out var deviceY1
-            );
-
-            NativeMethods.FPDF_DeviceToPage(
-                pageData.Page,
-                0,
-                0,
-                (int)pageData.Width,
-                (int)pageData.Height,
-                0,
-                rect.Right,
-                rect.Bottom,
-                out var deviceX2,
-                out var deviceY2
-            );
-
-            return new RectangleF(
-                (float)deviceX1,
-                (float)deviceY1,
-                (float)(deviceX2 - deviceX1),
-                (float)(deviceY2 - deviceY1)
-            );
+            var pageData = GetPageData(_document, _form, page);
+            {
+                NativeMethods.FPDF_DeviceToPage(
+                    pageData.Page,
+                    0,
+                    0,
+                    (int)pageData.Width,
+                    (int)pageData.Height,
+                    0,
+                    rect.Left,
+                    rect.Top,
+                    out var deviceX1,
+                    out var deviceY1
+                );
+
+                NativeMethods.FPDF_DeviceToPage(
+                    pageData.Page,
+                    0,
+                    0,
+                    (int)pageData.Width,
+                    (int)pageData.Height,
+                    0,
+                    rect.Right,
+                    rect.Bottom,
+                    out var deviceX2,
+                    out var deviceY2
+                );
+
+                return new RectangleF(
+                    (float)deviceX1,
+                    (float)deviceY1,
+                    (float)(deviceX2 - deviceX1),
+                    (float)(deviceY2 - deviceY1)
+                );
+            }
         }
 
-        private IList<PdfRectangle> GetTextBounds(IntPtr textPage, int page, int index, int matchLength)
+        private IList<PdfRectangle> GetTextBounds(IntPtr textPage, int pageNumber, int index, int matchLength)
         {
             var result = new List<PdfRectangle>();
             RectangleF? lastBounds = null;
@@ -421,12 +455,12 @@ private IList<PdfRectangle> GetTextBounds(IntPtr textPage, int page, int index,
                         bottom - top
                     );
 
-                    result[result.Count - 1] = new PdfRectangle(page, lastBounds.Value);
+                    result[result.Count - 1] = new PdfRectangle(pageNumber, lastBounds.Value);
                 }
                 else
                 {
                     lastBounds = bounds;
-                    result.Add(new PdfRectangle(page, bounds));
+                    result.Add(new PdfRectangle(pageNumber, bounds));
                 }
             }
 
@@ -457,39 +491,42 @@ out var top
             );
         }
 
-        public string GetPdfText(int page)
+        public string GetPdfText(int pageNumber)
         {
-            var pageData = GetPageData(page);
-            int length = NativeMethods.FPDFText_CountChars(pageData.TextPage);
-            return GetPdfText(pageData, new PdfTextSpan(page, 0, length));
+            var pageData = GetPageData(_document, _form, pageNumber);
+            {
+                int length = NativeMethods.FPDFText_CountChars(pageData.TextPage);
+                return GetPdfText(pageData, new PdfTextSpan(pageNumber, 0, length));
+            }
         }
 
         public string GetPdfText(PdfTextSpan textSpan)
         {
-            return GetPdfText(GetPageData(textSpan.Page), textSpan);
+            var pageData = GetPageData(_document, _form, textSpan.Page);
+            {
+                return GetPdfText(pageData, textSpan);
+            }
         }
 
         private string GetPdfText(PageData pageData, PdfTextSpan textSpan)
         {
-            // NOTE: The count parameter in FPDFText_GetText seems to include the null terminator, even though the documentation does not specify this.
-            // So to read 40 characters, we need to allocate 82 bytes (2 for the terminator), and request 41 characters from GetText.
-            // The return value also includes the terminator (which is documented)
             var result = new byte[(textSpan.Length + 1) * 2];
-            int count = NativeMethods.FPDFText_GetText(pageData.TextPage, textSpan.Offset, textSpan.Length + 1, result);
-            if (count <= 0)
-                return string.Empty;
-            return FPDFEncoding.GetString(result, 0, (count - 1) * 2);
+            NativeMethods.FPDFText_GetText(pageData.TextPage, textSpan.Offset, textSpan.Length, result);
+            return FPDFEncoding.GetString(result, 0, textSpan.Length * 2);
         }
 
         public int GetCharIndexAtPos(PdfPoint location, double xTolerance, double yTolerance)
         {
-            return NativeMethods.FPDFText_GetCharIndexAtPos(
-                GetPageData(location.Page).TextPage,
-                location.Location.X,
-                location.Location.Y,
-                xTolerance,
-                yTolerance
-            );
+            var pageData = GetPageData(_document, _form, location.Page);
+            {
+                return NativeMethods.FPDFText_GetCharIndexAtPos(
+                    pageData.TextPage,
+                    location.Location.X,
+                    location.Location.Y,
+                    xTolerance,
+                    yTolerance
+                );
+            }
         }
 
         public bool GetWordAtPosition(PdfPoint location, double xTolerance, double yTolerance, out PdfTextSpan span)
@@ -536,29 +573,38 @@ bool IsWordSeparator(char c)
             }
         }
 
-        public char GetCharacter(int page, int index)
+        public char GetCharacter(int pageNumber, int index)
         {
-            return NativeMethods.FPDFText_GetUnicode(GetPageData(page).TextPage, index);
+            var pageData = GetPageData(_document, _form, pageNumber);
+            {
+                return NativeMethods.FPDFText_GetUnicode(pageData.TextPage, index);
+            }
         }
 
-        public int CountChars(int page)
+        public int CountChars(int pageNumber)
         {
-            return NativeMethods.FPDFText_CountChars(GetPageData(page).TextPage);
+            var pageData = GetPageData(_document, _form, pageNumber);
+            {
+                return NativeMethods.FPDFText_CountChars(pageData.TextPage);
+            }
         }
 
-        public List<PdfRectangle> GetTextRectangles(int page, int startIndex, int count)
+        public void DeletePage(int pageNumber)
         {
-            return NativeMethods.FPDFText_GetRectangles(GetPageData(page).TextPage, page, startIndex, count);
+            NativeMethods.FPDFPage_Delete(_document, pageNumber);
         }
 
-        public void DeletePage(int pageNumber)
+        public PdfRotation GetPageRotation(int pageNumber)
         {
-            NativeMethods.FPDFPage_Delete(_document, pageNumber);
+            return NativeMethods.FPDFPage_GetRotation(GetPageData(_document, _form, pageNumber).Page);
         }
 
         public void RotatePage(int pageNumber, PdfRotation rotation)
         {
-            NativeMethods.FPDFPage_SetRotation(GetPageData(pageNumber).Page, rotation);
+            var pageData = GetPageData(_document, _form, pageNumber);
+            {
+                NativeMethods.FPDFPage_SetRotation(pageData.Page, rotation);
+            }
         }
 
         public PdfInformation GetInformation()
@@ -646,6 +692,326 @@ private string GetMetaText(string tag)
             return null;
         }
 
+        /// <summary>
+        /// Retrieves the text style information for a specific character on a pageNumber.
+        /// </summary>
+        /// <param name="pageNumber">The pageNumber number.</param>
+        /// <param name="index">The character index on the pageNumber.</param>
+        /// <returns>A PdfTextStyle object containing style information.</returns>
+        public PdfTextStyle GetTextStyle(int pageNumber, int index)
+        {
+            if (_disposed)
+                throw new ObjectDisposedException(GetType().Name);
+
+            bool isUnderlined = false;
+            bool isStrikethrough = false;
+            bool isHighlighted = false;
+            bool IsSquiggly = false;
+            Color fillColor = Color.Empty;
+            Color strokeColor = Color.Empty;
+            Color annotationColor = Color.Empty;
+
+            var pageData = GetPageData(_document, _form, pageNumber);
+            {
+                NativeMethods.FPDFText_GetFillColor(pageData.TextPage, index, out fillColor);
+                NativeMethods.FPDFText_GetStrokeColor(pageData.TextPage, index, out strokeColor);
+
+                // Get the character bounds
+                NativeMethods.FPDFText_GetCharBox(
+                    pageData.TextPage,
+                    index,
+                    out var charLeft,
+                    out var charRight,
+                    out var charBottom,
+                    out var charTop
+                );
+
+                RectangleF charBounds = new RectangleF(
+                    (float)Math.Min(charLeft, charRight),
+                    (float)Math.Min(charBottom, charTop),
+                    (float)Math.Abs(charRight - charLeft),
+                    (float)Math.Abs(charBottom - charTop)
+                );
+
+                // Get the character bounds
+                NativeMethods.FPDFText_GetLooseCharBox(
+                    pageData.TextPage,
+                    index,
+                    out var looseRect
+                );
+
+                RectangleF looseBounds = new RectangleF(
+                    (float)Math.Min(looseRect.left, looseRect.right),
+                    (float)Math.Min(looseRect.bottom, looseRect.top),
+                    (float)Math.Abs(looseRect.right - looseRect.left),
+                    (float)Math.Abs(looseRect.bottom - looseRect.top)
+                );
+
+                NativeMethods.FPDFText_GetCharOrigin(
+                    pageData.TextPage,
+                    index,
+                    out var x,
+                    out var y
+                );
+                float originY = (float)y;
+
+                CheckAnnotBounds(pageData, charBounds, ref isUnderlined, ref isStrikethrough, ref isHighlighted, ref IsSquiggly, ref annotationColor);
+                CheckPageObjBounds(pageData, looseBounds, originY, ref isUnderlined, ref isStrikethrough, ref isHighlighted, ref IsSquiggly, ref annotationColor);
+            }
+
+            return new PdfTextStyle(pageNumber, index, fillColor, strokeColor, isUnderlined, isStrikethrough, isHighlighted, IsSquiggly, annotationColor);
+        }
+
+        private static void CheckAnnotBounds(PageData pageData,
+                                               RectangleF charBounds,
+                                               ref bool isUnderlined,
+                                               ref bool isStrikethrough,
+                                               ref bool isHighlighted,
+                                               ref bool isSquiggly,
+                                               ref Color annotationColor)
+        {
+            // Detect underline, strikethrough, and highlight annotations
+            int annotCount = NativeMethods.FPDFPage_GetAnnotCount(pageData.Page);
+            for (int i = 0; i < annotCount; i++)
+            {
+                IntPtr annotHandle = NativeMethods.FPDFPage_GetAnnot(pageData.Page, i);
+                if (annotHandle == IntPtr.Zero)
+                    continue;
+
+                var subtype = NativeMethods.FPDFAnnot_GetSubtype(annotHandle);
+
+                // Check attachment points if available
+                int attachmentPointCount = (int)NativeMethods.FPDFAnnot_CountAttachmentPoints(annotHandle);
+                for (int j = 0; j < attachmentPointCount; j++)
+                {
+                    NativeMethods.FPDFAnnot_GetAttachmentPoints(annotHandle, (UIntPtr)j, out var quadPoints);
+
+                    RectangleF annotBounds = new RectangleF(
+                        Math.Min(Math.Min(quadPoints.x1, quadPoints.x2), Math.Min(quadPoints.x3, quadPoints.x4)),
+                        Math.Min(Math.Min(quadPoints.y1, quadPoints.y2), Math.Min(quadPoints.y3, quadPoints.y4)),
+                        Math.Max(Math.Max(quadPoints.x1, quadPoints.x2), Math.Max(quadPoints.x3, quadPoints.x4)) - Math.Min(Math.Min(quadPoints.x1, quadPoints.x2), Math.Min(quadPoints.x3, quadPoints.x4)),
+                        Math.Max(Math.Max(quadPoints.y1, quadPoints.y2), Math.Max(quadPoints.y3, quadPoints.y4)) - Math.Min(Math.Min(quadPoints.y1, quadPoints.y2), Math.Min(quadPoints.y3, quadPoints.y4))
+                    );
+
+                    // Check if the character bounds intersect with the annotation bounds
+                    if (charBounds.IntersectsWith(annotBounds))
+                    {
+                        if (subtype == NativeMethods.FPDF_ANNOTATION_SUBTYPE.UNDERLINE)
+                        {
+                            isUnderlined = true;
+                        }
+                        else if (subtype == NativeMethods.FPDF_ANNOTATION_SUBTYPE.SQUIGGLY)
+                        {
+                            isSquiggly = true;
+                        }
+                        else if (subtype == NativeMethods.FPDF_ANNOTATION_SUBTYPE.STRIKEOUT)
+                        {
+                            isStrikethrough = true;
+                        }
+                        else if (subtype == NativeMethods.FPDF_ANNOTATION_SUBTYPE.HIGHLIGHT)
+                        {
+                            isHighlighted = true;
+                            NativeMethods.FPDFAnnot_GetColor(annotHandle, NativeMethods.FPDFANNOT_COLORTYPE.Color, out annotationColor);
+                        }
+                    }
+                }
+
+                NativeMethods.FPDFPage_CloseAnnot(annotHandle);
+            }
+        }
+
+        private static void CheckPageObjBounds(PageData pageData,
+                                               RectangleF charBounds,
+                                               float originY,
+                                               ref bool isUnderlined,
+                                               ref bool isStrikethrough,
+                                               ref bool isHighlighted,
+                                               ref bool isSquiggly,
+                                               ref Color annotationColor)
+        {
+            int objCount = NativeMethods.FPDFPage_CountObjects(pageData.Page);
+            for (int i = 0; i < objCount; i++)
+            {
+                IntPtr obj = NativeMethods.FPDFPage_GetObject(pageData.Page, i);
+                if (obj == IntPtr.Zero)
+                    continue;
+
+                if (NativeMethods.FPDFPageObj_GetType(obj) != FPDF_PAGEOBJ.PATH)
+                    continue;
+
+                if (!TryGetObjBounds(obj, out RectangleF objBounds))
+                    continue;
+
+                // Fast intersection test first.
+                if (!charBounds.IntersectsWith(objBounds))
+                    continue;
+
+                // Classification (heuristics).
+                ClassifyPathAgainstCharBounds(obj, objBounds, charBounds, originY,
+                                              ref isUnderlined, ref isStrikethrough, ref isHighlighted, ref isSquiggly,
+                                              ref annotationColor);
+            }
+        }
+
+        private static bool TryGetObjBounds(IntPtr pageObject, out RectangleF bounds)
+        {
+            bounds = RectangleF.Empty;
+
+            float left, bottom, right, top;
+            bool ok = NativeMethods.FPDFPageObj_GetBounds(pageObject, out left, out bottom, out right, out top);
+            if (!ok)
+                return false;
+
+            float x = Math.Min(left, right);
+            float y = Math.Min(bottom, top);
+            float w = Math.Abs(right - left);
+            float h = Math.Abs(top - bottom);
+            bounds = new RectangleF(x, y, w, h);
+            return (w > 0 && h > 0);
+        }
+
+        private static void ClassifyPathAgainstCharBounds(IntPtr pathObj,
+                                                         RectangleF pathBounds,
+                                                         RectangleF charBounds,
+                                                         float originY,
+                                                         ref bool isUnderlined,
+                                                         ref bool isStrikethrough,
+                                                         ref bool isHighlighted,
+                                                         ref bool isSquiggly,
+                                                         ref Color annotationColor)
+        {
+            // Thresholds (tune these for real-world PDFs).
+            float charH = charBounds.Height;
+            float pathH = pathBounds.Height;
+            float thinLineMax = Math.Max(0.6f, charH * 0.1f);       // Max line thickness (for underline/strikethrough).
+            float squigglyMax = Math.Max(1.0f, charH * 0.175f);     // Max line thickness (for squiggly underline).
+            float highlightMin = Math.Max(1.2f, charH * 0.5f);      // If thick enough, suspect highlight-like fill.
+            float horizontalMinAspect = 2.0f;                       // Horizontal aspect ratio (width/height).
+            float charMidY = charBounds.Top + charH * 0.5f;
+            float pathMidY = pathBounds.Top + pathH * 0.5f;
+            float underlineMaxY = (charMidY + originY) / 2;
+
+            NativeMethods.FPDFPageObj_GetStrokeWidth(pathObj, out var pathWidth);   // Path stroke width.
+            float pathRatio = (pathWidth <= float.Epsilon) ? (1.0f / pathH) : (pathWidth / pathH);  // Stroke-to-height ratio.
+            float pathAspect = (pathBounds.Height <= 0.0001f) ? float.PositiveInfinity : (pathBounds.Width / pathBounds.Height);
+            bool pathStraightLine = IsStraightLine(pathObj);
+
+            // PDF coordinates start at the bottom-left of the page, so Top is below the text and Bottom is above it.
+            if (pathAspect >= horizontalMinAspect)
+            {
+                // 1) Underline.
+                if (pathRatio > 0.45f)
+                {
+                    // Near the lower side of the glyph (allow some downward tolerance).
+                    if ((pathMidY >= charBounds.Top - thinLineMax) && (pathMidY < underlineMaxY))
+                    {
+                        // Underline.
+                        isUnderlined = true;
+                        return;
+                    }
+                }
+
+                // 2) Strikethrough.
+                if ((pathRatio > 0.45f) || pathStraightLine)
+                {
+                    // Around the glyph (allow some upward tolerance).
+                    if (pathBounds.Bottom <= charBounds.Bottom + thinLineMax)
+                    {
+                        // Strikethrough.
+                        isStrikethrough = true;
+                        return;
+                    }
+
+                }
+                else
+                {
+                    // 3) Squiggly underline.
+                    // Near the lower side of the glyph (allow some downward tolerance).
+                    if ((pathMidY >= charBounds.Top - squigglyMax) && (pathMidY < underlineMaxY))
+                    {
+                        isSquiggly = true;
+                        return;
+                    }
+                }
+
+                // 4) Highlight-like (background fill): inferred from geometry only.
+                if (pathWidth > highlightMin)
+                {
+                    // Check whether it sufficiently covers charBounds (not just intersection; rough containment).
+                    bool covers = (pathBounds.Left <= charBounds.Left + charBounds.Width * 0.2f) &&
+                                  (pathBounds.Right >= charBounds.Right - charBounds.Width * 0.2f);
+
+                    if (covers)
+                    {
+                        isHighlighted = true;
+
+                        // Get the color if possible.
+                        if (TryGetPathColor(pathObj, out var c))
+                        {
+                            annotationColor = c;
+                        }
+                        return;
+                    }
+                }
+            }
+
+        }
+
+        private static bool IsStraightLine(IntPtr pathObj)
+        {
+            int segCount = NativeMethods.FPDFPath_CountSegments(pathObj);
+            if (segCount != 2)
+            {
+                return false; // Not enough points/segments.
+            }
+
+            for (int i = 0; i < segCount; i++)
+            {
+                IntPtr seg = NativeMethods.FPDFPath_GetPathSegment(pathObj, i);
+                FPDF_SEGMENT type = NativeMethods.FPDFPathSegment_GetType(seg);
+
+                // If it contains a Bezier segment, it's not a straight line (likely squiggly, etc.).
+                if (type == FPDF_SEGMENT.BEZIERTO)
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        private static bool TryGetPathColor(IntPtr pathObj, out Color color)
+        {
+            color = Color.Empty;
+
+            // Only if the binding exposes it (fpdf_edit.h defines Stroke/Fill "Get" APIs).
+            if (NativeMethods.FPDFPageObj_GetFillColor(pathObj, out uint r, out uint g, out uint b, out uint a))
+            {
+                color = Color.FromArgb((int)a, (int)r, (int)g, (int)b);
+                return true;
+            }
+
+            if (NativeMethods.FPDFPageObj_GetStrokeColor(pathObj, out r, out g, out b, out a))
+            {
+                color = Color.FromArgb((int)a, (int)r, (int)g, (int)b);
+                return true;
+            }
+
+            return false;
+        }
+
+
+        private PageData GetPageData(IntPtr document, IntPtr form, int pageNumber)
+        {
+            if (_pageData[pageNumber] == null)
+            {
+                _pageData[pageNumber] = new PageData(document, form, pageNumber);
+            }
+
+            return _pageData[pageNumber];
+
+        }
+
         public void Dispose()
         {
             Dispose(true);
@@ -659,8 +1025,13 @@ protected virtual void Dispose(bool disposing)
             {
                 StreamManager.Unregister(_id);
 
-                _currentPageData?.Dispose();
-                _currentPageData = null;
+                foreach( var pageData in _pageData)
+                {
+                    if (pageData != null)
+                    {
+                        pageData.Dispose();
+                    }
+                }
 
                 if (_form != IntPtr.Zero)
                 {
@@ -688,18 +1059,6 @@ protected virtual void Dispose(bool disposing)
             }
         }
 
-        private PageData GetPageData(int pageNumber)
-        {
-            if (_currentPageDataPageNumber != pageNumber)
-            {
-                _currentPageData?.Dispose();
-                _currentPageData = new PageData(_document, _form, pageNumber);
-                _currentPageDataPageNumber = pageNumber;
-            }
-
-            return _currentPageData;
-        }
-
         private class PageData : IDisposable
         {
             private readonly IntPtr _form;
@@ -719,9 +1078,11 @@ public PageData(IntPtr document, IntPtr form, int pageNumber)
 
                 Page = NativeMethods.FPDF_LoadPage(document, pageNumber);
                 TextPage = NativeMethods.FPDFText_LoadPage(Page);
-                NativeMethods.FORM_OnAfterLoadPage(Page, form);
-                NativeMethods.FORM_DoPageAAction(Page, form, NativeMethods.FPDFPAGE_AACTION.OPEN);
-
+                if (_form != null)
+                {
+                    NativeMethods.FORM_OnAfterLoadPage(Page, form);
+                    NativeMethods.FORM_DoPageAAction(Page, form, NativeMethods.FPDFPAGE_AACTION.OPEN);
+                }
                 Width = NativeMethods.FPDF_GetPageWidth(Page);
                 Height = NativeMethods.FPDF_GetPageHeight(Page);
             }
@@ -730,8 +1091,11 @@ public void Dispose()
             {
                 if (!_disposed)
                 {
-                    NativeMethods.FORM_DoPageAAction(Page, _form, NativeMethods.FPDFPAGE_AACTION.CLOSE);
-                    NativeMethods.FORM_OnBeforeClosePage(Page, _form);
+                    if (_form != null)
+                    {
+                        NativeMethods.FORM_DoPageAAction(Page, _form, NativeMethods.FPDFPAGE_AACTION.CLOSE);
+                        NativeMethods.FORM_OnBeforeClosePage(Page, _form);
+                    }
                     NativeMethods.FPDFText_ClosePage(TextPage);
                     NativeMethods.FPDF_ClosePage(Page);
 
diff --git a/PdfiumViewer/PdfLibrary.cs b/PdfiumViewer/PdfLibrary.cs
index 4dc6679d..1bde6b29 100644
--- a/PdfiumViewer/PdfLibrary.cs
+++ b/PdfiumViewer/PdfLibrary.cs
@@ -23,7 +23,12 @@ public static void EnsureLoaded()
 
         private PdfLibrary()
         {
-            NativeMethods.FPDF_AddRef();
+            try
+            {
+                NativeMethods.FPDF_InitEmbeddedLibraries();
+            }
+            catch { }
+            NativeMethods.FPDF_InitLibrary();
         }
 
         ~PdfLibrary()
@@ -42,7 +47,7 @@ private void Dispose(bool disposing)
         {
             if (!_disposed)
             {
-                NativeMethods.FPDF_Release();
+                NativeMethods.FPDF_DestroyLibrary();
 
                 _disposed = true;
             }
diff --git a/PdfiumViewer/PdfMarker.cs b/PdfiumViewer/PdfMarker.cs
index e483e56d..27d89853 100644
--- a/PdfiumViewer/PdfMarker.cs
+++ b/PdfiumViewer/PdfMarker.cs
@@ -15,18 +15,21 @@ public class PdfMarker : IPdfMarker
         public Color BorderColor { get; }
         public float BorderWidth { get; }
 
+        public int Tag { get; }
+
         public PdfMarker(int page, RectangleF bounds, Color color)
-            : this(page, bounds, color, Color.Transparent, 0)
+            : this(page, bounds, color, Color.Transparent, 0, 0)
         {
         }
 
-        public PdfMarker(int page, RectangleF bounds, Color color, Color borderColor, float borderWidth)
+        public PdfMarker(int page, RectangleF bounds, Color color, Color borderColor, float borderWidth, int tag)
         {
             Page = page;
             Bounds = bounds;
             Color = color;
             BorderColor = borderColor;
             BorderWidth = borderWidth;
+            Tag = tag;
         }
 
         public void Draw(PdfRenderer renderer, Graphics graphics)
diff --git a/PdfiumViewer/PdfMarkerCollection.cs b/PdfiumViewer/PdfMarkerCollection.cs
index 59460dc4..3108adc3 100644
--- a/PdfiumViewer/PdfMarkerCollection.cs
+++ b/PdfiumViewer/PdfMarkerCollection.cs
@@ -11,6 +11,21 @@ public class PdfMarkerCollection : Collection<IPdfMarker>
     {
         public event EventHandler CollectionChanged;
 
+        /// <summary>
+        /// Clear specified tag.
+        /// </summary>
+        /// <param name="tag"></param>
+        public void Clear(int tag)
+        {
+            for (int i=Count-1; i>=0; i--)
+            {
+                if (Items[i].Tag == tag)
+                {
+                    RemoveAt(i);
+                }
+            }
+        }
+
         protected override void ClearItems()
         {
             base.ClearItems();
diff --git a/PdfiumViewer/PdfRenderer.cs b/PdfiumViewer/PdfRenderer.cs
index 26052a0f..ad938d5f 100644
--- a/PdfiumViewer/PdfRenderer.cs
+++ b/PdfiumViewer/PdfRenderer.cs
@@ -1,8 +1,11 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Drawing;
+using System.Runtime.InteropServices;
+using System.Security.Policy;
 using System.Text;
 using System.Windows.Forms;
 
@@ -13,10 +16,13 @@ namespace PdfiumViewer
     /// </summary>
     public class PdfRenderer : PanningZoomingScrollControl
     {
+        private static readonly double _textToleranceX = 0.0;
+        private static readonly double _textToleranceY = 8.0;
         private static readonly Padding PageMargin = new Padding(4);
         private static readonly SolidBrush _textSelectionBrush = new SolidBrush(Color.FromArgb(90, Color.DodgerBlue));
+        private static readonly int _flashColorAlpha = 100;
+        private static readonly Color _flashColor = Color.Orange;
 
-        private int _height;
         private int _maxWidth;
         private int _maxHeight;
         private double _documentScaleFactor;
@@ -34,10 +40,17 @@ public class PdfRenderer : PanningZoomingScrollControl
         private DragState _dragState;
         private PdfRotation _rotation;
         private List<IPdfMarker>[] _markers;
-        private PdfViewerCursorMode _cursorMode = PdfViewerCursorMode.Pan;
+        private List<PdfTextSpan> _flashTextSpans = null;
+        private PdfCursorMode _cursorMode = PdfCursorMode.Pan;
         private bool _isSelectingText = false;
         private MouseState _cachedMouseState = null;
         private TextSelectionState _textSelectionState = null;
+        private RectangleF _compareBounds = Rectangle.Empty;
+        private Point zoomLocation;
+        private PdfPoint zoomPdfLocation;
+        private int tempFlashTextAlpha = 0;
+
+        public int FlashTextAlpha = 0;
 
         /// <summary>
         /// The associated PDF document.
@@ -75,15 +88,22 @@ public int Page
                 for (int page = 0; page < Document.PageSizes.Count; page++)
                 {
                     var pageCache = _pageCache[page].OuterBounds;
-                    if (top - 10 < pageCache.Top)
+                    if (top >= pageCache.Top || top < pageCache.Bottom)
                     {
-                        // If more than 50% of the page is hidden, return the previous page.
-
-                        int hidden = pageCache.Bottom - bottom;
-                        if (hidden > 0 && (double)hidden / pageCache.Height > 0.5 && page > 0)
-                            return page - 1;
+                        float dispPageHeight = Math.Min(bottom, pageCache.Bottom) - top;
+                        float dispOccupancy = dispPageHeight / (bottom - top);
+                        float pageDispRatio = dispPageHeight / pageCache.Height;
 
-                        return page;
+                        // If this page occupies more than 50% of the screen.
+                        if (dispOccupancy >= 0.5)
+                        {
+                            return page;
+                        }
+                        // If more than 50% of this page is displayed.
+                        if (pageDispRatio >= 0.5)
+                        {
+                            return page;
+                        }
                     }
                 }
 
@@ -104,6 +124,66 @@ public int Page
             }
         }
 
+        /// <summary>
+        /// Gets or sets the currently comparison page.
+        /// </summary>
+        public int ComparisonPage
+        {
+            get
+            {
+                if (Document == null || !_pageCacheValid)
+                    return 0;
+
+                var clientArea = GetScrollClientArea();
+                int top = -DisplayRectangle.Top;
+                int bottom = top + clientArea.Height;
+
+                for (int page = 0; page < Document.PageSizes.Count; page++)
+                {
+                    var pageCache = _pageCache[page].OuterBounds;
+                    if (top >= pageCache.Top || top < pageCache.Bottom)
+                    {
+                        float dispPageHeight = Math.Min(bottom, pageCache.Bottom) - top;
+                        float dispOccupancy = dispPageHeight / (bottom - top);
+                        float pageDispRatio = dispPageHeight / pageCache.Height;
+
+                        //Debug.Print("Page:{0}, pageCache:{1}, _compareBounds:{2}", page, pageCache, _compareBounds);
+
+                        // If this page occupies more than 50% of the screen.
+                        if (dispOccupancy >= 0.5)
+                        {
+                            return page;
+                        }
+                        // If more than 50% of this page is displayed.
+                        if (pageDispRatio >= 0.5)
+                        {
+                            return page;
+                        }
+
+                        // When multiple pages are displayed,
+                        // if an earlier page is small but has a visible bounds rectangle
+                        // and a later page is large but has no visible bounds rectangle,
+                        // the earlier page is set as the comparison page.
+                        if (!_compareBounds.IsEmpty)
+                        {
+                            if ((dispOccupancy > 0) && (page + 1 < Document.PageSizes.Count))
+                            {
+                                // The calculation of whether the bounds rectangle is displayed follows OnPaint().
+                                var bounds = BoundsFromPdf(new PdfRectangle(page + 1, _compareBounds));
+                                if (clientArea.Bottom < bounds.Top)
+                                {
+                                    return page;
+                                }
+                            }
+
+                        }
+                    }
+                }
+
+                return Document.PageCount - 1;
+            }
+        }
+
         /// <summary>
         /// Get the outer bounds of the page.
         /// </summary>
@@ -134,14 +214,39 @@ public PdfViewerZoomMode ZoomMode
         /// <summary>
         /// Gets or sets the way the viewer should respond to cursor input
         /// </summary>
-        [DefaultValue(PdfViewerCursorMode.Pan)]
-        public PdfViewerCursorMode CursorMode
+        [DefaultValue(PdfCursorMode.Pan)]
+        public PdfCursorMode CursorMode
         {
             get { return _cursorMode; }
             set
             {
                 _cursorMode = value;
-                MousePanningEnabled = _cursorMode == PdfViewerCursorMode.Pan;
+                MousePanningEnabled = _cursorMode == PdfCursorMode.Pan;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Boundary for comparison
+        /// </summary>
+        public RectangleF CompareBounds
+        {
+            get { return _compareBounds; }
+            set
+            {
+                if (value.Width < 0)
+                {
+                    value.X += value.Width;
+                    value.Width = -value.Width;
+                }
+                if (value.Height < 0)
+                {
+                    value.Y += value.Height;
+                    value.Height = -value.Height;
+                }
+
+                Debug.Assert(value.Width >= 0 && value.Height >= 0);
+                _compareBounds = value;
+                Invalidate();
             }
         }
 
@@ -233,11 +338,71 @@ public PdfRenderer()
             Markers.CollectionChanged += Markers_CollectionChanged;
         }
 
+        private void ResetRenderer()
+        {
+            _maxWidth = 0;
+            _maxHeight = 0;
+
+            _visiblePageStart = 0;      // to avoid an exception from OnSetCursor.
+            _visiblePageEnd = -1;
+
+            _pageCacheValid = false;
+            _cachedLink = null;
+            _dragState = null;
+            _cachedMouseState = null;
+
+            _textSelectionState = null;
+            _isSelectingText = false;
+
+            _compareBounds = Rectangle.Empty;
+            zoomLocation = new Point(-999, -999);   // Cancel zoom position when scrolling.
+            zoomPdfLocation = new PdfPoint(0, zoomLocation);
+        }
+
         private void Markers_CollectionChanged(object sender, EventArgs e)
         {
             RedrawMarkers();
         }
 
+
+        /// <summary>
+        /// Converts client coordinates to PDF coordinates.
+        /// </summary>
+        /// <param name="location">Client coordinates to get the PDF location for.</param>
+        /// <returns>The location in a PDF page or the rounded location if not matching PDF page.</returns>
+        public PdfPoint PointToPdfRounded(Point location)
+        {
+            if (Document == null)
+                return PdfPoint.Empty;
+
+            var offset = GetScrollOffset();
+            location.Offset(-offset.Width, -offset.Height);
+
+            for (int page = 0; page < Document.PageSizes.Count; page++)
+            {
+                var pageCache = _pageCache[page];
+                if (((location.Y >= pageCache.OuterBounds.Top) &&
+                    (location.Y < pageCache.OuterBounds.Bottom)) ||
+                    (page == Document.PageSizes.Count-1))
+                {
+                    location.X = Math.Min(Math.Max(location.X, pageCache.Bounds.Left), pageCache.Bounds.Right);
+                    location.Y = Math.Min(Math.Max(location.Y, pageCache.Bounds.Top), pageCache.Bounds.Bottom);
+
+                    location = new Point(
+                        location.X - pageCache.Bounds.X,
+                        location.Y - pageCache.Bounds.Y
+                    );
+
+                    var translated = TranslatePointToPdf(pageCache.Bounds.Size, Document.PageSizes[page], location);
+                    translated = Document.PointToPdf(page, new Point((int)translated.X, (int)translated.Y));
+
+                    return new PdfPoint(page, translated);
+                }
+            }
+
+            return PdfPoint.Empty;
+        }
+
         /// <summary>
         /// Converts client coordinates to PDF coordinates.
         /// </summary>
@@ -383,14 +548,14 @@ private PointF TranslatePointToPdf(Size size, SizeF pageSize, Point point)
             switch (Rotation)
             {
                 case PdfRotation.Rotate90:
-                    point = new Point(size.Height - point.Y, point.X);
+                    point = new Point(point.Y, size.Width - point.X);
                     size = new Size(size.Height, size.Width);
                     break;
                 case PdfRotation.Rotate180:
                     point = new Point(size.Width - point.X, size.Height - point.Y);
                     break;
                 case PdfRotation.Rotate270:
-                    point = new Point(point.Y, size.Width - point.X);
+                    point = new Point(size.Height - point.Y, point.X);
                     size = new Size(size.Height, size.Width);
                     break;
             }
@@ -442,7 +607,24 @@ protected override void OnLayout(LayoutEventArgs levent)
         {
             base.OnLayout(levent);
 
-            UpdateScrollbars();
+            // Calculate when the form is not minimized.
+            if (Height>0)
+            {
+                UpdateScrollbars();
+                // UpdateScrollbars() rebuilds the cache and changes the Page, so the event is called twice.
+                OnDisplayRectangleChanged(EventArgs.Empty);
+            }
+        }
+
+        /// <summary>
+        /// Called when scroll. 
+        /// </summary>
+        /// <param name="se">The event data.</param>
+        protected override void OnScroll(ScrollEventArgs se)
+        {
+            base.OnScroll(se);
+
+            zoomLocation = new Point(-999, -999);   // Cancel zoom position when scrolling.
         }
 
         /// <summary>
@@ -456,6 +638,32 @@ protected override void OnZoomChanged(EventArgs e)
             UpdateScrollbars();
         }
 
+        /// <summary>
+        /// Determines whether the specified key is a regular input key or a special key that requires preprocessing.
+        /// </summary>
+        /// <returns>
+        /// true if the specified key is a regular input key; otherwise, false.
+        /// </returns>
+        /// <param name="keyData">One of the <see cref="T:System.Windows.Forms.Keys"/> values. </param>
+        protected override bool IsInputKey(Keys keyData)
+        {
+            switch ((keyData) & Keys.KeyCode)
+            {
+                case Keys.Up:
+                case Keys.Down:
+                case Keys.Left:
+                case Keys.Right:
+                case Keys.PageUp:
+                case Keys.PageDown:
+                case Keys.Home:
+                case Keys.End:
+                    zoomLocation = new Point(-999, -999);	// Cancel zoom position when scrolling.
+                    break;
+            }
+
+            return base.IsInputKey(keyData);
+        }
+
         protected override void OnKeyDown(KeyEventArgs e)
         {
             switch ((e.KeyData) & Keys.KeyCode)
@@ -512,17 +720,13 @@ public void Load(IPdfDocument document)
             ReloadDocument();
         }
 
-        private void ReloadDocument()
+        public void ReloadDocument()
         {
-            _height = 0;
-            _maxWidth = 0;
-            _maxHeight = 0;
-            _textSelectionState = null;
+            ResetRenderer();
 
             foreach (var size in Document.PageSizes)
             {
                 var translated = TranslateSize(size);
-                _height += (int)translated.Height;
                 _maxWidth = Math.Max((int)translated.Width, _maxWidth);
                 _maxHeight = Math.Max((int)translated.Height, _maxHeight);
             }
@@ -530,6 +734,7 @@ private void ReloadDocument()
             _documentScaleFactor = _maxHeight != 0 ? (double)_maxWidth / _maxHeight : 0D;
 
             _markers = null;
+            _flashTextSpans = null;
 
             UpdateScrollbars();
 
@@ -763,8 +968,16 @@ protected override void OnPaint(PaintEventArgs e)
 
                     _shadeBorder.Draw(e.Graphics, pageBounds);
 
+                    if ((_flashTextSpans != null) & (FlashTextAlpha > 0))
+                    {
+                        //DrawTextSpans(e.Graphics, _flashTextSpans, tempFlashTextAlpha);
+                        DrawTextOutline(e.Graphics, _flashTextSpans, tempFlashTextAlpha);
+                    }
+
                     DrawMarkers(e.Graphics, page);
 
+                    DrawCompareBounds(e.Graphics, page);
+
                     var selectionInfo = _textSelectionState;
                     if (selectionInfo != null)
                         DrawTextSelection(e.Graphics, page, selectionInfo.GetNormalized());
@@ -777,6 +990,19 @@ protected override void OnPaint(PaintEventArgs e)
                 _visiblePageEnd = Document.PageCount - 1;
         }
 
+        private void DrawCompareBounds(Graphics graphics, int page)
+        {
+           var bounds = BoundsFromPdf(new PdfRectangle(page, _compareBounds));
+
+            if (!bounds.IsEmpty)
+            {
+                using (var pen = new Pen(Color.Crimson, 2))
+                {
+                    graphics.DrawRectangle(pen, bounds);
+                }
+            }
+        }
+
         private void DrawTextSelection(Graphics graphics, int page, TextSelectionState state)
         {
             if (state.EndPage < 0 || state.EndIndex < 0)
@@ -795,7 +1021,9 @@ private void DrawTextSelection(Graphics graphics, int page, TextSelectionState s
                     end = Document.CountCharacters(page);
 
                 Region region = null;
-                foreach (var rectangle in Document.GetTextRectangles(page, start, end - start))
+                PdfTextSpan textSpan = new PdfTextSpan(page, start, end - start);
+
+                foreach (var rectangle in Document.GetTextBounds(textSpan))
                 {
                     if (region == null)
                         region = new Region(BoundsFromPdf(rectangle));
@@ -808,6 +1036,210 @@ private void DrawTextSelection(Graphics graphics, int page, TextSelectionState s
             }
         }
 
+        /// <summary>
+        /// Draws the specified text spans with a border.
+        /// </summary>
+        /// <param name="graphics">The graphics to draw on.</param>
+        /// <param name="textSpans">The text spans to draw.</param>
+        public void DrawTextSpans(Graphics graphics, IList<PdfTextSpan> textSpans, int alpha)
+        {
+            if (textSpans == null || textSpans.Count == 0)
+                return;
+
+            foreach (var textSpan in textSpans)
+            {
+                if (textSpan.Page < 0 || textSpan.Page >= _pageCache.Count)
+                    continue;
+
+                var pageCache = _pageCache[textSpan.Page];
+                if (pageCache == null)
+                    continue;
+
+                Region region = null;
+                foreach (var rectangle in Document.GetTextBounds(textSpan))
+                {
+                    if (region == null)
+                        region = new Region(BoundsFromPdf(rectangle));
+                    else
+                        region.Union(BoundsFromPdf(rectangle));
+                }
+
+                if (region != null)
+                {
+                    Color customColor = Color.FromArgb(alpha, _flashColor);
+                    SolidBrush customBrush = new SolidBrush(customColor);
+                    graphics.FillRegion(customBrush, region);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Draws the outer outline of the specified text spans.
+        /// First and last lines are drawn individually, middle lines are merged into one rectangle.
+        /// Vertical lines are aligned to the outermost X coordinates.
+        /// </summary>
+        /// <param name="graphics">The graphics to draw on.</param>
+        /// <param name="textSpans">The text spans to draw.</param>
+        public void DrawTextOutline(Graphics graphics, IList<PdfTextSpan> textSpans, int alpha)
+        {
+            if (textSpans == null || textSpans.Count == 0)
+                return;
+
+            List<Rectangle> allRectangles = new List<Rectangle>();
+
+            foreach (var textSpan in textSpans)
+            {
+                if (textSpan.Page < 0 || textSpan.Page >= _pageCache.Count)
+                    continue;
+
+                var pageCache = _pageCache[textSpan.Page];
+                if (pageCache == null)
+                    continue;
+
+                foreach (var rectangle in Document.GetTextBounds(textSpan))
+                {
+                    Rectangle rect2 = BoundsFromPdf(rectangle);
+
+                    if (!rect2.Size.IsEmpty)
+                    {
+                        allRectangles.Add(rect2);
+                    }
+                }
+            }
+
+            if (allRectangles.Count == 0)
+                return;
+
+            Color customColor = Color.FromArgb(alpha, _flashColor);
+            Pen customPen = new Pen(customColor, 5);
+            // Sort by the Top value.
+            allRectangles.Sort((a, b) => a.Top.CompareTo(b.Top));
+
+            if (allRectangles.Count == 1)
+            {
+                // Only one rectangle: draw outer outline
+                DrawRectangleOutline(graphics, customPen, allRectangles[0]);
+            }
+            else if (allRectangles.Count == 2)
+            {
+                if (allRectangles[0].Bottom > allRectangles[1].Top)
+                {
+                    // One row
+                    Rectangle mergedMiddle = GetEnclosingRectangle(allRectangles[0], allRectangles[1]);
+                    DrawRectangleOutline(graphics, customPen, mergedMiddle);
+                }
+                else
+                {
+                    // Two row: draw outer outline of both
+                    DrawTwoRectanglesOutline(graphics, customPen, allRectangles[0], allRectangles[1]);
+                }
+            }
+            else
+            {
+                // Three or more rectangles: draw first, merged middle, and last
+                Rectangle mergedMiddle = allRectangles[1];
+                for (int i = 2; i < allRectangles.Count - 1; i++)
+                {
+                    mergedMiddle = GetEnclosingRectangle(mergedMiddle, allRectangles[i]);
+                }
+                
+                DrawMultipleRectanglesOutline(graphics, customPen, allRectangles[0], mergedMiddle, allRectangles[allRectangles.Count - 1]);
+            }
+
+            customPen.Dispose();
+        }
+
+        /// <summary>
+        /// Draw outer outline of a single rectangle.
+        /// </summary>
+        private void DrawRectangleOutline(Graphics graphics, Pen pen, Rectangle rect)
+        {
+            graphics.DrawRectangle(pen, rect);
+        }
+
+        /// <summary>
+        /// Draw outer outline of two rectangles with vertical lines aligned to outermost X coordinates.
+        /// </summary>
+        private void DrawTwoRectanglesOutline(Graphics graphics, Pen pen, Rectangle first, Rectangle last)
+        {
+            // Direction is /L2R（Left‑to‑Right)
+            //      1------2
+            //   7--8   4--3
+            //   6------5
+
+            int minX = Math.Min(first.Left, last.Left);
+            int maxX = Math.Max(first.Right, last.Right);
+
+            // Line 1-2
+            graphics.DrawLine(pen, first.Left, first.Top, maxX, first.Top);
+            // Line 2-3
+            graphics.DrawLine(pen, maxX, first.Top, maxX, last.Top);
+            // Line 3-4
+            graphics.DrawLine(pen, maxX, last.Top, last.Right, last.Top);
+            // Line 4-5
+            graphics.DrawLine(pen, last.Right, last.Top, last.Right, last.Bottom);
+            // Line 5-6
+            graphics.DrawLine(pen, last.Right, last.Bottom, minX, last.Bottom);
+            // Line 6-7
+            graphics.DrawLine(pen, minX, last.Bottom, minX, last.Top);
+            // Line 7-8
+            graphics.DrawLine(pen, minX, last.Top, first.Left, last.Top);
+            // Line 8-1
+            graphics.DrawLine(pen, first.Left, last.Top, first.Left, first.Top);
+
+        }
+
+        /// <summary>
+        /// Draw outer outline of three rectangles (first, merged middle, last) with vertical lines aligned to outermost X coordinates.
+        /// Vertical lines only extend from first.Top to middle.Bottom on the left/right edges.
+        /// </summary>
+        private void DrawMultipleRectanglesOutline(Graphics graphics, Pen pen, Rectangle first, Rectangle middle, Rectangle last)
+        {
+            // Direction is /L2R（Left‑to‑Right)
+            //      1------2
+            //   7--8      |
+            //   |         |
+            //   |      4--3
+            //   6------5
+
+            int minX = Math.Min(first.Left, Math.Min(middle.Left, last.Left));
+            int maxX = Math.Max(first.Right, Math.Max(middle.Right, last.Right));
+
+            // Line 1-2
+            graphics.DrawLine(pen, first.Left, first.Top, maxX, first.Top);
+            // Line 2-3
+            graphics.DrawLine(pen, maxX, first.Top, maxX, middle.Bottom);
+            // Line 3-4
+            graphics.DrawLine(pen, maxX, middle.Bottom, last.Right, middle.Bottom);
+            // Line 4-5
+            graphics.DrawLine(pen, last.Right, middle.Bottom, last.Right, last.Bottom);
+            // Line 5-6
+            graphics.DrawLine(pen, last.Right, last.Bottom, minX, last.Bottom);
+            // Line 6-7
+            graphics.DrawLine(pen, minX, last.Bottom, minX, middle.Top);
+            // Line 7-8
+            graphics.DrawLine(pen, minX, middle.Top, first.Left, middle.Top);
+            // Line 8-1
+            graphics.DrawLine(pen, first.Left, middle.Top, first.Left, first.Top);
+        }
+
+        private Rectangle GetEnclosingRectangle(Rectangle rect1, Rectangle rect2)
+        {
+            // Find the minimum x and y coordinates
+            int minX = Math.Min(rect1.Left, rect2.Left);
+            int minY = Math.Min(rect1.Top, rect2.Top);
+
+            // Find the maximum x and y coordinates
+            int maxX = Math.Max(rect1.Right, rect2.Right);
+            int maxY = Math.Max(rect1.Bottom, rect2.Bottom);
+
+            // Calculate width and height
+            int width = maxX - minX;
+            int height = maxY - minY;
+
+            return new Rectangle(minX, minY, width, height);
+        }
+
         private void DrawPageImage(Graphics graphics, int page, Rectangle pageBounds)
         {
             var pageCache = _pageCache[page];
@@ -824,7 +1256,14 @@ private void DrawPageImage(Graphics graphics, int page, Rectangle pageBounds)
         /// <returns>The document bounds.</returns>
         protected override Rectangle GetDocumentBounds()
         {
-            int height = (int)(_height * _scaleFactor + (ShadeBorder.Size.Vertical + PageMargin.Vertical) * Document.PageCount);
+            int scaledHeight = 0;
+            for (int page = 0; page < Document.PageSizes.Count; page++)
+            {
+                var size = TranslateSize(Document.PageSizes[page]);
+                scaledHeight += (int)(size.Height * _scaleFactor);
+            }
+
+            int height = (int)(scaledHeight + (ShadeBorder.Size.Vertical + PageMargin.Vertical) * Document.PageCount);
             int width = (int)(_maxWidth * _scaleFactor + ShadeBorder.Size.Horizontal + PageMargin.Horizontal);
             
             var center = new Point(
@@ -878,7 +1317,7 @@ protected override void OnSetCursor(SetCursorEventArgs e)
                     }
                 }
 
-                if (_cursorMode == PdfViewerCursorMode.TextSelection)
+                if (_cursorMode == PdfCursorMode.TextSelection)
                 {
                     var state = GetMouseState(e.Location);
                     if (state.CharacterIndex >= 0)
@@ -887,6 +1326,12 @@ protected override void OnSetCursor(SetCursorEventArgs e)
                         return;
                     }
                 }
+
+                if (_cursorMode == PdfCursorMode.Bounds)
+                {
+                    e.Cursor = Cursors.Cross;
+                    return;
+                }
             }
 
             base.OnSetCursor(e);
@@ -900,7 +1345,7 @@ protected override void OnMouseDown(MouseEventArgs e)
 
             HandleMouseDownForLinks(e);
 
-            if (_cursorMode == PdfViewerCursorMode.TextSelection)
+            if (_cursorMode == PdfCursorMode.TextSelection)
             {
                 HandleMouseDownForTextSelection(e);
             }
@@ -914,7 +1359,7 @@ protected override void OnMouseUp(MouseEventArgs e)
 
             HandleMouseUpForLinks(e);
 
-            if (_cursorMode == PdfViewerCursorMode.TextSelection)
+            if (_cursorMode == PdfCursorMode.TextSelection)
             {
                 HandleMouseUpForTextSelection(e);
             }
@@ -924,7 +1369,7 @@ protected override void OnMouseMove(MouseEventArgs e)
         {
             base.OnMouseMove(e);
 
-            if (_cursorMode == PdfViewerCursorMode.TextSelection)
+            if (_cursorMode == PdfCursorMode.TextSelection)
             {
                 HandleMouseMoveForTextSelection(e);
             }
@@ -934,12 +1379,24 @@ protected override void OnMouseDoubleClick(MouseEventArgs e)
         {
             base.OnMouseDoubleClick(e);
 
-            if (_cursorMode == PdfViewerCursorMode.TextSelection)
+            if (_cursorMode == PdfCursorMode.TextSelection)
             {
                 HandleMouseDoubleClickForTextSelection(e);
             }
         }
 
+        protected override void OnMouseWheel(MouseEventArgs e)
+        {
+            var oldRect = DisplayRectangle;
+            base.OnMouseWheel(e);
+            var newRect = DisplayRectangle;
+
+            if (IsScrolled(oldRect, newRect))
+            {
+                zoomLocation = new Point(-999, -999);	// Cancel zoom position when scrolling.
+            }
+        }
+
         private void HandleMouseDownForLinks(MouseEventArgs e)
         {
             _dragState = null;
@@ -1008,7 +1465,7 @@ private void HandleMouseDownForTextSelection(MouseEventArgs e)
             if (!pdfLocation.IsValid)
                 return;
 
-            var characterIndex = Document.GetCharacterIndexAtPosition(pdfLocation, 4f, 4f);
+            var characterIndex = Document.GetCharacterIndexAtPosition(pdfLocation, _textToleranceX, _textToleranceY);
 
             if (characterIndex >= 0)
             {
@@ -1020,12 +1477,10 @@ private void HandleMouseDownForTextSelection(MouseEventArgs e)
                     EndIndex = -1
                 };
                 _isSelectingText = true;
-                Capture = true;
             }
             else
             {
                 _isSelectingText = false;
-                Capture = false;
                 _textSelectionState = null;
             }
         }
@@ -1036,7 +1491,6 @@ private void HandleMouseUpForTextSelection(MouseEventArgs e)
                 return;
 
             _isSelectingText = false;
-            Capture = false;
             Invalidate();
         }
 
@@ -1054,6 +1508,37 @@ private void HandleMouseMoveForTextSelection(MouseEventArgs e)
 
                 Invalidate();
             }
+
+            ScrollWithMouseDrag(e);
+        }
+
+        private void ScrollWithMouseDrag(MouseEventArgs e)
+        {
+            var clientArea = GetScrollClientArea();
+            Point scroll = new Point(0, 0);
+
+            if (e.X < 0)
+            {
+                scroll.X = 0 - e.X;
+            }
+            else if (e.X > clientArea.Width)
+            {
+                scroll.X = clientArea.Width - e.X;
+            }
+
+            if (e.Y < 0)
+            {
+                scroll.Y = 0 - e.Y;
+            }
+            else if (e.Y > clientArea.Height)
+            {
+                scroll.Y = clientArea.Height - e.Y;
+            }
+
+            SetDisplayRectLocation(new Point(
+                DisplayRectangle.X + scroll.X,
+                DisplayRectangle.Y + scroll.Y
+            ));
         }
 
         private void HandleMouseDoubleClickForTextSelection(MouseEventArgs e)
@@ -1094,7 +1579,8 @@ private MouseState GetMouseState(Point mouseLocation)
             if (!_cachedMouseState.PdfLocation.IsValid)
                 return _cachedMouseState;
 
-            _cachedMouseState.CharacterIndex = Document.GetCharacterIndexAtPosition(_cachedMouseState.PdfLocation, 4f, 4f);
+            // Loosen the judgment of the Y coordinate while the mouse is moving.
+            _cachedMouseState.CharacterIndex = Document.GetCharacterIndexAtPosition(_cachedMouseState.PdfLocation, _textToleranceX, _textToleranceY);
 
             return _cachedMouseState;
         }
@@ -1166,45 +1652,60 @@ private SizeF TranslateSize(SizeF size)
         /// <param name="focus">The location to focus on.</param>
         protected override void SetZoom(double zoom, Point? focus)
         {
-            Point location;
+            Point location = new Point(-999,-999);
+            PdfPoint pdfLocation = new PdfPoint(0, location);
+
+            if (Document == null || !_pageCacheValid)
+                return;
+
+            if ((zoom == ZoomMax) && (Zoom== ZoomMax))
+                return;     // Repeated processing with ZoomMax accumulates errors in zoom position. 
 
             if (focus.HasValue)
             {
-                var bounds = GetDocumentBounds();
+                // Zoom into the focus point.
+                location = focus.Value;
+
+                if (zoomLocation == location)
+                {
+                    // Zoom to the same point while zooming without scrolling.
+                    pdfLocation = zoomPdfLocation;
+                }
+                else
+                {
+                    // When zoom position changes, zoom to new position.
+                    pdfLocation = PointToPdfRounded(location);
+                    zoomLocation = location;
+                    zoomPdfLocation = pdfLocation;
+                }
 
-                location = new Point(
-                    focus.Value.X - bounds.X,
-                    focus.Value.Y - bounds.Y
+                base.SetZoom(zoom, null);
+
+                var newLocation = PointFromPdf(pdfLocation);
+                SetDisplayRectLocation(
+                    new Point(
+                        DisplayRectangle.Left - (newLocation.X - location.X),
+                        DisplayRectangle.Top - (newLocation.Y - location.Y)
+                    ),
+                    false
                 );
             }
             else
             {
-                var bounds = _pageCacheValid
-                    ? _pageCache[Page].Bounds
-                    : GetDocumentBounds();
-
-                location = new Point(
-                    bounds.X,
-                    bounds.Y
-                );
+                // Zoom to the focused page.
+                base.SetZoom(zoom, null);
+                Page = Page;
+                zoomLocation = new Point(-999, -999);	// Cancel zoom position when scrolling.
             }
+            //Console.WriteLine("{0},{1:F5},({2}),({3})", focus.HasValue, zoom, location, pdfLocation.Location);
 
-            double oldScale = Zoom;
-
-            base.SetZoom(zoom, null);
+        }
 
-            var newLocation = new Point(
-                (int)(location.X * (zoom / oldScale)),
-                (int)(location.Y * (zoom / oldScale))
-            );
+        private bool IsScrolled(Rectangle oldRect, Rectangle newRect)
+        {
+            bool isScrolled = (oldRect.Size == newRect.Size) && (oldRect.Location != newRect.Location);
 
-            SetDisplayRectLocation(
-                new Point(
-                    DisplayRectangle.Left - (newLocation.X - location.X),
-                    DisplayRectangle.Top - (newLocation.Y - location.Y)
-                ),
-                false
-            );
+            return isScrolled;
         }
 
         private void RedrawMarkers()
@@ -1245,6 +1746,36 @@ private void DrawMarkers(Graphics graphics, int page)
             }
         }
 
+        /// <summary>
+        /// Checks if the specified page has any markers.
+        /// </summary>
+        /// <param name="page">The page number to check for markers.</param>
+        /// <returns>True if the page has markers, otherwise false.</returns>
+        public bool HasMarkers(int page)
+        {
+            foreach (var marker in Markers)
+            {
+                if (marker.Page != page)
+                    continue;
+
+                if (_compareBounds.IsEmpty)
+                {
+                    // If compareBounds is not specified, the marker must exist.
+                    return true;
+                }
+                else
+                {
+                    // If compareBounds is specified, the marker is within the bounds.
+                    var pdfmarker = (PdfMarker)marker;
+                    if (_compareBounds.Contains(pdfmarker.Bounds))
+                    {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+
         /// <summary>
         /// Scroll the PDF bounds into view.
         /// </summary>
@@ -1305,13 +1836,36 @@ protected override void Dispose(bool disposing)
                         pageCache.Image = null;
                     }
                 }
-
+                
                 _disposed = true;
             }
 
             base.Dispose(disposing);
         }
 
+        public void SetFlashTextSpans(List<PdfTextSpan> index1)
+        {
+            _flashTextSpans = new List<PdfTextSpan>(index1);
+            FlashTextAlpha = _flashColorAlpha;
+            tempFlashTextAlpha = FlashTextAlpha;
+        }
+
+        public void CalcFlashTextAlpha()
+        {
+            int step = 10;
+
+            //tempFlashTextAlpha -= (FlashTextAlpha + step - 1) / step;
+            //tempFlashTextAlpha -= (FlashTextAlpha - tempFlashTextAlpha)*3/2 + 1;
+            tempFlashTextAlpha -= (FlashTextAlpha - tempFlashTextAlpha)*3/4 + 1;
+            if (tempFlashTextAlpha <= 0)
+            {
+                tempFlashTextAlpha = 0;
+                FlashTextAlpha = 0;         // Stop flash animation.
+            }
+            //Console.WriteLine("FlashTextAlpha={0}, tempFlashTextAlpha={1}", FlashTextAlpha, tempFlashTextAlpha);
+            Invalidate();
+        }
+
         private class PageCache
         {
             public List<PageLink> Links { get; set; }
diff --git a/PdfiumViewer/PdfSearchManager.cs b/PdfiumViewer/PdfSearchManager.cs
index ba0333c8..6fa3ef29 100644
--- a/PdfiumViewer/PdfSearchManager.cs
+++ b/PdfiumViewer/PdfSearchManager.cs
@@ -100,7 +100,7 @@ public PdfSearchManager(PdfRenderer renderer)
         /// <returns>Whether any matches were found.</returns>
         public bool Search(string text)
         {
-            Renderer.Markers.Clear();
+            Renderer.Markers.Clear(0);
 
             if (String.IsNullOrEmpty(text))
             {
@@ -206,7 +206,7 @@ public void Reset()
 
         private void UpdateHighlights()
         {
-            Renderer.Markers.Clear();
+            Renderer.Markers.Clear(0);
 
             if (_matches == null)
                 return;
@@ -240,7 +240,8 @@ private void AddMatch(int index, bool current)
                     bounds,
                     current ? CurrentMatchColor : MatchColor,
                     current ? CurrentMatchBorderColor : MatchBorderColor,
-                    current ? CurrentMatchBorderWidth : MatchBorderWidth
+                    current ? CurrentMatchBorderWidth : MatchBorderWidth,
+                    0
                 );
 
                 Renderer.Markers.Add(marker);
diff --git a/PdfiumViewer/PdfTextStyle.cs b/PdfiumViewer/PdfTextStyle.cs
new file mode 100644
index 00000000..6e6a7337
--- /dev/null
+++ b/PdfiumViewer/PdfTextStyle.cs
@@ -0,0 +1,122 @@
+using System;
+using System.Drawing;
+
+namespace PdfiumViewer
+{
+    [Flags]
+    public enum PdfTextStyleFlags : int
+    {
+        None = 0,
+        FillColor       = 1 << 0,
+        StrokeColor     = 1 << 1,
+        Underline       = 1 << 2,
+        Strikethrough   = 1 << 3,
+        Highlight       = 1 << 4,
+        Squiggly        = 1 << 5,
+        AnnotationColor = 1 << 6,
+
+        All = FillColor | StrokeColor | Underline | Strikethrough |
+              Highlight | Squiggly | AnnotationColor
+    }
+
+
+    /// <summary>
+    /// Represents the style information of style1 specific text character in style1 PDF document.
+    /// </summary>
+    public class PdfTextStyle
+    {
+        public int PageIndex { get; set; }
+        public int CharIndex { get; set; }
+
+        //public string FontName { get; set; }
+        //public float FontSize { get; set; }
+        public Color FillColor { get; set; }
+        public Color StrokeColor { get; set; }
+        public bool IsUnderlined { get; set; }
+        public bool IsStrikethrough { get; set; }
+        public bool IsHighlighted { get; set; }
+        public bool IsSquiggly { get; set; }
+        //public Color AnnotFillColor { get; set; }
+        //public Color AnnotStrokeColor { get; set; }
+        public Color AnnotationColor { get; set; }
+
+        public PdfTextStyle(
+            int pageIndex,
+            int charIndex,
+            //string fontName,
+            //float fontSize,
+            Color fillColor,
+            Color strokeColor,
+            bool isUnderlined,
+            bool isStrikethrough,
+            bool isHighlighted,
+            bool isSquiggly,
+            //Color annotationColor,
+            //Color annotStrokeColor
+            Color annotationColor)
+        {
+            PageIndex = pageIndex;
+            CharIndex = charIndex;
+            //FontName = fontName;
+            //FontSize = fontSize;
+            FillColor = fillColor;
+            StrokeColor = strokeColor;
+            IsUnderlined = isUnderlined;
+            IsStrikethrough = isStrikethrough;
+            IsHighlighted = isHighlighted;
+            IsSquiggly = isSquiggly;
+            //AnnotStrokeColor = annotationColor;
+            //AnnotStrokeColor = annotStrokeColor;
+            AnnotationColor = annotationColor;
+        }
+
+        /// <summary>
+        /// Determines whether two PdfTextStyle instances match according to the specified PdfTextStyleFlags.
+        /// </summary>
+        /// <param name="style1">The first PdfTextStyle to compare.</param>
+        /// <param name="style2">The second PdfTextStyle to compare.</param>
+        /// <param name="flag">Flags indicating which style attributes to compare.</param>
+        /// <returns>True if the selected style attributes match; otherwise, false.</returns>
+        public static bool IsMatched(PdfTextStyle style1, PdfTextStyle style2, PdfTextStyleFlags flag)
+        {
+            if (flag == PdfTextStyleFlags.None)
+            {
+                return true;    // No comparison items selected.
+            }
+
+            // Comparing selected items.
+            if (((flag & PdfTextStyleFlags.FillColor) != 0) &&(style1.FillColor != style2.FillColor))
+            {
+                return false;
+            }
+            if (((flag & PdfTextStyleFlags.StrokeColor) != 0) && (style1.StrokeColor != style2.StrokeColor))
+                if (style1.StrokeColor != style2.StrokeColor)
+            {
+                return false;
+            }
+            if (((flag & PdfTextStyleFlags.Underline) != 0) && (style1.IsUnderlined != style2.IsUnderlined))
+                if (style1.IsUnderlined != style2.IsUnderlined)
+            {
+                return false;
+            }
+            if (((flag & PdfTextStyleFlags.Strikethrough) != 0) && (style1.IsStrikethrough != style2.IsStrikethrough))
+            {
+                return false;
+            }
+            if (((flag & PdfTextStyleFlags.Highlight) != 0) && (style1.IsHighlighted != style2.IsHighlighted))
+            {
+                return false;
+            }
+            if (((flag & PdfTextStyleFlags.Squiggly) != 0) && (style1.IsSquiggly != style2.IsSquiggly))
+            {
+                return false;
+            }
+            //if (((flag & PdfTextStyleFlags.AnnotationColor) != 0) && (style1.AnnotationColor != style2.AnnotationColor))
+            //{
+            //    return false;
+            //}
+
+            return true;
+        }
+    }
+}
\ No newline at end of file
diff --git a/PdfiumViewer/PdfViewer.Designer.cs b/PdfiumViewer/PdfViewer.Designer.cs
index c8defc0f..e0ae0897 100644
--- a/PdfiumViewer/PdfViewer.Designer.cs
+++ b/PdfiumViewer/PdfViewer.Designer.cs
@@ -40,12 +40,20 @@ private void InitializeComponent()
             this._zoomInButton = new System.Windows.Forms.ToolStripButton();
             this._zoomOutButton = new System.Windows.Forms.ToolStripButton();
             this._container = new System.Windows.Forms.SplitContainer();
+            this.toolStripBookmark = new System.Windows.Forms.ToolStrip();
+            this.toolStripButtonExpand = new System.Windows.Forms.ToolStripButton();
+            this.toolStripSplitButtonCollapse = new System.Windows.Forms.ToolStripSplitButton();
+            this.expandAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.collapseAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripButtonExpandCurrent = new System.Windows.Forms.ToolStripButton();
+            this.toolStripButtonClose = new System.Windows.Forms.ToolStripButton();
             this._bookmarks = new PdfiumViewer.NativeTreeView();
             this._renderer = new PdfiumViewer.PdfRenderer();
             this._toolStrip.SuspendLayout();
             this._container.Panel1.SuspendLayout();
             this._container.Panel2.SuspendLayout();
             this._container.SuspendLayout();
+            this.toolStripBookmark.SuspendLayout();
             this.SuspendLayout();
             // 
             // _toolStrip
@@ -105,6 +113,7 @@ private void InitializeComponent()
             // 
             // _container.Panel1
             // 
+            this._container.Panel1.Controls.Add(this.toolStripBookmark);
             this._container.Panel1.Controls.Add(this._bookmarks);
             // 
             // _container.Panel2
@@ -112,16 +121,75 @@ private void InitializeComponent()
             this._container.Panel2.Controls.Add(this._renderer);
             this._container.TabStop = false;
             // 
+            // toolStripBookmark
+            // 
+            this.toolStripBookmark.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolStripButtonExpand,
+            this.toolStripSplitButtonCollapse,
+            this.toolStripButtonExpandCurrent,
+            this.toolStripButtonClose});
+            resources.ApplyResources(this.toolStripBookmark, "toolStripBookmark");
+            this.toolStripBookmark.Name = "toolStripBookmark";
+            // 
+            // toolStripButtonExpand
+            // 
+            this.toolStripButtonExpand.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            resources.ApplyResources(this.toolStripButtonExpand, "toolStripButtonExpand");
+            this.toolStripButtonExpand.Name = "toolStripButtonExpand";
+            this.toolStripButtonExpand.Click += new System.EventHandler(this.toolStripButtonExpand_Click);
+            // 
+            // toolStripSplitButtonCollapse
+            // 
+            this.toolStripSplitButtonCollapse.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.toolStripSplitButtonCollapse.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.expandAllToolStripMenuItem,
+            this.collapseAllToolStripMenuItem});
+            resources.ApplyResources(this.toolStripSplitButtonCollapse, "toolStripSplitButtonCollapse");
+            this.toolStripSplitButtonCollapse.Name = "toolStripSplitButtonCollapse";
+            this.toolStripSplitButtonCollapse.ButtonClick += new System.EventHandler(this.toolStripSplitButtonCollapse_ButtonClick);
+            // 
+            // expandAllToolStripMenuItem
+            // 
+            this.expandAllToolStripMenuItem.Name = "expandAllToolStripMenuItem";
+            resources.ApplyResources(this.expandAllToolStripMenuItem, "expandAllToolStripMenuItem");
+            this.expandAllToolStripMenuItem.Click += new System.EventHandler(this.expandAllToolStripMenuItem_Click);
+            // 
+            // collapseAllToolStripMenuItem
+            // 
+            this.collapseAllToolStripMenuItem.Name = "collapseAllToolStripMenuItem";
+            resources.ApplyResources(this.collapseAllToolStripMenuItem, "collapseAllToolStripMenuItem");
+            this.collapseAllToolStripMenuItem.Click += new System.EventHandler(this.collapseAllToolStripMenuItem_Click);
+            // 
+            // toolStripButtonExpandCurrent
+            // 
+            this.toolStripButtonExpandCurrent.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            resources.ApplyResources(this.toolStripButtonExpandCurrent, "toolStripButtonExpandCurrent");
+            this.toolStripButtonExpandCurrent.Name = "toolStripButtonExpandCurrent";
+            this.toolStripButtonExpandCurrent.Click += new System.EventHandler(this.toolStripButtonExpandCurrent_Click);
+            // 
+            // toolStripButtonClose
+            // 
+            this.toolStripButtonClose.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+            this.toolStripButtonClose.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            resources.ApplyResources(this.toolStripButtonClose, "toolStripButtonClose");
+            this.toolStripButtonClose.Name = "toolStripButtonClose";
+            this.toolStripButtonClose.Click += new System.EventHandler(this.toolStripButtonClose_Click);
+            // 
             // _bookmarks
             // 
             resources.ApplyResources(this._bookmarks, "_bookmarks");
             this._bookmarks.FullRowSelect = true;
             this._bookmarks.Name = "_bookmarks";
             this._bookmarks.ShowLines = false;
+            this._bookmarks.BeforeCollapse += new System.Windows.Forms.TreeViewCancelEventHandler(this._bookmarks_BeforeCollapse);
+            this._bookmarks.AfterCollapse += new System.Windows.Forms.TreeViewEventHandler(this._bookmarks_AfterCollapse);
+            this._bookmarks.BeforeExpand += new System.Windows.Forms.TreeViewCancelEventHandler(this._bookmarks_BeforeExpand);
+            this._bookmarks.AfterExpand += new System.Windows.Forms.TreeViewEventHandler(this._bookmarks_AfterExpand);
             this._bookmarks.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this._bookmarks_AfterSelect);
             // 
             // _renderer
             // 
+            this._renderer.CompareBounds = ((System.Drawing.RectangleF)(resources.GetObject("_renderer.CompareBounds")));
             this._renderer.Cursor = System.Windows.Forms.Cursors.Default;
             resources.ApplyResources(this._renderer, "_renderer");
             this._renderer.Name = "_renderer";
@@ -140,8 +208,11 @@ private void InitializeComponent()
             this._toolStrip.ResumeLayout(false);
             this._toolStrip.PerformLayout();
             this._container.Panel1.ResumeLayout(false);
+            this._container.Panel1.PerformLayout();
             this._container.Panel2.ResumeLayout(false);
             this._container.ResumeLayout(false);
+            this.toolStripBookmark.ResumeLayout(false);
+            this.toolStripBookmark.PerformLayout();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -158,5 +229,12 @@ private void InitializeComponent()
         private System.Windows.Forms.SplitContainer _container;
         private NativeTreeView _bookmarks;
         private PdfRenderer _renderer;
+        private System.Windows.Forms.ToolStrip toolStripBookmark;
+        private System.Windows.Forms.ToolStripButton toolStripButtonExpand;
+        private System.Windows.Forms.ToolStripSplitButton toolStripSplitButtonCollapse;
+        private System.Windows.Forms.ToolStripMenuItem collapseAllToolStripMenuItem;
+        private System.Windows.Forms.ToolStripButton toolStripButtonExpandCurrent;
+        private System.Windows.Forms.ToolStripMenuItem expandAllToolStripMenuItem;
+        private System.Windows.Forms.ToolStripButton toolStripButtonClose;
     }
 }
diff --git a/PdfiumViewer/PdfViewer.cs b/PdfiumViewer/PdfViewer.cs
index 4e7ec82b..970a31a8 100644
--- a/PdfiumViewer/PdfViewer.cs
+++ b/PdfiumViewer/PdfViewer.cs
@@ -1,8 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Reflection.Emit;
+using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.Expando;
+using System.Security.Cryptography;
 using System.Text;
 using System.Windows.Forms;
+using static System.Windows.Forms.VisualStyles.VisualStyleElement;
 
 namespace PdfiumViewer
 {
@@ -11,8 +16,19 @@ namespace PdfiumViewer
     /// </summary>
     public partial class PdfViewer : UserControl
     {
+        public event EventHandler PanelBookmarkClosed;
+
+        // Constants for the SendMessage() method.
+        private const int WM_HSCROLL = 276;
+        private const int SB_LEFT = 6;
+        [DllImport("user32.dll")]
+        private static extern int SendMessage(IntPtr hWnd, int wMsg,
+                                          int wParam, int lParam);
+
         private IPdfDocument _document;
         private bool _showBookmarks;
+        private bool preventPageRefresh;
+        private int bookmarkPage;
 
         /// <summary>
         /// Gets or sets the PDF document.
@@ -30,7 +46,7 @@ public IPdfDocument Document
                     if (_document != null)
                     {
                         _renderer.Load(_document);
-                        UpdateBookmarks();
+                        UpdateBookmarks(true);
                     }
 
                     UpdateEnabled();
@@ -117,19 +133,210 @@ protected virtual void OnLinkClick(LinkClickEventArgs e)
                 handler(this, e);
         }
 
-        private void UpdateBookmarks()
+        private void UpdateBookmarks(bool construct = false)
         {
             bool visible = _showBookmarks && _document != null && _document.Bookmarks.Count > 0;
 
             _container.Panel1Collapsed = !visible;
 
-            if (visible)
+            if (visible || construct)
+            {
+                if ((_bookmarks.Nodes.Count == 0) || construct)
+                {
+                    _bookmarks.Nodes.Clear();
+                    foreach (var bookmark in _document.Bookmarks)
+                    {
+                        _bookmarks.Nodes.Add(GetBookmarkNode(bookmark));
+                    }
+                }
+
+                // Select a bookmark for the renderer page.
+                bookmarkPage = -1;
+                SelectBookmarkForPage(_renderer.Page);
+            }
+        }
+
+        /// <summary>
+        /// Select a bookmark for a specified page.
+        /// Do not expand new nodes.
+        /// </summary>
+        public void SelectBookmarkForPage(int page)
+        {
+            TreeNode validNode = null;
+            int bmpage = bookmarkPage;
+
+            if (page != bookmarkPage)
+            {
+                GetPageNode(page, _bookmarks.Nodes, false, ref validNode);
+
+                // Select the last valid Node.
+                if (validNode == null)
+                {
+                    page = -1;
+                }
+                preventPageRefresh = true;
+                _bookmarks.SelectedNode = validNode;
+                preventPageRefresh = false;
+                bookmarkPage = page;
+            }
+            //Console.WriteLine("SelectBookmarkForPage: Page={0}!={1}, Text={2}", page, bmpage, validNode?.Text);
+        }
+
+        /// <summary>
+        /// Recursively search for the node that corresponds to the page from Nodes.
+        /// </summary>
+        /// <param name="page">The page being selected.</param>
+        /// <param name="nodes">Bookmark Nodes being searched recursively</param>
+        /// <param name="expand">If true, search while expanding collapsed nodes</param>
+        /// <param name="validNode">Currently active Node</param>
+        private void GetPageNode(int page, TreeNodeCollection nodes, bool expand, ref TreeNode validNode)
+        {
+            int validPage = -1;
+
+            foreach (TreeNode node in nodes)
             {
-                _container.Panel1Collapsed = false;
+                PdfBookmark bookmark = (PdfBookmark)node.Tag;
+
+                if (bookmark.PageIndex <= page)
+                {
+                    // The last updated node is valid.
+                    // However, if they are on the same page, select the node found first.
+                    // Prefer child node over parent node.
+                    if (bookmark.PageIndex != validPage)
+                    {
+                        validNode = node;
+                        validPage = bookmark.PageIndex;
+                    }
+                }
 
-                _bookmarks.Nodes.Clear();
-                foreach (var bookmark in _document.Bookmarks)
-                    _bookmarks.Nodes.Add(GetBookmarkNode(bookmark));
+                // If the tree is expanded, explore further.
+                // If 'expand' is true, explore nodes even if they are collapsed.
+                if (node.IsExpanded || (expand && (node.Nodes != null)))
+                {
+                    GetPageNode(page, node.Nodes, expand, ref validNode);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Get the start page and end page of the selected/unselected bookmark node.
+        /// </summary>
+        /// <returns>Tuple containing the start page and end page of the current bookmark node.</returns>
+        public void GetBookmarkPageRange(int page, out int startPage, out int endPage)
+        {
+            if (_bookmarks.SelectedNode != null)
+            {
+                GetSelectedBookmarkPageRange(page, out startPage, out endPage);
+            }
+            else
+            {
+                GetUnselectedBookmarkPageRange(page, out startPage, out endPage);
+            }
+            // Console.WriteLine("GetBookmarkPageRange(): {0} - {1}", startPage, endPage);
+        }
+
+        private void GetSelectedBookmarkPageRange(int page, out int startPage, out int endPage)
+        {
+            TreeNode currentNode = _bookmarks.SelectedNode;
+            PdfBookmark currentBookmark = (PdfBookmark)currentNode.Tag;
+            startPage = currentBookmark.PageIndex;
+
+            TreeNode endNode = GetEndNode(currentNode);
+            if (endNode != null)
+            {
+                // When the node after the current node is found.
+                PdfBookmark endBookmark = (PdfBookmark)endNode.Tag;
+                endPage = endBookmark.PageIndex - 1;
+            }
+            else
+            {
+                // If there is no node, it is the last page.
+                endPage = _document.PageCount - 1;
+            }
+
+            if ((page < startPage) || (page > endPage))
+            {
+                // In case the target page lacks an assigned bookmark.
+                startPage = -1;
+                endPage = -1;
+            }
+        }
+
+
+        private void GetUnselectedBookmarkPageRange(int page, out int startPage, out int endPage)
+        {
+            // No node selected: return the top-level (first-level) bookmark range that contains 'page'.
+            if (_document == null)
+            {
+                startPage = -1;
+                endPage = -1;
+                return;
+            }
+            else
+            {
+                startPage = 0;
+                endPage = _document.PageCount - 1;
+            }
+
+            TreeNode candidate = null;
+            int candidateStart = 0;
+
+            // a. Before the range defined by the bookmarks
+            // b. Gap within the range defined by the bookmarks
+            // c. After the range defined by the bookmarks
+
+            // Find the last top-level bookmark whose PageIndex <= page
+            foreach (TreeNode node in _bookmarks.Nodes)
+            {
+                PdfBookmark bm = (PdfBookmark)node.Tag;
+                if (bm.PageIndex <= page)
+                {
+                    candidate = node;
+                    candidateStart = bm.PageIndex;
+                }
+                else
+                {
+                    endPage = bm.PageIndex-1;
+                    break;
+                }
+            }
+
+            if (candidate != null)
+            {
+                // If there is a next node, it will be PageIndex -1, if not it will be the last page.
+                startPage = candidateStart;
+                if (candidate.NextNode != null)
+                {
+                    endPage = ((PdfBookmark)candidate.NextNode.Tag).PageIndex - 1;
+                }
+                else
+                {
+                    endPage = _document.PageCount - 1;
+                }
+            }
+
+            return;
+        }
+
+        /// <summary>
+        /// Get the end node of the current bookmark node.
+        /// When the end node at the same level cannot be found, recursively search for the parent node.
+        /// </summary>
+        /// <param name="currentNode"></param>
+        /// <returns></returns>
+        private TreeNode GetEndNode(TreeNode currentNode)
+        {
+            if (currentNode.NextNode != null)
+            {
+                return currentNode.NextNode;
+            }
+            else if (currentNode.Parent != null)
+            {
+                return GetEndNode(currentNode.Parent);
+            }
+            else
+            {
+                return null;
             }
         }
 
@@ -145,6 +352,10 @@ public PdfViewer()
             ShowToolbar = true;
             ShowBookmarks = true;
 
+            _bookmarks.HideSelection = false;
+            preventPageRefresh = false;
+            bookmarkPage = -1;
+
             UpdateEnabled();
         }
 
@@ -228,19 +439,160 @@ private TreeNode GetBookmarkNode(PdfBookmark bookmark)
             if (bookmark.Children != null)
             {
                 foreach (var child in bookmark.Children)
+                {
                     node.Nodes.Add(GetBookmarkNode(child));
+                }
             }
             return node;
         }
 
         private void _bookmarks_AfterSelect(object sender, TreeViewEventArgs e)
         {
-            _renderer.Page = ((PdfBookmark)e.Node.Tag).PageIndex;
+            if (preventPageRefresh == false)
+            {
+                _renderer.Page = ((PdfBookmark)e.Node.Tag).PageIndex;
+            }
+        }
+
+        private void _bookmarks_BeforeExpand(object sender, TreeViewCancelEventArgs e)
+        {
+            // AfterSelect event is fired when child node has focus.
+            preventPageRefresh = true;
+        }
+
+        private void _bookmarks_AfterExpand(object sender, TreeViewEventArgs e)
+        {
+            // AfterSelect event is fired when child node has focus.
+            preventPageRefresh = false;
+
+            // Select a bookmark for the renderer page.
+            bookmarkPage = -1;
+            SelectBookmarkForPage(_renderer.Page);
+        }
+
+        private void _bookmarks_BeforeCollapse(object sender, TreeViewCancelEventArgs e)
+        {
+            // AfterSelect event is fired when child node has focus.
+            preventPageRefresh = true;
+        }
+
+        private void _bookmarks_AfterCollapse(object sender, TreeViewEventArgs e)
+        {
+            // AfterSelect event is fired when child node has focus.
+            preventPageRefresh = false;
         }
 
         private void _renderer_LinkClick(object sender, LinkClickEventArgs e)
         {
             OnLinkClick(e);
         }
+
+        private void toolStripButtonExpand_Click(object sender, EventArgs e)
+        {
+            // Expand Top-Level
+            bool visible = _showBookmarks && _document != null && _document.Bookmarks.Count > 0;
+
+            if (visible)
+            {
+                foreach (TreeNode node in _bookmarks.Nodes)
+                {
+                    node.Expand();
+                }
+
+                // Show selected nodes.
+                EnsureVisibleWithoutRightScrolling(_bookmarks.SelectedNode);
+            }
+        }
+
+        private void toolStripSplitButtonCollapse_ButtonClick(object sender, EventArgs e)
+        {
+            // Collapse Top-Level
+            bool visible = _showBookmarks && _document != null && _document.Bookmarks.Count > 0;
+
+            if (visible)
+            {
+                foreach (TreeNode node in _bookmarks.Nodes)
+                {
+                    node.Collapse();
+                }
+                // Show selected nodes.
+                EnsureVisibleWithoutRightScrolling(_bookmarks.SelectedNode);
+            }
+        }
+
+        private void expandAllToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            // Expand All
+            _bookmarks.ExpandAll();
+            // Show selected nodes.
+            EnsureVisibleWithoutRightScrolling(_bookmarks.SelectedNode);
+        }
+
+        private void collapseAllToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            // Collapse All
+            CollapseChildrenNodes(_bookmarks.Nodes);
+            // Show selected nodes.
+            EnsureVisibleWithoutRightScrolling(_bookmarks.SelectedNode);
+        }
+
+        private void toolStripButtonExpandCurrent_Click(object sender, EventArgs e)
+        {
+            // Expand current bookmark
+            TreeNode validNode = null;
+
+            // Collapse all nodes initially
+            CollapseChildrenNodes(_bookmarks.Nodes);
+            GetPageNode(_renderer.Page, _bookmarks.Nodes, true, ref validNode);
+            ExpandParentNodes(validNode);
+
+            // Show selected nodes.
+            EnsureVisibleWithoutRightScrolling(_bookmarks.SelectedNode);
+        }
+
+        private void ExpandParentNodes(TreeNode node)
+        {
+            if (node != null)
+            {
+                node.Expand();
+                if (node.Parent != null)
+                {
+                    ExpandParentNodes(node.Parent);
+                }
+            }
+        }
+
+        private void CollapseChildrenNodes(TreeNodeCollection nodes)
+        {
+            foreach (TreeNode node in nodes)
+            {
+                if (node != null)
+                {
+                    if (node.Nodes != null)
+                    {
+                        CollapseChildrenNodes(node.Nodes);
+                    }
+                    node.Collapse();
+                }
+            }
+        }
+
+        private void EnsureVisibleWithoutRightScrolling(TreeNode node)
+        {
+            // we do the standard call.. 
+            node?.EnsureVisible();
+
+            // ..and afterwards we scroll to the left again!
+            SendMessage(_bookmarks.Handle, WM_HSCROLL, SB_LEFT, 0);
+        }
+
+        private void toolStripButtonClose_Click(object sender, EventArgs e)
+        {
+            ShowBookmarks = false;
+
+            // Fire a custom event when a bookmark is closed
+            PanelBookmarkClosed?.Invoke(this, e);
+        }
+
     }
 }
diff --git a/PdfiumViewer/PdfViewer.resx b/PdfiumViewer/PdfViewer.resx
index 07595c73..9bea7a5a 100644
--- a/PdfiumViewer/PdfViewer.resx
+++ b/PdfiumViewer/PdfViewer.resx
@@ -189,14 +189,152 @@
   <data name="_container.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 25</value>
   </data>
-  <data name="_bookmarks.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
+  <metadata name="toolStripBookmark.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>121, 17</value>
+  </metadata>
+  <data name="toolStripButtonExpand.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFJSURBVEhLYxg+gEPRI5pNyTOfgSGUGSISygzig8QhfAoB
+        p4r3fxBmU/Y6AuJzKHvOh4kxyLlLAoUYOZS9wtiVPRvwYiWvdJB+DMCu5HEeZiCHiud+GJtd2esUA4M9
+        C9DCOJgYIcyh6BkFNRYJyLpIASV+oyhU8rjGIOMmBJJmU/YMQJbDh7FbAATM8l6O7Moef0GKgAY+ZJDx
+        loZKgQGbkocX1mBBwpwqXoVApUwQHdiAnKsiu7K3A8zlQwewK3kmYkumIHEIn0IAiyBg2B8C8ZGTKYey
+        myxQiNJk6nUObiB6MlXxYCctmWLLnJI+csMkmSp6qg3NZDoYSlMGdhWvLGzhjoIVvTNBajEA4dLUKwwm
+        RgiDUhzUWCRAoDQlyQIlryCwmeiAWd7dASWZAi2FSoEB0De5WIMFGePKyXAgby8wNJMpbQADAwAeqgoS
+        oZ5UtAAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="toolStripButtonExpand.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+    <value>Magenta</value>
   </data>
-  <data name="_bookmarks.Location" type="System.Drawing.Point, System.Drawing">
+  <data name="toolStripButtonExpand.Size" type="System.Drawing.Size, System.Drawing">
+    <value>23, 24</value>
+  </data>
+  <data name="toolStripButtonExpand.Text" xml:space="preserve">
+    <value>Expand</value>
+  </data>
+  <data name="toolStripButtonExpand.ToolTipText" xml:space="preserve">
+    <value>Expand Top-Level Bookmarks</value>
+  </data>
+  <data name="expandAllToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>180, 22</value>
+  </data>
+  <data name="expandAllToolStripMenuItem.Text" xml:space="preserve">
+    <value>Expand All</value>
+  </data>
+  <data name="collapseAllToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>180, 22</value>
+  </data>
+  <data name="collapseAllToolStripMenuItem.Text" xml:space="preserve">
+    <value>Collapse All</value>
+  </data>
+  <data name="toolStripSplitButtonCollapse.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFFSURBVDhP3ZOxSgRBDIa3cHdyT6AIsjubrazUQiwUixM3
+        k/XEwicQwQdQQRDB1vcRG0F9DsHKysLyDrwD1yQeKOsdynXeDyGZSfgZ+DLR9CkpaFGzS8sM8nARp+1l
+        azQVp7wEGG6TnB/GBoY9KGgTMk4Tz8+toqqlHsQp/TSFnNbB80CHxgUgn9ispydA6jrkK7mrY+QXM5lU
+        YtYDX21o7Xx1AFj2rDGdSnzYsZwTQxHuBdSxNZr6E2VP+zGWKy6jbQHYH4KqXVYeDW2+NOOrVaF3N9JI
+        wl7jqaOzBkUoQ8FnaghZ+WYmk8oMZR+t1r2cbsoup7bmBKtd+SmvCfK5NZrSdfj16+V8GvnOrMNwKDDe
+        7U4pY7gc2nzTwtY8YHU9irCGboCulo5+GtFjq6A1AdLVs3lMKnnVTZTynB0k2/mfKIo+AOhngqW543Bu
+        AAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="toolStripSplitButtonCollapse.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+    <value>Magenta</value>
+  </data>
+  <data name="toolStripSplitButtonCollapse.Size" type="System.Drawing.Size, System.Drawing">
+    <value>32, 24</value>
+  </data>
+  <data name="toolStripSplitButtonCollapse.Text" xml:space="preserve">
+    <value>Collapse</value>
+  </data>
+  <data name="toolStripSplitButtonCollapse.ToolTipText" xml:space="preserve">
+    <value>Collapse Top-Level Bookmarks</value>
+  </data>
+  <data name="toolStripButtonExpandCurrent.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGOSURBVDhPvVS9SgNBED4Fd1dsBEHBwuR20/kENipIzN0u
+        +gZaWPgCIjaWPoGFhZ0oaBBrSwXBV1GihYVFEGKc725WDzcJOVE/GHZ+vvlmb+/2on/BmGnMS+OWBxk4
+        TB+AytKkiNP78ZrrDmPC2Ltopj7B3SGkTg9AVNru9tpV0Yizx9x9bg8hY3sBErkjeSaHNLYL49BjFFxp
+        0nOOQ0htL1kwg4jtCeKiqVp6yOUIMXo4DFEUpLPc8b40jY40qx34PgeUEiw2fgcNe8Y6tCDOC6sy9h15
+        +H4AcV6LnF/ZIb3ZF6ylBGV1bdv7quLaas614RcHlRL0UNX0DTmYitNM1ONHgkCf73AYwaTZS1CZdBPG
+        4SdywaTJYYhgh7o+reLkGjkYfOS4Wm6Hwrh1uttPmZCxRzAWaNENcuDk8aAd8l2mz+I4I5vkgc4u4XIk
+        dGLp7j76IRmHergcgprPQMqIeBT6nXHpC7MrUyR65XlCu1OuhFBVuyi0vaXpG5zqCxm7LfpR3CjTWODU
+        XyCKPgDrXcUFGj58dAAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="toolStripButtonExpandCurrent.ImageScaling" type="System.Windows.Forms.ToolStripItemImageScaling, System.Windows.Forms">
+    <value>None</value>
+  </data>
+  <data name="toolStripButtonExpandCurrent.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+    <value>Magenta</value>
+  </data>
+  <data name="toolStripButtonExpandCurrent.Size" type="System.Drawing.Size, System.Drawing">
+    <value>24, 24</value>
+  </data>
+  <data name="toolStripButtonExpandCurrent.Text" xml:space="preserve">
+    <value>toolStripButton1</value>
+  </data>
+  <data name="toolStripButtonExpandCurrent.ToolTipText" xml:space="preserve">
+    <value>Expand Current Bookmark</value>
+  </data>
+  <data name="toolStripButtonClose.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEUSURBVDhP5VRBa8IwGO2lTT1u3mQoTbzpYXj2ZKdrElCH
+        4E/xIHiYv9nadlP0i3uGQbbSijcfFMJ773t8afLFe3S04mYo9JpF+g3Mv2CRHIdcbry2fgLlggn92ejq
+        UyjUMYjkArQDoxnPxcvlCrQLX7wPyLhD6CEQegrJIhBqZjR4dj7XfUh/I+TJkIwpCr6ZUAkk2oFKDAct
+        NV5I5UBohsKCcTlCWAEuqxx2BeNJTIW5DRDqC+vcaLDVg+mMAi5d/e4Wcn3cNRBh1/+Ymw/rrHaocyh0
+        IDcfCsLuc238jnol4x4FdLHlHJJFwPUHaT9TQl4ahh4kF9TBFsbS0SN9aUPLRs8+DhXumX0cXibPoB4T
+        nncGvBCB7WZU/eEAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="toolStripButtonClose.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+    <value>Magenta</value>
+  </data>
+  <data name="toolStripButtonClose.Size" type="System.Drawing.Size, System.Drawing">
+    <value>23, 24</value>
+  </data>
+  <data name="toolStripButtonClose.Text" xml:space="preserve">
+    <value>toolStripButton1</value>
+  </data>
+  <data name="toolStripButtonClose.ToolTipText" xml:space="preserve">
+    <value>Close Bookmarks</value>
+  </data>
+  <data name="toolStripBookmark.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
+  <data name="toolStripBookmark.Size" type="System.Drawing.Size, System.Drawing">
+    <value>200, 27</value>
+  </data>
+  <data name="toolStripBookmark.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="toolStripBookmark.Text" xml:space="preserve">
+    <value>toolStrip1</value>
+  </data>
+  <data name="&gt;&gt;toolStripBookmark.Name" xml:space="preserve">
+    <value>toolStripBookmark</value>
+  </data>
+  <data name="&gt;&gt;toolStripBookmark.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;toolStripBookmark.Parent" xml:space="preserve">
+    <value>_container.Panel1</value>
+  </data>
+  <data name="&gt;&gt;toolStripBookmark.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="_bookmarks.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Bottom, Left, Right</value>
+  </data>
+  <data name="_bookmarks.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 30</value>
+  </data>
   <data name="_bookmarks.Size" type="System.Drawing.Size, System.Drawing">
-    <value>200, 413</value>
+    <value>200, 349</value>
   </data>
   <data name="_bookmarks.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -211,7 +349,7 @@
     <value>_container.Panel1</value>
   </data>
   <data name="&gt;&gt;_bookmarks.ZOrder" xml:space="preserve">
-    <value>0</value>
+    <value>1</value>
   </data>
   <data name="&gt;&gt;_container.Panel1.Name" xml:space="preserve">
     <value>_container.Panel1</value>
@@ -225,6 +363,14 @@
   <data name="&gt;&gt;_container.Panel1.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
+  <data name="_renderer.CompareBounds" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj0yLjAuMC4wLCBDdWx0
+        dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAABlTeXN0ZW0uRHJh
+        d2luZy5SZWN0YW5nbGVGBAAAAAF4AXkFd2lkdGgGaGVpZ2h0AAAAAAsLCwsCAAAAAAAAAAAAAAAAAAAA
+        AAAAAAs=
+</value>
+  </data>
   <data name="_renderer.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
   </data>
@@ -232,7 +378,7 @@
     <value>0, 0</value>
   </data>
   <data name="_renderer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>384, 413</value>
+    <value>384, 379</value>
   </data>
   <data name="_renderer.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -265,7 +411,7 @@
     <value>1</value>
   </data>
   <data name="_container.Size" type="System.Drawing.Size, System.Drawing">
-    <value>588, 413</value>
+    <value>588, 379</value>
   </data>
   <data name="_container.SplitterDistance" type="System.Int32, mscorlib">
     <value>200</value>
@@ -289,10 +435,10 @@
     <value>True</value>
   </metadata>
   <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>6, 13</value>
+    <value>6, 12</value>
   </data>
   <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
-    <value>588, 438</value>
+    <value>588, 404</value>
   </data>
   <data name="&gt;&gt;_saveButton.Name" xml:space="preserve">
     <value>_saveButton</value>
@@ -324,6 +470,42 @@
   <data name="&gt;&gt;_zoomOutButton.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="&gt;&gt;toolStripButtonExpand.Name" xml:space="preserve">
+    <value>toolStripButtonExpand</value>
+  </data>
+  <data name="&gt;&gt;toolStripButtonExpand.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;toolStripSplitButtonCollapse.Name" xml:space="preserve">
+    <value>toolStripSplitButtonCollapse</value>
+  </data>
+  <data name="&gt;&gt;toolStripSplitButtonCollapse.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripSplitButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;expandAllToolStripMenuItem.Name" xml:space="preserve">
+    <value>expandAllToolStripMenuItem</value>
+  </data>
+  <data name="&gt;&gt;expandAllToolStripMenuItem.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;collapseAllToolStripMenuItem.Name" xml:space="preserve">
+    <value>collapseAllToolStripMenuItem</value>
+  </data>
+  <data name="&gt;&gt;collapseAllToolStripMenuItem.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;toolStripButtonExpandCurrent.Name" xml:space="preserve">
+    <value>toolStripButtonExpandCurrent</value>
+  </data>
+  <data name="&gt;&gt;toolStripButtonExpandCurrent.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;toolStripButtonClose.Name" xml:space="preserve">
+    <value>toolStripButtonClose</value>
+  </data>
+  <data name="&gt;&gt;toolStripButtonClose.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>PdfViewer</value>
   </data>
diff --git a/PdfiumViewer/PdfViewerCursorMode.cs b/PdfiumViewer/PdfViewerCursorMode.cs
index 01d55b13..2d3f7354 100644
--- a/PdfiumViewer/PdfViewerCursorMode.cs
+++ b/PdfiumViewer/PdfViewerCursorMode.cs
@@ -1,12 +1,13 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace PdfiumViewer
-{
-    public enum PdfViewerCursorMode
-    {
-        Pan,
-        TextSelection
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace PdfiumViewer
+{
+    public enum PdfCursorMode
+    {
+        Pan,
+        TextSelection,
+        Bounds
+    }
+}
diff --git a/PdfiumViewer/PdfiumViewer.csproj b/PdfiumViewer/PdfiumViewer.csproj
index 83e95046..d8407c22 100644
--- a/PdfiumViewer/PdfiumViewer.csproj
+++ b/PdfiumViewer/PdfiumViewer.csproj
@@ -14,10 +14,11 @@
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
+    <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -84,6 +85,7 @@
     <Compile Include="PdfInformation.cs" />
     <Compile Include="PdfSearchManager.cs" />
     <Compile Include="PdfTextSpan.cs" />
+    <Compile Include="PdfTextStyle.cs" />
     <Compile Include="PdfViewerCursorMode.cs" />
     <Compile Include="StreamManager.cs" />
     <Compile Include="PdfPageLink.cs" />
@@ -119,7 +121,6 @@
     <Compile Include="StreamExtensions.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Key.snk" />
     <None Include="Resources\zoom_out.png" />
     <None Include="Resources\zoom_in.png" />
     <None Include="Resources\printer.png" />
diff --git a/PdfiumViewer/Resources/bm_collapse20.png b/PdfiumViewer/Resources/bm_collapse20.png
new file mode 100644
index 00000000..04ef74cc
Binary files /dev/null and b/PdfiumViewer/Resources/bm_collapse20.png differ
diff --git a/PdfiumViewer/Resources/bm_expand_fill.png b/PdfiumViewer/Resources/bm_expand_fill.png
new file mode 100644
index 00000000..74605f86
Binary files /dev/null and b/PdfiumViewer/Resources/bm_expand_fill.png differ
diff --git a/PdfiumViewer/Resources/bookmark_aim20.png b/PdfiumViewer/Resources/bookmark_aim20.png
new file mode 100644
index 00000000..ca3c9c4d
Binary files /dev/null and b/PdfiumViewer/Resources/bookmark_aim20.png differ
diff --git a/PdfiumViewer/Resources/close_fill20.png b/PdfiumViewer/Resources/close_fill20.png
new file mode 100644
index 00000000..d4e85446
Binary files /dev/null and b/PdfiumViewer/Resources/close_fill20.png differ
diff --git a/README.markdown b/README.markdown
index 3981de63..6ea39e86 100644
--- a/README.markdown
+++ b/README.markdown
@@ -1,5 +1,7 @@
 # PdfiumViewer
 
+**⚠️ Note:** This PdfiumViewer is a custom version for PDFComp.
+
 Apache 2.0 License.
 
 [Download from NuGet](http://nuget.org/packages/PdfiumViewer).