From 3b21d0b77124a26ef97922220c29e17e91d178f5 Mon Sep 17 00:00:00 2001
From: Dan <46821332+nsadeveloper789@users.noreply.github.com>
Date: Mon, 15 Apr 2024 16:33:32 -0400
Subject: [PATCH] GP-4485: Re-configure default Debugger.tool for Trace RMI

---
 .../TraceRmiConnectionManagerPlugin.java      |    2 +-
 .../TraceRmiLauncherServicePlugin.java        |    2 +-
 .../debug/gui/model/DebuggerModelPlugin.java  |    2 +-
 .../debug/gui/model/ObjectsTablePanel.java    |    2 +-
 .../gui/objects/DebuggerObjectsPlugin.java    |    2 +-
 .../main/resources/defaultTools/Debugger.tool | 1122 ++++-------------
 6 files changed, 264 insertions(+), 868 deletions(-)

diff --git a/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/gui/tracermi/connection/TraceRmiConnectionManagerPlugin.java b/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/gui/tracermi/connection/TraceRmiConnectionManagerPlugin.java
index 81640171bfb..ef77ed3021f 100644
--- a/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/gui/tracermi/connection/TraceRmiConnectionManagerPlugin.java
+++ b/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/gui/tracermi/connection/TraceRmiConnectionManagerPlugin.java
@@ -31,7 +31,7 @@
 			""",
 	category = PluginCategoryNames.DEBUGGER,
 	packageName = DebuggerPluginPackage.NAME,
-	status = PluginStatus.STABLE,
+	status = PluginStatus.RELEASED,
 	eventsConsumed = {
 		TraceActivatedPluginEvent.class,
 		TraceInactiveCoordinatesPluginEvent.class,
diff --git a/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/gui/tracermi/launcher/TraceRmiLauncherServicePlugin.java b/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/gui/tracermi/launcher/TraceRmiLauncherServicePlugin.java
index ebd93ba0083..3f15ebe1cb0 100644
--- a/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/gui/tracermi/launcher/TraceRmiLauncherServicePlugin.java
+++ b/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/gui/tracermi/launcher/TraceRmiLauncherServicePlugin.java
@@ -58,7 +58,7 @@
 			""",
 	category = PluginCategoryNames.DEBUGGER,
 	packageName = DebuggerPluginPackage.NAME,
-	status = PluginStatus.UNSTABLE,
+	status = PluginStatus.RELEASED,
 	eventsConsumed = {
 		ProgramActivatedPluginEvent.class,
 		ProgramClosedPluginEvent.class,
diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/model/DebuggerModelPlugin.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/model/DebuggerModelPlugin.java
index d23f124983b..e08b8abe38b 100644
--- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/model/DebuggerModelPlugin.java
+++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/model/DebuggerModelPlugin.java
@@ -34,7 +34,7 @@
 	description = "GUI to browse objects recorded to the trace",
 	category = PluginCategoryNames.DEBUGGER,
 	packageName = DebuggerPluginPackage.NAME,
-	status = PluginStatus.STABLE,
+	status = PluginStatus.RELEASED,
 	eventsConsumed = {
 		TraceActivatedPluginEvent.class,
 		TraceClosedPluginEvent.class,
diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/model/ObjectsTablePanel.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/model/ObjectsTablePanel.java
index 55a447497a6..f884775a311 100644
--- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/model/ObjectsTablePanel.java
+++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/model/ObjectsTablePanel.java
@@ -99,7 +99,7 @@ protected String computePreferenceKey() {
 		if (rootSchema == null) {
 			return DEFAULT_PREF_KEY;
 		}
-		return rootSchema + ":" + schemas
+		return rootSchema.getName() + ":" + schemas
 				.stream()
 				.map(s -> s.getName().toString())
 				.collect(Collectors.joining(",")) +
diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/objects/DebuggerObjectsPlugin.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/objects/DebuggerObjectsPlugin.java
index 3df7b586565..46a3a8f1363 100644
--- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/objects/DebuggerObjectsPlugin.java
+++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/objects/DebuggerObjectsPlugin.java
@@ -63,7 +63,7 @@
 public class DebuggerObjectsPlugin extends AbstractDebuggerPlugin
 		implements ObjectUpdateService, CollectionChangeListener<DebuggerObjectModel> {
 
-	static String TITLE_PROVIDER_TARGETS = "Debugger Objects";
+	static final String TITLE_PROVIDER_TARGETS = "Debugger Objects";
 
 	@AutoServiceConsumed
 	protected DebuggerInterpreterService interpreterService;
diff --git a/Ghidra/Debug/Debugger/src/main/resources/defaultTools/Debugger.tool b/Ghidra/Debug/Debugger/src/main/resources/defaultTools/Debugger.tool
index 5b4175d6f53..e9273dd3051 100644
--- a/Ghidra/Debug/Debugger/src/main/resources/defaultTools/Debugger.tool
+++ b/Ghidra/Debug/Debugger/src/main/resources/defaultTools/Debugger.tool
@@ -1,151 +1,175 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TOOL_CONFIG CONFIG_NAME="NO_LONGER_USED">
     <SUPPORTED_DATA_TYPE CLASS_NAME="ghidra.program.model.listing.Program" />
-    <SUPPORTED_DATA_TYPE CLASS_NAME="ghidra.trace.model.Trace" />
     <SUPPORTED_DATA_TYPE CLASS_NAME="ghidra.program.model.listing.DataTypeArchive" />
+    <SUPPORTED_DATA_TYPE CLASS_NAME="ghidra.trace.model.Trace" />
     <ICON LOCATION="debugger32.png" />
     <TOOL TOOL_NAME="Debugger" INSTANCE_NAME="">
         <OPTIONS />
-        <PACKAGE NAME="Debugger">
-            <INCLUDE CLASS="ghidra.app.plugin.core.debug.service.emulation.DebuggerEmulationServicePlugin" />
-        </PACKAGE>
         <PACKAGE NAME="Ghidra Core">
             <INCLUDE CLASS="ghidra.app.plugin.core.editor.TextEditorManagerPlugin" />
             <INCLUDE CLASS="ghidra.app.plugin.core.interpreter.InterpreterPanelPlugin" />
-            <EXCLUDE CLASS="ghidra.plugins.fsbrowser.FileSystemBrowserPlugin" />
+            <INCLUDE CLASS="ghidra.app.plugin.core.terminal.TerminalPlugin" />
         </PACKAGE>
-        <ROOT_NODE X_POS="671" Y_POS="447" WIDTH="1920" HEIGHT="1017" EX_STATE="0" FOCUSED_OWNER="DebuggerConsolePlugin" FOCUSED_NAME="Debug Console" FOCUSED_TITLE="Debug Console">
-            <SPLIT_NODE WIDTH="1918" HEIGHT="910" DIVIDER_LOCATION="767" ORIENTATION="VERTICAL">
+        <PACKAGE NAME="Debugger">
+            <EXCLUDE CLASS="ghidra.app.plugin.core.debug.gui.interpreters.DebuggerInterpreterPlugin" />
+            <EXCLUDE CLASS="ghidra.app.plugin.core.debug.gui.objects.DebuggerObjectsPlugin" />
+            <EXCLUDE CLASS="ghidra.app.plugin.core.debug.gui.target.DebuggerTargetsPlugin" />
+            <EXCLUDE CLASS="ghidra.app.plugin.core.debug.service.model.DebuggerModelServiceProxyPlugin" />
+        </PACKAGE>
+        <PLUGIN_STATE CLASS="ghidra.app.plugin.core.debug.gui.model.DebuggerModelPlugin">
+            <XML NAME="connectedProvider">
+                <SAVE_STATE>
+                    <STATE NAME="showAttributesTable" TYPE="boolean" VALUE="false" />
+                    <STATE NAME="showElementsTable" TYPE="boolean" VALUE="false" />
+                    <STATE NAME="showPrimitivesInTree" TYPE="boolean" VALUE="true" />
+                </SAVE_STATE>
+            </XML>
+        </PLUGIN_STATE>
+        <PLUGIN_STATE CLASS="ghidra.app.plugin.core.debug.gui.modules.DebuggerModulesPlugin">
+            <STATE NAME="showSectionsTable" TYPE="boolean" VALUE="false" />
+        </PLUGIN_STATE>
+        <ROOT_NODE X_POS="1558" Y_POS="4625" WIDTH="1440" HEIGHT="1037" EX_STATE="0" FOCUSED_OWNER="CodeBrowserPlugin" FOCUSED_NAME="Listing" FOCUSED_TITLE="Listing: ">
+            <SPLIT_NODE WIDTH="100" HEIGHT="100" DIVIDER_LOCATION="0" ORIENTATION="VERTICAL">
                 <SPLIT_NODE WIDTH="100" HEIGHT="100" DIVIDER_LOCATION="0" ORIENTATION="VERTICAL">
-                    <SPLIT_NODE WIDTH="1918" HEIGHT="695" DIVIDER_LOCATION="251" ORIENTATION="HORIZONTAL">
-                        <SPLIT_NODE WIDTH="480" HEIGHT="695" DIVIDER_LOCATION="692" ORIENTATION="VERTICAL">
-                            <SPLIT_NODE WIDTH="480" HEIGHT="478" DIVIDER_LOCATION="427" ORIENTATION="VERTICAL">
-                                <COMPONENT_NODE TOP_INFO="0">
-                                    <COMPONENT_INFO NAME="Debugger Targets" OWNER="DebuggerTargetsPlugin" TITLE="Debugger Targets" ACTIVE="true" GROUP="Default" INSTANCE_ID="3398987890722027178" />
-                                </COMPONENT_NODE>
-                                <COMPONENT_NODE TOP_INFO="0">
-                                    <COMPONENT_INFO NAME="Objects" OWNER="DebuggerObjectsPlugin" TITLE="Objects" ACTIVE="true" GROUP="Debugger.Core.Objects" INSTANCE_ID="3398987890722027177" />
-                                </COMPONENT_NODE>
-                            </SPLIT_NODE>
-                            <COMPONENT_NODE TOP_INFO="3">
-                                <COMPONENT_INFO NAME="DataTypes Provider" OWNER="DataTypeManagerPlugin" TITLE="Data Type Manager" ACTIVE="true" GROUP="Default" INSTANCE_ID="3398987887848928947" />
-                                <COMPONENT_INFO NAME="Program Tree" OWNER="ProgramTreePlugin" TITLE="Program Trees" ACTIVE="true" GROUP="Default" INSTANCE_ID="3398987882610243239" />
-                                <COMPONENT_INFO NAME="Symbol Tree" OWNER="SymbolTreePlugin" TITLE="Symbol Tree" ACTIVE="true" GROUP="Default" INSTANCE_ID="3398987882610243243" />
-                                <COMPONENT_INFO NAME="Debug Console" OWNER="DebuggerConsolePlugin" TITLE="Debug Console" ACTIVE="true" GROUP="Default" INSTANCE_ID="3398987888408868532" />
-                            </COMPONENT_NODE>
-                        </SPLIT_NODE>
-                        <SPLIT_NODE WIDTH="1293" HEIGHT="590" DIVIDER_LOCATION="785" ORIENTATION="VERTICAL">
-                            <SPLIT_NODE WIDTH="1386" HEIGHT="638" DIVIDER_LOCATION="705" ORIENTATION="VERTICAL">
-                                <SPLIT_NODE WIDTH="1434" HEIGHT="695" DIVIDER_LOCATION="679" ORIENTATION="HORIZONTAL">
-                                    <SPLIT_NODE WIDTH="971" HEIGHT="695" DIVIDER_LOCATION="506" ORIENTATION="VERTICAL">
-                                        <COMPONENT_NODE TOP_INFO="0">
-                                            <COMPONENT_INFO NAME="Listing" OWNER="DebuggerListingPlugin" TITLE="Dynamic" ACTIVE="true" GROUP="Core" INSTANCE_ID="3381048220378451124" />
+                    <SPLIT_NODE WIDTH="1438" HEIGHT="928" DIVIDER_LOCATION="713" ORIENTATION="VERTICAL">
+                        <SPLIT_NODE WIDTH="100" HEIGHT="100" DIVIDER_LOCATION="0" ORIENTATION="VERTICAL">
+                            <SPLIT_NODE WIDTH="1438" HEIGHT="659" DIVIDER_LOCATION="251" ORIENTATION="HORIZONTAL">
+                                <SPLIT_NODE WIDTH="473" HEIGHT="659" DIVIDER_LOCATION="692" ORIENTATION="VERTICAL">
+                                    <SPLIT_NODE WIDTH="360" HEIGHT="659" DIVIDER_LOCATION="486" ORIENTATION="VERTICAL">
+                                        <COMPONENT_NODE TOP_INFO="1">
+                                            <COMPONENT_INFO NAME="Connections" OWNER="TraceRmiConnectionManagerPlugin" TITLE="Connections" ACTIVE="true" GROUP="Default" INSTANCE_ID="3592304123427987724" />
+                                            <COMPONENT_INFO NAME="Debug Console" OWNER="DebuggerConsolePlugin" TITLE="Debug Console" ACTIVE="true" GROUP="Default" INSTANCE_ID="3592304144451936542" />
                                         </COMPONENT_NODE>
                                         <COMPONENT_NODE TOP_INFO="0">
-                                            <COMPONENT_INFO NAME="Listing" OWNER="CodeBrowserPlugin" TITLE="Listing" ACTIVE="true" GROUP="Core" INSTANCE_ID="3398987873217099454" />
+                                            <COMPONENT_INFO NAME="Model" OWNER="DebuggerModelPlugin" TITLE="Model" ACTIVE="true" GROUP="Debugger.Core" INSTANCE_ID="3592304145116733721" />
                                         </COMPONENT_NODE>
                                     </SPLIT_NODE>
-                                    <COMPONENT_NODE TOP_INFO="8">
-                                        <COMPONENT_INFO NAME="Decompiler" OWNER="DecompilePlugin" TITLE="Decompile: main" ACTIVE="true" GROUP="Default" INSTANCE_ID="3381048220378451132" />
-                                        <COMPONENT_INFO NAME="Bytes" OWNER="ByteViewerPlugin" TITLE="Bytes" ACTIVE="false" GROUP="Default" INSTANCE_ID="3398987873217099451" />
-                                        <COMPONENT_INFO NAME="Data Window" OWNER="DataWindowPlugin" TITLE="Defined Data" ACTIVE="false" GROUP="Default" INSTANCE_ID="3398987890722027181" />
-                                        <COMPONENT_INFO NAME="Defined Strings" OWNER="ViewStringsPlugin" TITLE="Defined Strings" ACTIVE="false" GROUP="Default" INSTANCE_ID="3398987890722027171" />
-                                        <COMPONENT_INFO NAME="Equates Table" OWNER="EquateTablePlugin" TITLE="Equates Table" ACTIVE="false" GROUP="Default" INSTANCE_ID="3398987882610243235" />
-                                        <COMPONENT_INFO NAME="External Programs" OWNER="ReferencesPlugin" TITLE="External Programs" ACTIVE="false" GROUP="Default" INSTANCE_ID="3398987882610243240" />
-                                        <COMPONENT_INFO NAME="Functions Window" OWNER="FunctionWindowPlugin" TITLE="Functions" ACTIVE="false" GROUP="Default" INSTANCE_ID="3398987888408868529" />
-                                        <COMPONENT_INFO NAME="Relocation Table" OWNER="RelocationTablePlugin" TITLE="Relocation Table" ACTIVE="false" GROUP="Default" INSTANCE_ID="3398987890722027170" />
-                                        <COMPONENT_INFO NAME="Modules" OWNER="DebuggerModulesPlugin" TITLE="Modules" ACTIVE="true" GROUP="Default" INSTANCE_ID="3398987890722027175" />
-                                        <COMPONENT_INFO NAME="Registers" OWNER="DebuggerRegistersPlugin" TITLE="Registers" ACTIVE="true" GROUP="Debugger.Core" INSTANCE_ID="3398987890722027184" />
-                                        <COMPONENT_INFO NAME="Breakpoints" OWNER="DebuggerBreakpointsPlugin" TITLE="Breakpoints" ACTIVE="true" GROUP="Default" INSTANCE_ID="3398987890722027183" />
-                                        <COMPONENT_INFO NAME="DebuggerInterpreterPlugin" OWNER="InterpreterPanelPlugin" TITLE="Interpreter" ACTIVE="false" GROUP="Default" INSTANCE_ID="3381048220378451114" />
-                                        <COMPONENT_INFO NAME="Interpreter" OWNER="InterpreterPanelPlugin" TITLE="Interpreter" ACTIVE="true" GROUP="Default" INSTANCE_ID="3398988136451618475" />
-                                    </COMPONENT_NODE>
-                                </SPLIT_NODE>
-                                <SPLIT_NODE WIDTH="1386" HEIGHT="189" DIVIDER_LOCATION="495" ORIENTATION="HORIZONTAL">
                                     <COMPONENT_NODE TOP_INFO="0">
-                                        <COMPONENT_INFO NAME="Data Type Preview" OWNER="DataTypePreviewPlugin" TITLE="Data Type Preview" ACTIVE="false" GROUP="Default" INSTANCE_ID="3398987888408868528" />
+                                        <COMPONENT_INFO NAME="Program Tree" OWNER="ProgramTreePlugin" TITLE="Program Trees" ACTIVE="false" GROUP="Default" INSTANCE_ID="3592304123427987730" />
                                     </COMPONENT_NODE>
+                                </SPLIT_NODE>
+                                <SPLIT_NODE WIDTH="1293" HEIGHT="590" DIVIDER_LOCATION="785" ORIENTATION="VERTICAL">
+                                    <SPLIT_NODE WIDTH="1386" HEIGHT="638" DIVIDER_LOCATION="705" ORIENTATION="VERTICAL">
+                                        <SPLIT_NODE WIDTH="1074" HEIGHT="659" DIVIDER_LOCATION="561" ORIENTATION="HORIZONTAL">
+                                            <SPLIT_NODE WIDTH="600" HEIGHT="659" DIVIDER_LOCATION="475" ORIENTATION="VERTICAL">
+                                                <COMPONENT_NODE TOP_INFO="0">
+                                                    <COMPONENT_INFO NAME="Listing" OWNER="DebuggerListingPlugin" TITLE="Dynamic" ACTIVE="true" GROUP="Core" INSTANCE_ID="3592304123427987740" />
+                                                </COMPONENT_NODE>
+                                                <COMPONENT_NODE TOP_INFO="0">
+                                                    <COMPONENT_INFO NAME="Listing" OWNER="CodeBrowserPlugin" TITLE="Listing: " ACTIVE="true" GROUP="Core" INSTANCE_ID="3592304123427987738" />
+                                                </COMPONENT_NODE>
+                                            </SPLIT_NODE>
+                                            <COMPONENT_NODE TOP_INFO="13">
+                                                <COMPONENT_INFO NAME="Decompiler" OWNER="DecompilePlugin" TITLE="Decompile" ACTIVE="true" GROUP="Default" INSTANCE_ID="3592304123427987731" />
+                                                <COMPONENT_INFO NAME="Bytes" OWNER="ByteViewerPlugin" TITLE="Bytes: No Program" ACTIVE="true" GROUP="Default" INSTANCE_ID="3592304123427987733" />
+                                                <COMPONENT_INFO NAME="Data Window" OWNER="DataWindowPlugin" TITLE="Defined Data" ACTIVE="false" GROUP="Default" INSTANCE_ID="3592304145116733716" />
+                                                <COMPONENT_INFO NAME="Defined Strings" OWNER="ViewStringsPlugin" TITLE="Defined Strings" ACTIVE="true" GROUP="Default" INSTANCE_ID="3592304145116733724" />
+                                                <COMPONENT_INFO NAME="Equates Table" OWNER="EquateTablePlugin" TITLE="Equates Table" ACTIVE="false" GROUP="Default" INSTANCE_ID="3592304123427987736" />
+                                                <COMPONENT_INFO NAME="External Programs" OWNER="ReferencesPlugin" TITLE="External Programs" ACTIVE="false" GROUP="Default" INSTANCE_ID="3592304123427987739" />
+                                                <COMPONENT_INFO NAME="Functions Window" OWNER="FunctionWindowPlugin" TITLE="Functions" ACTIVE="false" GROUP="Default" INSTANCE_ID="3592304123427987742" />
+                                                <COMPONENT_INFO NAME="Relocation Table" OWNER="RelocationTablePlugin" TITLE="Relocation Table" ACTIVE="false" GROUP="Default" INSTANCE_ID="3592304145116733723" />
+                                                <COMPONENT_INFO NAME="Modules" OWNER="DebuggerModulesPlugin" TITLE="Modules" ACTIVE="true" GROUP="Default" INSTANCE_ID="3592304145116733703" />
+                                                <COMPONENT_INFO NAME="Registers" OWNER="DebuggerRegistersPlugin" TITLE="Registers" ACTIVE="true" GROUP="Debugger.Core" INSTANCE_ID="3592304145116733725" />
+                                                <COMPONENT_INFO NAME="Script Manager" OWNER="GhidraScriptMgrPlugin" TITLE="Script Manager" ACTIVE="false" GROUP="Script Group" INSTANCE_ID="3592304123427987727" />
+                                                <COMPONENT_INFO NAME="Listing" OWNER="DebuggerListingPlugin" TITLE="[Dynamic]" ACTIVE="false" GROUP="Core" INSTANCE_ID="3562758574866164514" />
+                                                <COMPONENT_INFO NAME="Memory" OWNER="DebuggerMemoryBytesPlugin" TITLE="Memory" ACTIVE="true" GROUP="disconnected" INSTANCE_ID="3592304123427987713" />
+                                                <COMPONENT_INFO NAME="Breakpoints" OWNER="DebuggerBreakpointsPlugin" TITLE="Breakpoints" ACTIVE="true" GROUP="Default" INSTANCE_ID="3592304145116733722" />
+                                            </COMPONENT_NODE>
+                                        </SPLIT_NODE>
+                                        <SPLIT_NODE WIDTH="1386" HEIGHT="189" DIVIDER_LOCATION="495" ORIENTATION="HORIZONTAL">
+                                            <COMPONENT_NODE TOP_INFO="0">
+                                                <COMPONENT_INFO NAME="Data Type Preview" OWNER="DataTypePreviewPlugin" TITLE="Data Type Preview" ACTIVE="false" GROUP="Default" INSTANCE_ID="3592304144451936539" />
+                                            </COMPONENT_NODE>
+                                            <COMPONENT_NODE TOP_INFO="0">
+                                                <COMPONENT_INFO NAME="Virtual Disassembler - Current Instruction" OWNER="DisassembledViewPlugin" TITLE="Disassembled View" ACTIVE="false" GROUP="Default" INSTANCE_ID="3592304123427987735" />
+                                            </COMPONENT_NODE>
+                                        </SPLIT_NODE>
+                                    </SPLIT_NODE>
                                     <COMPONENT_NODE TOP_INFO="0">
-                                        <COMPONENT_INFO NAME="Virtual Disassembler - Current Instruction" OWNER="DisassembledViewPlugin" TITLE="Disassembled View" ACTIVE="false" GROUP="Default" INSTANCE_ID="3398987882610243234" />
+                                        <COMPONENT_INFO NAME="Bookmarks" OWNER="BookmarkPlugin" TITLE="Bookmarks" ACTIVE="false" GROUP="Core.Bookmarks" INSTANCE_ID="3592304123427987729" />
                                     </COMPONENT_NODE>
                                 </SPLIT_NODE>
                             </SPLIT_NODE>
                             <COMPONENT_NODE TOP_INFO="0">
-                                <COMPONENT_INFO NAME="Bookmarks" OWNER="BookmarkPlugin" TITLE="Bookmarks" ACTIVE="false" GROUP="Core.Bookmarks" INSTANCE_ID="3398987873217099450" />
+                                <COMPONENT_INFO NAME="Function Call Trees" OWNER="CallTreePlugin" TITLE="Function Call Trees" ACTIVE="false" GROUP="Default" INSTANCE_ID="3592304123427987726" />
+                            </COMPONENT_NODE>
+                        </SPLIT_NODE>
+                        <SPLIT_NODE WIDTH="1438" HEIGHT="265" DIVIDER_LOCATION="347" ORIENTATION="HORIZONTAL">
+                            <COMPONENT_NODE TOP_INFO="1">
+                                <COMPONENT_INFO NAME="Regions" OWNER="DebuggerRegionsPlugin" TITLE="Regions" ACTIVE="true" GROUP="Default" INSTANCE_ID="3592304145116733719" />
+                                <COMPONENT_INFO NAME="Stack" OWNER="DebuggerStackPlugin" TITLE="Stack" ACTIVE="true" GROUP="Default" INSTANCE_ID="3592304144451936540" />
+                                <COMPONENT_INFO NAME="Console" OWNER="ConsolePlugin" TITLE="Console" ACTIVE="true" GROUP="Default" INSTANCE_ID="3592304123427987732" />
+                                <COMPONENT_INFO NAME="Watches" OWNER="DebuggerWatchesPlugin" TITLE="Watches" ACTIVE="true" GROUP="Default" INSTANCE_ID="3592304123427987723" />
+                                <COMPONENT_INFO NAME="Symbol Tree" OWNER="SymbolTreePlugin" TITLE="Symbol Tree" ACTIVE="true" GROUP="Default" INSTANCE_ID="3592304123427987725" />
+                                <COMPONENT_INFO NAME="DataTypes Provider" OWNER="DataTypeManagerPlugin" TITLE="Data Type Manager" ACTIVE="false" GROUP="Default" INSTANCE_ID="3592304145116733699" />
+                            </COMPONENT_NODE>
+                            <COMPONENT_NODE TOP_INFO="4">
+                                <COMPONENT_INFO NAME="Time" OWNER="DebuggerTimePlugin" TITLE="Time" ACTIVE="true" GROUP="Default" INSTANCE_ID="3592304145116733713" />
+                                <COMPONENT_INFO NAME="Pcode Stepper" OWNER="DebuggerPcodeStepperPlugin" TITLE="Pcode Stepper" ACTIVE="false" GROUP="Default" INSTANCE_ID="3562427531381347481" />
+                                <COMPONENT_INFO NAME="Static Mappings" OWNER="DebuggerStaticMappingPlugin" TITLE="Static Mappings" ACTIVE="true" GROUP="Default" INSTANCE_ID="3592304145116733720" />
+                                <COMPONENT_INFO NAME="Instruction Info" OWNER="ShowInstructionInfoPlugin" TITLE="Instruction Info" ACTIVE="false" GROUP="Default" INSTANCE_ID="3565288898725030387" />
+                                <COMPONENT_INFO NAME="Threads" OWNER="DebuggerThreadsPlugin" TITLE="Threads" ACTIVE="true" GROUP="Default" INSTANCE_ID="3592304145116733701" />
+                                <COMPONENT_INFO NAME="Terminal" OWNER="TerminalPlugin" TITLE="Terminal" ACTIVE="false" GROUP="Default" INSTANCE_ID="3592298490728135873" />
                             </COMPONENT_NODE>
                         </SPLIT_NODE>
                     </SPLIT_NODE>
                     <COMPONENT_NODE TOP_INFO="0">
-                        <COMPONENT_INFO NAME="Function Call Trees" OWNER="CallTreePlugin" TITLE="Function Call Trees" ACTIVE="false" GROUP="Default" INSTANCE_ID="3398987873217099452" />
-                    </COMPONENT_NODE>
-                </SPLIT_NODE>
-                <SPLIT_NODE WIDTH="1918" HEIGHT="211" DIVIDER_LOCATION="348" ORIENTATION="HORIZONTAL">
-                    <COMPONENT_NODE TOP_INFO="1">
-                        <COMPONENT_INFO NAME="Regions" OWNER="DebuggerRegionsPlugin" TITLE="Regions" ACTIVE="true" GROUP="Default" INSTANCE_ID="3398987890722027174" />
-                        <COMPONENT_INFO NAME="Stack" OWNER="DebuggerStackPlugin" TITLE="Stack" ACTIVE="true" GROUP="Default" INSTANCE_ID="3398987888408868533" />
-                        <COMPONENT_INFO NAME="Console" OWNER="ConsolePlugin" TITLE="Console" ACTIVE="true" GROUP="Default" INSTANCE_ID="3398987873217099455" />
-                        <COMPONENT_INFO NAME="Watches" OWNER="DebuggerWatchesPlugin" TITLE="Watches" ACTIVE="true" GROUP="Default" INSTANCE_ID="3398987890722027179" />
-                    </COMPONENT_NODE>
-                    <COMPONENT_NODE TOP_INFO="0">
-                        <COMPONENT_INFO NAME="Threads" OWNER="DebuggerThreadsPlugin" TITLE="Threads" ACTIVE="true" GROUP="Default" INSTANCE_ID="3398987890722027168" />
-                        <COMPONENT_INFO NAME="Time" OWNER="DebuggerTimePlugin" TITLE="Time" ACTIVE="true" GROUP="Default" INSTANCE_ID="3398987890722027169" />
-                        <COMPONENT_INFO NAME="Pcode Stepper" OWNER="DebuggerPcodeStepperPlugin" TITLE="Pcode Stepper" ACTIVE="false" GROUP="Default" INSTANCE_ID="3381240965691561509" />
+                        <COMPONENT_INFO NAME="Diff Location Details" OWNER="ProgramDiffPlugin" TITLE="Diff Details" ACTIVE="false" GROUP="Default" INSTANCE_ID="3446095744544693813" />
                     </COMPONENT_NODE>
                 </SPLIT_NODE>
-            </SPLIT_NODE>
-            <WINDOW_NODE X_POS="426" Y_POS="178" WIDTH="1033" HEIGHT="689">
                 <COMPONENT_NODE TOP_INFO="0">
-                    <COMPONENT_INFO NAME="Script Manager" OWNER="GhidraScriptMgrPlugin" TITLE="Script Manager" ACTIVE="false" GROUP="Script Group" INSTANCE_ID="3398987882610243241" />
+                    <COMPONENT_INFO NAME="Diff Apply Settings" OWNER="ProgramDiffPlugin" TITLE="Diff Apply Settings" ACTIVE="false" GROUP="Default" INSTANCE_ID="3446095765262458400" />
                 </COMPONENT_NODE>
-            </WINDOW_NODE>
+            </SPLIT_NODE>
             <WINDOW_NODE X_POS="423" Y_POS="144" WIDTH="927" HEIGHT="370">
                 <COMPONENT_NODE TOP_INFO="0">
-                    <COMPONENT_INFO NAME="Memory Map" OWNER="MemoryMapPlugin" TITLE="Memory Map" ACTIVE="false" GROUP="Default" INSTANCE_ID="3398987882610243238" />
+                    <COMPONENT_INFO NAME="Memory Map" OWNER="MemoryMapPlugin" TITLE="Memory Map" ACTIVE="false" GROUP="Default" INSTANCE_ID="3592304123427987714" />
                 </COMPONENT_NODE>
             </WINDOW_NODE>
-            <WINDOW_NODE X_POS="383" Y_POS="7" WIDTH="1020" HEIGHT="1038">
+            <WINDOW_NODE X_POS="2042" Y_POS="4332" WIDTH="1020" HEIGHT="1038">
                 <COMPONENT_NODE TOP_INFO="0">
-                    <COMPONENT_INFO NAME="Function Graph" OWNER="FunctionGraphPlugin" TITLE="Function Graph" ACTIVE="false" GROUP="Function Graph" INSTANCE_ID="3398987890722027182" />
+                    <COMPONENT_INFO NAME="Function Graph" OWNER="FunctionGraphPlugin" TITLE="Function Graph" ACTIVE="false" GROUP="Function Graph" INSTANCE_ID="3592304145116733726" />
                 </COMPONENT_NODE>
             </WINDOW_NODE>
             <WINDOW_NODE X_POS="550" Y_POS="206" WIDTH="655" HEIGHT="509">
                 <COMPONENT_NODE TOP_INFO="0">
-                    <COMPONENT_INFO NAME="Register Manager" OWNER="RegisterPlugin" TITLE="Register Manager" ACTIVE="false" GROUP="Default" INSTANCE_ID="3398987888408868530" />
+                    <COMPONENT_INFO NAME="Register Manager" OWNER="RegisterPlugin" TITLE="Register Manager" ACTIVE="false" GROUP="Default" INSTANCE_ID="3592304123427987741" />
                 </COMPONENT_NODE>
             </WINDOW_NODE>
             <WINDOW_NODE X_POS="287" Y_POS="186" WIDTH="1424" HEIGHT="666">
                 <SPLIT_NODE WIDTH="1408" HEIGHT="559" DIVIDER_LOCATION="573" ORIENTATION="HORIZONTAL">
                     <COMPONENT_NODE TOP_INFO="0">
-                        <COMPONENT_INFO NAME="Symbol Table" OWNER="SymbolTablePlugin" TITLE="Symbol Table" ACTIVE="false" GROUP="symbolTable" INSTANCE_ID="3398987890722027172" />
+                        <COMPONENT_INFO NAME="Symbol Table" OWNER="SymbolTablePlugin" TITLE="Symbol Table" ACTIVE="false" GROUP="symbolTable" INSTANCE_ID="3592304145116733717" />
                     </COMPONENT_NODE>
                     <COMPONENT_NODE TOP_INFO="0">
-                        <COMPONENT_INFO NAME="Symbol References" OWNER="SymbolTablePlugin" TITLE="Symbol References" ACTIVE="false" GROUP="symbolTable" INSTANCE_ID="3398987890722027173" />
+                        <COMPONENT_INFO NAME="Symbol References" OWNER="SymbolTablePlugin" TITLE="Symbol References" ACTIVE="false" GROUP="symbolTable" INSTANCE_ID="3592304145116733718" />
                     </COMPONENT_NODE>
                 </SPLIT_NODE>
             </WINDOW_NODE>
             <WINDOW_NODE X_POS="-1" Y_POS="-1" WIDTH="0" HEIGHT="0">
                 <COMPONENT_NODE TOP_INFO="0">
-                    <COMPONENT_INFO NAME="Checksum Generator" OWNER="ComputeChecksumsPlugin" TITLE="Checksum Generator" ACTIVE="false" GROUP="Default" INSTANCE_ID="3398987873217099453" />
+                    <COMPONENT_INFO NAME="Checksum Generator" OWNER="ComputeChecksumsPlugin" TITLE="Checksum Generator" ACTIVE="false" GROUP="Default" INSTANCE_ID="3592304123427987737" />
                 </COMPONENT_NODE>
             </WINDOW_NODE>
             <WINDOW_NODE X_POS="-1" Y_POS="-1" WIDTH="0" HEIGHT="0">
                 <COMPONENT_NODE TOP_INFO="0">
-                    <COMPONENT_INFO NAME="Function Tags" OWNER="FunctionTagPlugin" TITLE="Function Tags" ACTIVE="false" GROUP="Default" INSTANCE_ID="3398987882610243237" />
+                    <COMPONENT_INFO NAME="Function Tags" OWNER="FunctionTagPlugin" TITLE="Function Tags" ACTIVE="false" GROUP="Default" INSTANCE_ID="3592304145116733700" />
                 </COMPONENT_NODE>
             </WINDOW_NODE>
             <WINDOW_NODE X_POS="-1" Y_POS="-1" WIDTH="0" HEIGHT="0">
                 <COMPONENT_NODE TOP_INFO="0">
-                    <COMPONENT_INFO NAME="Comment Window" OWNER="CommentWindowPlugin" TITLE="Comments" ACTIVE="false" GROUP="Default" INSTANCE_ID="3398987890722027180" />
+                    <COMPONENT_INFO NAME="Comment Window" OWNER="CommentWindowPlugin" TITLE="Comments" ACTIVE="false" GROUP="Default" INSTANCE_ID="3592304145116733715" />
                 </COMPONENT_NODE>
             </WINDOW_NODE>
-            <WINDOW_NODE X_POS="-1" Y_POS="-1" WIDTH="0" HEIGHT="0">
+            <WINDOW_NODE X_POS="1792" Y_POS="1234" WIDTH="559" HEIGHT="480">
                 <COMPONENT_NODE TOP_INFO="0">
-                    <COMPONENT_INFO NAME="Python" OWNER="InterpreterPanelPlugin" TITLE="Python" ACTIVE="false" GROUP="Default" INSTANCE_ID="3398987888408868531" />
+                    <COMPONENT_INFO NAME="Python" OWNER="InterpreterPanelPlugin" TITLE="Python" ACTIVE="false" GROUP="Default" INSTANCE_ID="3592304145116733702" />
                 </COMPONENT_NODE>
             </WINDOW_NODE>
             <WINDOW_NODE X_POS="0" Y_POS="0" WIDTH="0" HEIGHT="0">
                 <COMPONENT_NODE TOP_INFO="0">
-                    <COMPONENT_INFO NAME="Function Call Graph" OWNER="FunctionCallGraphPlugin" TITLE="Function Call Graph" ACTIVE="false" GROUP="Function Call Graph" INSTANCE_ID="3398987882610243245" />
+                    <COMPONENT_INFO NAME="Function Call Graph" OWNER="FunctionCallGraphPlugin" TITLE="Function Call Graph" ACTIVE="false" GROUP="Function Call Graph" INSTANCE_ID="3592304144451936541" />
                 </COMPONENT_NODE>
             </WINDOW_NODE>
             <WINDOW_NODE X_POS="658" Y_POS="1489" WIDTH="470" HEIGHT="540">
@@ -155,315 +179,118 @@
             </WINDOW_NODE>
             <WINDOW_NODE X_POS="0" Y_POS="0" WIDTH="0" HEIGHT="0">
                 <COMPONENT_NODE TOP_INFO="0">
-                    <COMPONENT_INFO NAME="BundleManager" OWNER="GhidraScriptMgrPlugin" TITLE="Bundle Manager" ACTIVE="false" GROUP="Default" INSTANCE_ID="3398987882610243242" />
-                </COMPONENT_NODE>
-            </WINDOW_NODE>
-            <WINDOW_NODE X_POS="2105" Y_POS="966" WIDTH="1122" HEIGHT="546">
-                <COMPONENT_NODE TOP_INFO="0">
-                    <COMPONENT_INFO NAME="Objects" OWNER="DebuggerTimelinePlugin" TITLE="Objects" ACTIVE="false" GROUP="Default" INSTANCE_ID="3366353018521038486" />
+                    <COMPONENT_INFO NAME="BundleManager" OWNER="GhidraScriptMgrPlugin" TITLE="Bundle Manager" ACTIVE="false" GROUP="Default" INSTANCE_ID="3592304123427987728" />
                 </COMPONENT_NODE>
             </WINDOW_NODE>
             <WINDOW_NODE X_POS="0" Y_POS="0" WIDTH="0" HEIGHT="0">
                 <COMPONENT_NODE TOP_INFO="0">
-                    <COMPONENT_INFO NAME="Static Mappings" OWNER="DebuggerStaticMappingPlugin" TITLE="Static Mappings" ACTIVE="false" GROUP="Default" INSTANCE_ID="3398987890722027176" />
-                </COMPONENT_NODE>
-            </WINDOW_NODE>
-            <WINDOW_NODE X_POS="1429" Y_POS="806" WIDTH="982" HEIGHT="580">
-                <COMPONENT_NODE TOP_INFO="0">
-                    <COMPONENT_INFO NAME="Memview" OWNER="DebuggerMemviewPlugin" TITLE="Memview" ACTIVE="false" GROUP="Default" INSTANCE_ID="3398987888408868543" />
+                    <COMPONENT_INFO NAME="Memview" OWNER="DebuggerMemviewPlugin" TITLE="Memview" ACTIVE="false" GROUP="Default" INSTANCE_ID="3592304145116733714" />
                 </COMPONENT_NODE>
             </WINDOW_NODE>
         </ROOT_NODE>
         <PREFERENCES>
-            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.debug.gui.memview.MemviewMapModel:Name:Start Address:End Address:Start Time:End Time:">
-                <XML NAME="COLUMN_DATA">
-                    <Table_State>
-                        <COLUMN NAME="Name" WIDTH="90" VISIBLE="true" />
-                        <COLUMN NAME="Start Address" WIDTH="90" VISIBLE="true" />
-                        <COLUMN NAME="End Address" WIDTH="90" VISIBLE="true" />
-                        <COLUMN NAME="Start Time" WIDTH="90" VISIBLE="true" />
-                        <COLUMN NAME="End Time" WIDTH="90" VISIBLE="true" />
-                        <TABLE_SORT_STATE>
-                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="1" SORT_DIRECTION="ascending" SORT_ORDER="1" />
-                        </TABLE_SORT_STATE>
-                    </Table_State>
-                </XML>
-            </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel:Name:Created:Destroyed:State:Comment:">
-                <XML NAME="COLUMN_DATA">
-                    <Table_State>
-                        <COLUMN NAME="Name" WIDTH="152" VISIBLE="true" />
-                        <COLUMN NAME="Created" WIDTH="152" VISIBLE="true" />
-                        <COLUMN NAME="Destroyed" WIDTH="152" VISIBLE="true" />
-                        <COLUMN NAME="State" WIDTH="152" VISIBLE="true" />
-                        <COLUMN NAME="Comment" WIDTH="151" VISIBLE="true" />
-                        <TABLE_SORT_STATE>
-                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="0" SORT_DIRECTION="ascending" SORT_ORDER="1" />
-                        </TABLE_SORT_STATE>
-                    </Table_State>
-                </XML>
-            </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel:Module Name:Base Address:Lifespan:">
-                <XML NAME="COLUMN_DATA">
-                    <Table_State>
-                        <COLUMN NAME="Module Name" WIDTH="222" VISIBLE="true" />
-                        <COLUMN NAME="Base Address" WIDTH="144" VISIBLE="true" />
-                        <COLUMN NAME="Lifespan" WIDTH="143" VISIBLE="true" />
-                        <TABLE_SORT_STATE>
-                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="0" SORT_DIRECTION="ascending" SORT_ORDER="1" />
-                        </TABLE_SORT_STATE>
-                    </Table_State>
-                </XML>
-            </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.symtable.SymbolReferenceModel:From Location:Label:Subroutine:Access:From Preview:">
-                <XML NAME="COLUMN_DATA">
-                    <Table_State>
-                        <COLUMN NAME="ghidra.util.table.field.ReferenceFromAddressTableColumn" WIDTH="119" VISIBLE="true" />
-                        <COLUMN NAME="ghidra.util.table.field.ReferenceFromLabelTableColumn" WIDTH="119" VISIBLE="true" />
-                        <COLUMN NAME="ghidra.app.plugin.core.symtable.SymbolReferenceModel$SubroutineTableColumn" WIDTH="118" VISIBLE="true" />
-                        <COLUMN NAME="ghidra.app.plugin.core.symtable.SymbolReferenceModel$AccessTableColumn" WIDTH="86" VISIBLE="true" />
-                        <COLUMN NAME="ghidra.util.table.field.ReferenceFromPreviewTableColumn" WIDTH="151" VISIBLE="true" />
-                        <COLUMN NAME="ghidra.util.table.field.ReferenceFromFunctionTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.ReferenceTypeTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.ReferenceFromBytesTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.ReferenceToPreviewTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.ReferenceToBytesTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.ReferenceToAddressTableColumn" WIDTH="75" VISIBLE="false" />
-                        <TABLE_SORT_STATE>
-                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="0" SORT_DIRECTION="ascending" SORT_ORDER="1" />
-                        </TABLE_SORT_STATE>
-                    </Table_State>
-                </XML>
-            </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.symtable.SymbolTableModel:Name:Location:Symbol Type:Data Type:Namespace:Source:Reference Count:Offcut Ref Count:">
-                <XML NAME="COLUMN_DATA">
-                    <Table_State>
-                        <COLUMN NAME="ghidra.app.plugin.core.symtable.SymbolTableModel$NameTableColumn" WIDTH="260" VISIBLE="true" />
-                        <COLUMN NAME="ghidra.app.plugin.core.symtable.SymbolTableModel$LocationTableColumn" WIDTH="168" VISIBLE="true" />
-                        <COLUMN NAME="ghidra.util.table.field.SymbolTypeTableColumn" WIDTH="166" VISIBLE="true" />
-                        <COLUMN NAME="ghidra.app.plugin.core.symtable.SymbolTableModel$DataTypeTableColumn" WIDTH="174" VISIBLE="true" />
-                        <COLUMN NAME="ghidra.app.plugin.core.symtable.SymbolTableModel$NamespaceTableColumn" WIDTH="152" VISIBLE="true" />
-                        <COLUMN NAME="ghidra.app.plugin.core.symtable.SymbolTableModel$SourceTableColumn" WIDTH="170" VISIBLE="true" />
-                        <COLUMN NAME="ghidra.app.plugin.core.symtable.SymbolTableModel$ReferenceCountTableColumn" WIDTH="148" VISIBLE="true" />
-                        <COLUMN NAME="ghidra.app.plugin.core.symtable.SymbolTableModel$OffuctReferenceCountTableColumn" WIDTH="147" VISIBLE="true" />
-                        <COLUMN NAME="ghidra.app.plugin.core.symtable.SymbolTableModel$PinnedTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.app.plugin.core.symtable.SymbolTableModel$UserTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.OffcutReferenceCountToAddressTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.MemorySectionProgramLocationBasedTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.ReferenceCountToAddressTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.AddressTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.FunctionParameterCountTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.FunctionNameTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.NamespaceTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.SourceTypeTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.MemoryTypeProgramLocationBasedTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.LabelTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.ByteCountProgramLocationBasedTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.BytesTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.PreviewTableColumn" WIDTH="75" VISIBLE="false" />
-                        <TABLE_SORT_STATE>
-                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="3" SORT_DIRECTION="descending" SORT_ORDER="1" />
-                        </TABLE_SORT_STATE>
-                    </Table_State>
-                </XML>
-            </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.equate.EquateTableModel:Name:Value:# Refs:">
-                <XML NAME="COLUMN_DATA">
-                    <Table_State>
-                        <COLUMN NAME="Name" WIDTH="88" VISIBLE="true" />
-                        <COLUMN NAME="Value" WIDTH="88" VISIBLE="true" />
-                        <COLUMN NAME="# Refs" WIDTH="88" VISIBLE="true" />
-                        <TABLE_SORT_STATE>
-                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="0" SORT_DIRECTION="ascending" SORT_ORDER="1" />
-                        </TABLE_SORT_STATE>
-                    </Table_State>
-                </XML>
-            </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.debug.gui.modules.DebuggerModulesProvider$ModuleTableModel:Base Address:Max Address:Name:Module Name:Lifespan:Length:">
+            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.debug.gui.console.DebuggerConsoleProvider$LogTableModel:Icon:Message:Actions:Time:">
                 <XML NAME="COLUMN_DATA">
                     <Table_State>
-                        <COLUMN NAME="Base Address" WIDTH="73" VISIBLE="true" />
-                        <COLUMN NAME="Max Address" WIDTH="73" VISIBLE="true" />
-                        <COLUMN NAME="Name" WIDTH="73" VISIBLE="true" />
-                        <COLUMN NAME="Module Name" WIDTH="73" VISIBLE="true" />
-                        <COLUMN NAME="Lifespan" WIDTH="72" VISIBLE="true" />
-                        <COLUMN NAME="Length" WIDTH="72" VISIBLE="true" />
+                        <COLUMN NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel$EnumeratedDynamicTableColumn.Icon" WIDTH="24" VISIBLE="true" />
+                        <COLUMN NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel$EnumeratedDynamicTableColumn.Message" WIDTH="190" VISIBLE="true" />
+                        <COLUMN NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel$EnumeratedDynamicTableColumn.Actions" WIDTH="89" VISIBLE="true" />
+                        <COLUMN NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel$EnumeratedDynamicTableColumn.Time" WIDTH="55" VISIBLE="true" />
                         <TABLE_SORT_STATE>
-                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="0" SORT_DIRECTION="ascending" SORT_ORDER="1" />
+                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="2" SORT_DIRECTION="descending" SORT_ORDER="1" />
+                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="3" SORT_DIRECTION="descending" SORT_ORDER="2" />
                         </TABLE_SORT_STATE>
                     </Table_State>
                 </XML>
             </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="docking.widgets.table.GTableFilterPanel$SortedTableModelWrapper:In::Name:Description:Category:">
+            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.debug.gui.breakpoint.DebuggerBreakpointsProvider$BreakpointLocationTableModel:State:Name:Address:Trace:Threads:Comment:">
                 <XML NAME="COLUMN_DATA">
                     <Table_State>
-                        <COLUMN NAME="In" WIDTH="30" VISIBLE="true" />
-                        <COLUMN NAME="" WIDTH="24" VISIBLE="true" />
-                        <COLUMN NAME="Name" WIDTH="209" VISIBLE="true" />
-                        <COLUMN NAME="Description" WIDTH="277" VISIBLE="true" />
-                        <COLUMN NAME="Category" WIDTH="141" VISIBLE="true" />
+                        <COLUMN NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel$EnumeratedDynamicTableColumn.State" WIDTH="24" VISIBLE="true" />
+                        <COLUMN NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel$EnumeratedDynamicTableColumn.Name" WIDTH="104" VISIBLE="true" />
+                        <COLUMN NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel$EnumeratedDynamicTableColumn.Address" WIDTH="103" VISIBLE="true" />
+                        <COLUMN NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel$EnumeratedDynamicTableColumn.Trace" WIDTH="104" VISIBLE="true" />
+                        <COLUMN NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel$EnumeratedDynamicTableColumn.Threads" WIDTH="500" VISIBLE="false" />
+                        <COLUMN NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel$EnumeratedDynamicTableColumn.Comment" WIDTH="103" VISIBLE="true" />
+                        <COLUMN NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel$EnumeratedDynamicTableColumn.Sleigh" WIDTH="30" VISIBLE="true" />
                         <TABLE_SORT_STATE>
                             <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="2" SORT_DIRECTION="ascending" SORT_ORDER="1" />
+                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="1" SORT_DIRECTION="ascending" SORT_ORDER="2" />
                         </TABLE_SORT_STATE>
                     </Table_State>
                 </XML>
             </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.register.RegisterValuesPanel$RegisterValuesTableModel:Start Address:End Address:Value:">
-                <XML NAME="COLUMN_DATA">
-                    <Table_State>
-                        <COLUMN NAME="Start Address" WIDTH="150" VISIBLE="true" />
-                        <COLUMN NAME="End Address" WIDTH="150" VISIBLE="true" />
-                        <COLUMN NAME="Value" WIDTH="150" VISIBLE="true" />
-                        <TABLE_SORT_STATE>
-                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="0" SORT_DIRECTION="ascending" SORT_ORDER="1" />
-                        </TABLE_SORT_STATE>
-                    </Table_State>
-                </XML>
-            </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel:Name:Lifespan:Start:End:Length:Read:Write:Execute:Volatile:">
-                <XML NAME="COLUMN_DATA">
-                    <Table_State>
-                        <COLUMN NAME="Name" WIDTH="122" VISIBLE="true" />
-                        <COLUMN NAME="Lifespan" WIDTH="68" VISIBLE="true" />
-                        <COLUMN NAME="Start" WIDTH="70" VISIBLE="true" />
-                        <COLUMN NAME="End" WIDTH="87" VISIBLE="true" />
-                        <COLUMN NAME="Length" WIDTH="68" VISIBLE="true" />
-                        <COLUMN NAME="Read" WIDTH="61" VISIBLE="true" />
-                        <COLUMN NAME="Write" WIDTH="67" VISIBLE="true" />
-                        <COLUMN NAME="Execute" WIDTH="59" VISIBLE="true" />
-                        <COLUMN NAME="Volatile" WIDTH="58" VISIBLE="true" />
-                        <TABLE_SORT_STATE>
-                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="0" SORT_DIRECTION="ascending" SORT_ORDER="1" />
-                        </TABLE_SORT_STATE>
-                    </Table_State>
-                </XML>
-            </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="GRAPH_DISPLAY_SERVICE" />
-            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.debug.gui.memory.DebuggerRegionsProvider$RegionTableModel:Name:Lifespan:Start:End:Length:Read:Write:Execute:Volatile:">
-                <XML NAME="COLUMN_DATA">
-                    <Table_State>
-                        <COLUMN NAME="Name" WIDTH="104" VISIBLE="true" />
-                        <COLUMN NAME="Lifespan" WIDTH="104" VISIBLE="true" />
-                        <COLUMN NAME="Start" WIDTH="105" VISIBLE="true" />
-                        <COLUMN NAME="End" WIDTH="104" VISIBLE="true" />
-                        <COLUMN NAME="Length" WIDTH="105" VISIBLE="true" />
-                        <COLUMN NAME="Read" WIDTH="31" VISIBLE="true" />
-                        <COLUMN NAME="Write" WIDTH="30" VISIBLE="true" />
-                        <COLUMN NAME="Execute" WIDTH="31" VISIBLE="true" />
-                        <COLUMN NAME="Volatile" WIDTH="31" VISIBLE="true" />
-                        <TABLE_SORT_STATE>
-                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="0" SORT_DIRECTION="ascending" SORT_ORDER="1" />
-                        </TABLE_SORT_STATE>
-                    </Table_State>
-                </XML>
-            </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel:Dynamic Address:Static Program:Static Address:Length:">
+            <PREFERENCE_STATE NAME="docking.widgets.filechooser.DirectoryTableModel:Filename:Size:Modified:">
                 <XML NAME="COLUMN_DATA">
                     <Table_State>
-                        <COLUMN NAME="Dynamic Address" WIDTH="115" VISIBLE="true" />
-                        <COLUMN NAME="Static Program" WIDTH="114" VISIBLE="true" />
-                        <COLUMN NAME="Static Address" WIDTH="115" VISIBLE="true" />
-                        <COLUMN NAME="Length" WIDTH="114" VISIBLE="true" />
+                        <COLUMN NAME="Filename" WIDTH="230" VISIBLE="true" />
+                        <COLUMN NAME="Size" WIDTH="231" VISIBLE="true" />
+                        <COLUMN NAME="Modified" WIDTH="230" VISIBLE="true" />
                         <TABLE_SORT_STATE>
                             <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="0" SORT_DIRECTION="ascending" SORT_ORDER="1" />
                         </TABLE_SORT_STATE>
                     </Table_State>
                 </XML>
             </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.debug.gui.breakpoint.BreakpointTableModel:Enabled:Address:Kind:Threads:">
+            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.debug.gui.modules.DebuggerModulesPanel$ModuleTableModel:Path:Base:Max:Name:Mapping:">
                 <XML NAME="COLUMN_DATA">
                     <Table_State>
-                        <COLUMN NAME="Enabled" WIDTH="21" VISIBLE="true" />
-                        <COLUMN NAME="Address" WIDTH="87" VISIBLE="true" />
-                        <COLUMN NAME="Kind" WIDTH="205" VISIBLE="true" />
-                        <COLUMN NAME="Threads" WIDTH="205" VISIBLE="true" />
+                        <COLUMN NAME="ghidra.app.plugin.core.debug.gui.modules.DebuggerModulesPanel$ModulePathColumn.Path" WIDTH="500" VISIBLE="false" />
+                        <COLUMN NAME="ghidra.app.plugin.core.debug.gui.modules.DebuggerModulesPanel$ModuleBaseColumn.Base" WIDTH="94" VISIBLE="true" />
+                        <COLUMN NAME="ghidra.app.plugin.core.debug.gui.modules.DebuggerModulesPanel$ModuleMaxColumn.Max" WIDTH="94" VISIBLE="true" />
+                        <COLUMN NAME="ghidra.app.plugin.core.debug.gui.modules.DebuggerModulesPanel$ModuleNameColumn.Name" WIDTH="93" VISIBLE="true" />
+                        <COLUMN NAME="ghidra.app.plugin.core.debug.gui.modules.DebuggerModulesPanel$ModuleMappingColumn.Mapping" WIDTH="94" VISIBLE="true" />
+                        <COLUMN NAME="ghidra.app.plugin.core.debug.gui.modules.DebuggerModulesPanel$ModuleLengthColumn.Length" WIDTH="93" VISIBLE="true" />
                         <TABLE_SORT_STATE>
                             <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="1" SORT_DIRECTION="ascending" SORT_ORDER="1" />
                         </TABLE_SORT_STATE>
                     </Table_State>
                 </XML>
             </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel:Start Address:End Address:Section Name:Module Name:Length:">
+            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.debug.gui.thread.DebuggerThreadsPanel$ThreadTableModel:Path:Name:PC:Function:Module:">
                 <XML NAME="COLUMN_DATA">
                     <Table_State>
-                        <COLUMN NAME="Start Address" WIDTH="102" VISIBLE="true" />
-                        <COLUMN NAME="End Address" WIDTH="102" VISIBLE="true" />
-                        <COLUMN NAME="Section Name" WIDTH="102" VISIBLE="true" />
-                        <COLUMN NAME="Module Name" WIDTH="102" VISIBLE="true" />
-                        <COLUMN NAME="Length" WIDTH="101" VISIBLE="true" />
-                        <TABLE_SORT_STATE>
-                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="0" SORT_DIRECTION="ascending" SORT_ORDER="1" />
-                        </TABLE_SORT_STATE>
-                    </Table_State>
-                </XML>
-            </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.debug.gui.breakpoint.DebuggerBreakpointsProvider$BreakpointTableModel:Enabled:Address:Length:Kinds:">
-                <XML NAME="COLUMN_DATA">
-                    <Table_State>
-                        <COLUMN NAME="Enabled" WIDTH="41" VISIBLE="true" />
-                        <COLUMN NAME="Address" WIDTH="161" VISIBLE="true" />
-                        <COLUMN NAME="Length" WIDTH="72" VISIBLE="true" />
-                        <COLUMN NAME="Kinds" WIDTH="161" VISIBLE="true" />
+                        <COLUMN NAME="ghidra.app.plugin.core.debug.gui.thread.DebuggerThreadsPanel$ThreadPathColumn.Path" WIDTH="500" VISIBLE="false" />
+                        <COLUMN NAME="ghidra.app.plugin.core.debug.gui.thread.DebuggerThreadsPanel$ThreadNameColumn.Name" WIDTH="187" VISIBLE="true" />
+                        <COLUMN NAME="ghidra.app.plugin.core.debug.gui.thread.DebuggerThreadsPanel$ThreadPcColumn.PC" WIDTH="187" VISIBLE="true" />
+                        <COLUMN NAME="ghidra.app.plugin.core.debug.gui.thread.DebuggerThreadsPanel$ThreadFunctionColumn.Function" WIDTH="187" VISIBLE="true" />
+                        <COLUMN NAME="ghidra.app.plugin.core.debug.gui.thread.DebuggerThreadsPanel$ThreadModuleColumn.Module" WIDTH="500" VISIBLE="false" />
+                        <COLUMN NAME="ghidra.app.plugin.core.debug.gui.thread.DebuggerThreadsPanel$ThreadSpColumn.SP" WIDTH="500" VISIBLE="false" />
+                        <COLUMN NAME="ghidra.app.plugin.core.debug.gui.thread.DebuggerThreadsPanel$ThreadStateColumn.State" WIDTH="187" VISIBLE="true" />
+                        <COLUMN NAME="ghidra.app.plugin.core.debug.gui.thread.DebuggerThreadsPanel$ThreadCommentColumn.Comment" WIDTH="500" VISIBLE="false" />
+                        <COLUMN NAME="ghidra.app.plugin.core.debug.gui.thread.DebuggerThreadsPanel$ThreadPlotColumn.Plot" WIDTH="186" VISIBLE="true" />
                         <TABLE_SORT_STATE>
                             <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="1" SORT_DIRECTION="ascending" SORT_ORDER="1" />
                         </TABLE_SORT_STATE>
                     </Table_State>
                 </XML>
             </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.references.ExternalNamesTableModel:Name:Ghidra Program:">
-                <XML NAME="COLUMN_DATA">
-                    <Table_State>
-                        <COLUMN NAME="Name" WIDTH="219" VISIBLE="true" />
-                        <COLUMN NAME="Ghidra Program" WIDTH="218" VISIBLE="true" />
-                        <TABLE_SORT_STATE>
-                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="0" SORT_DIRECTION="ascending" SORT_ORDER="1" />
-                        </TABLE_SORT_STATE>
-                    </Table_State>
-                </XML>
-            </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel:Remove:Module:Dynamic Base:Program:Static Base:Size:Choose:">
-                <XML NAME="COLUMN_DATA">
-                    <Table_State>
-                        <COLUMN NAME="Remove" WIDTH="32" VISIBLE="true" />
-                        <COLUMN NAME="Module" WIDTH="105" VISIBLE="true" />
-                        <COLUMN NAME="Dynamic Base" WIDTH="105" VISIBLE="true" />
-                        <COLUMN NAME="Program" WIDTH="105" VISIBLE="true" />
-                        <COLUMN NAME="Static Base" WIDTH="105" VISIBLE="true" />
-                        <COLUMN NAME="Size" WIDTH="104" VISIBLE="true" />
-                        <COLUMN NAME="Choose" WIDTH="32" VISIBLE="true" />
-                        <TABLE_SORT_STATE>
-                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="0" SORT_DIRECTION="ascending" SORT_ORDER="1" />
-                        </TABLE_SORT_STATE>
-                    </Table_State>
-                </XML>
-            </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="KNOWN_EXTENSIONS">
-                <ARRAY NAME="KNOWN_EXTENSIONS" TYPE="string" />
-            </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="ghidra.framework.plugintool.dialog.PluginInstallerTableModel:Installation Status:Status:Name:Description:Category:">
+            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.debug.gui.modules.DebuggerSectionsPanel$SectionTableModel:Path:Start:End:Name:Module Name:">
                 <XML NAME="COLUMN_DATA">
                     <Table_State>
-                        <COLUMN NAME="ghidra.framework.plugintool.dialog.PluginInstallerTableModel$PluginInstalledColumn.Installation Status" WIDTH="25" VISIBLE="true" />
-                        <COLUMN NAME="ghidra.framework.plugintool.dialog.PluginInstallerTableModel$PluginStatusColumn.Status" WIDTH="24" VISIBLE="true" />
-                        <COLUMN NAME="ghidra.framework.plugintool.dialog.PluginInstallerTableModel$PluginNameColumn.Name" WIDTH="218" VISIBLE="true" />
-                        <COLUMN NAME="ghidra.framework.plugintool.dialog.PluginInstallerTableModel$PluginDescriptionColumn.Description" WIDTH="218" VISIBLE="true" />
-                        <COLUMN NAME="ghidra.framework.plugintool.dialog.PluginInstallerTableModel$PluginCategoryColumn.Category" WIDTH="217" VISIBLE="true" />
+                        <COLUMN NAME="ghidra.app.plugin.core.debug.gui.modules.DebuggerSectionsPanel$SectionPathColumn.Path" WIDTH="500" VISIBLE="false" />
+                        <COLUMN NAME="ghidra.app.plugin.core.debug.gui.modules.DebuggerSectionsPanel$SectionStartColumn.Start" WIDTH="15" VISIBLE="true" />
+                        <COLUMN NAME="ghidra.app.plugin.core.debug.gui.modules.DebuggerSectionsPanel$SectionEndColumn.End" WIDTH="15" VISIBLE="true" />
+                        <COLUMN NAME="ghidra.app.plugin.core.debug.gui.modules.DebuggerSectionsPanel$SectionNameColumn.Name" WIDTH="15" VISIBLE="true" />
+                        <COLUMN NAME="ghidra.app.plugin.core.debug.gui.modules.DebuggerSectionsPanel$SectionModuleNameColumn.Module Name" WIDTH="15" VISIBLE="true" />
+                        <COLUMN NAME="ghidra.app.plugin.core.debug.gui.modules.DebuggerSectionsPanel$SectionLengthColumn.Length" WIDTH="15" VISIBLE="true" />
                         <TABLE_SORT_STATE>
-                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="2" SORT_DIRECTION="ascending" SORT_ORDER="1" />
+                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="1" SORT_DIRECTION="ascending" SORT_ORDER="1" />
                         </TABLE_SORT_STATE>
                     </Table_State>
                 </XML>
             </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.debug.gui.breakpoint.DebuggerBreakpointsProvider$BreakpointLocationTableModel:Name:Address:Trace:Threads:Comment:">
+            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.debug.gui.model.PathTableModel:Path:Key:Value:">
                 <XML NAME="COLUMN_DATA">
                     <Table_State>
-                        <COLUMN NAME="Name" WIDTH="102" VISIBLE="true" />
-                        <COLUMN NAME="Address" WIDTH="102" VISIBLE="true" />
-                        <COLUMN NAME="Trace" WIDTH="102" VISIBLE="true" />
-                        <COLUMN NAME="Threads" WIDTH="102" VISIBLE="true" />
-                        <COLUMN NAME="Comment" WIDTH="101" VISIBLE="true" />
+                        <COLUMN NAME="ghidra.app.plugin.core.debug.gui.model.columns.TracePathStringColumn.Path" WIDTH="500" VISIBLE="false" />
+                        <COLUMN NAME="ghidra.app.plugin.core.debug.gui.model.columns.TracePathLastKeyColumn.Key" WIDTH="82" VISIBLE="true" />
+                        <COLUMN NAME="ghidra.app.plugin.core.debug.gui.model.columns.TracePathValueColumn.Value" WIDTH="82" VISIBLE="true" />
+                        <COLUMN NAME="ghidra.app.plugin.core.debug.gui.model.columns.TracePathLastLifespanColumn.Life" WIDTH="82" VISIBLE="true" />
+                        <COLUMN NAME="ghidra.app.plugin.core.debug.gui.model.columns.TracePathLastLifespanPlotColumn.Plot" WIDTH="500" VISIBLE="false" />
                         <TABLE_SORT_STATE>
                             <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="1" SORT_DIRECTION="ascending" SORT_ORDER="1" />
+                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="3" SORT_DIRECTION="ascending" SORT_ORDER="2" />
                         </TABLE_SORT_STATE>
                     </Table_State>
                 </XML>
@@ -471,12 +298,13 @@
             <PREFERENCE_STATE NAME="ghidra.app.plugin.core.debug.gui.register.DebuggerRegistersProvider$RegistersTableModel:Fav:#:Name:Value:Type:Repr:">
                 <XML NAME="COLUMN_DATA">
                     <Table_State>
-                        <COLUMN NAME="Fav" WIDTH="48" VISIBLE="true" />
-                        <COLUMN NAME="#" WIDTH="44" VISIBLE="true" />
-                        <COLUMN NAME="Name" WIDTH="66" VISIBLE="true" />
-                        <COLUMN NAME="Value" WIDTH="104" VISIBLE="true" />
-                        <COLUMN NAME="Type" WIDTH="71" VISIBLE="true" />
-                        <COLUMN NAME="Repr" WIDTH="105" VISIBLE="true" />
+                        <COLUMN NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel$EnumeratedDynamicTableColumn.Fav" WIDTH="41" VISIBLE="true" />
+                        <COLUMN NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel$EnumeratedDynamicTableColumn.#" WIDTH="41" VISIBLE="true" />
+                        <COLUMN NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel$EnumeratedDynamicTableColumn.Name" WIDTH="67" VISIBLE="true" />
+                        <COLUMN NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel$EnumeratedDynamicTableColumn.Value" WIDTH="126" VISIBLE="true" />
+                        <COLUMN NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel$EnumeratedDynamicTableColumn.Type" WIDTH="67" VISIBLE="true" />
+                        <COLUMN NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel$EnumeratedDynamicTableColumn.Repr" WIDTH="126" VISIBLE="true" />
+                        <COLUMN NAME="ghidra.taint.gui.field.TaintDebuggerRegisterColumnFactory$1.Taint" WIDTH="500" VISIBLE="false" />
                         <TABLE_SORT_STATE>
                             <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="0" SORT_DIRECTION="descending" SORT_ORDER="1" />
                             <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="1" SORT_DIRECTION="ascending" SORT_ORDER="2" />
@@ -484,587 +312,155 @@
                     </Table_State>
                 </XML>
             </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.debug.gui.watch.DebuggerWatchesProvider$WatchTableModel:Expression:Address:Data Type:Raw:Value:Error:">
-                <XML NAME="COLUMN_DATA">
-                    <Table_State>
-                        <COLUMN NAME="Expression" WIDTH="110" VISIBLE="true" />
-                        <COLUMN NAME="Address" WIDTH="110" VISIBLE="true" />
-                        <COLUMN NAME="Data Type" WIDTH="110" VISIBLE="true" />
-                        <COLUMN NAME="Raw" WIDTH="110" VISIBLE="true" />
-                        <COLUMN NAME="Value" WIDTH="110" VISIBLE="true" />
-                        <COLUMN NAME="Error" WIDTH="110" VISIBLE="true" />
-                        <TABLE_SORT_STATE>
-                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="0" SORT_DIRECTION="ascending" SORT_ORDER="1" />
-                        </TABLE_SORT_STATE>
-                    </Table_State>
-                </XML>
-            </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.debug.gui.register.DebuggerRegistersProvider$RegistersTableModel:#:Name:Value:Type:Repr:">
-                <XML NAME="COLUMN_DATA">
-                    <Table_State>
-                        <COLUMN NAME="#" WIDTH="66" VISIBLE="true" />
-                        <COLUMN NAME="Name" WIDTH="86" VISIBLE="true" />
-                        <COLUMN NAME="Value" WIDTH="133" VISIBLE="true" />
-                        <COLUMN NAME="Type" WIDTH="94" VISIBLE="true" />
-                        <COLUMN NAME="Repr" WIDTH="132" VISIBLE="true" />
-                        <TABLE_SORT_STATE>
-                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="0" SORT_DIRECTION="ascending" SORT_ORDER="1" />
-                        </TABLE_SORT_STATE>
-                    </Table_State>
-                </XML>
-            </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.debug.gui.modules.DebuggerModulesProvider$SectionTableModel:Start Address:End Address:Section Name:Module Name:Length:">
-                <XML NAME="COLUMN_DATA">
-                    <Table_State>
-                        <COLUMN NAME="Start Address" WIDTH="87" VISIBLE="true" />
-                        <COLUMN NAME="End Address" WIDTH="87" VISIBLE="true" />
-                        <COLUMN NAME="Section Name" WIDTH="88" VISIBLE="true" />
-                        <COLUMN NAME="Module Name" WIDTH="87" VISIBLE="true" />
-                        <COLUMN NAME="Length" WIDTH="87" VISIBLE="true" />
-                        <TABLE_SORT_STATE>
-                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="0" SORT_DIRECTION="ascending" SORT_ORDER="1" />
-                        </TABLE_SORT_STATE>
-                    </Table_State>
-                </XML>
-            </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.debug.gui.register.DebuggerAvailableRegistersDialog$AvailableRegistersTableModel::#:Name:Bits:Known:Group:Contains:Parent:">
-                <XML NAME="COLUMN_DATA">
-                    <Table_State>
-                        <COLUMN NAME="" WIDTH="50" VISIBLE="true" />
-                        <COLUMN NAME="#" WIDTH="45" VISIBLE="true" />
-                        <COLUMN NAME="Name" WIDTH="70" VISIBLE="true" />
-                        <COLUMN NAME="Bits" WIDTH="61" VISIBLE="true" />
-                        <COLUMN NAME="Known" WIDTH="51" VISIBLE="true" />
-                        <COLUMN NAME="Group" WIDTH="70" VISIBLE="true" />
-                        <COLUMN NAME="Contains" WIDTH="51" VISIBLE="true" />
-                        <COLUMN NAME="Parent" WIDTH="60" VISIBLE="true" />
-                        <TABLE_SORT_STATE>
-                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="1" SORT_DIRECTION="ascending" SORT_ORDER="1" />
-                        </TABLE_SORT_STATE>
-                    </Table_State>
-                </XML>
-            </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.memory.MemoryMapModel:Name:Start:End:Length:R:W:X:Volatile:Type:Initialized:Source:Comment:">
-                <XML NAME="COLUMN_DATA">
-                    <Table_State>
-                        <COLUMN NAME="Name" WIDTH="103" VISIBLE="true" />
-                        <COLUMN NAME="Start" WIDTH="103" VISIBLE="true" />
-                        <COLUMN NAME="End" WIDTH="103" VISIBLE="true" />
-                        <COLUMN NAME="Length" WIDTH="103" VISIBLE="true" />
-                        <COLUMN NAME="R" WIDTH="25" VISIBLE="true" />
-                        <COLUMN NAME="W" WIDTH="25" VISIBLE="true" />
-                        <COLUMN NAME="X" WIDTH="25" VISIBLE="true" />
-                        <COLUMN NAME="Volatile" WIDTH="50" VISIBLE="true" />
-                        <COLUMN NAME="Type" WIDTH="103" VISIBLE="true" />
-                        <COLUMN NAME="Initialized" WIDTH="60" VISIBLE="true" />
-                        <COLUMN NAME="Source" WIDTH="103" VISIBLE="true" />
-                        <COLUMN NAME="Comment" WIDTH="102" VISIBLE="true" />
-                        <TABLE_SORT_STATE>
-                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="1" SORT_DIRECTION="ascending" SORT_ORDER="1" />
-                        </TABLE_SORT_STATE>
-                    </Table_State>
-                </XML>
-            </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.functionwindow.FunctionTableModel:Label:Location:Function Signature:">
+            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.debug.gui.modules.DebuggerStaticMappingProvider$MappingTableModel:Dynamic Address:Static Program:Static Address:Length:Shift:Lifespan:">
                 <XML NAME="COLUMN_DATA">
                     <Table_State>
-                        <COLUMN NAME="ghidra.util.table.field.LabelTableColumn" WIDTH="148" VISIBLE="true" />
-                        <COLUMN NAME="ghidra.util.table.field.AddressTableColumn" WIDTH="124" VISIBLE="true" />
-                        <COLUMN NAME="ghidra.util.table.field.FunctionSignatureTableColumn" WIDTH="148" VISIBLE="true" />
-                        <COLUMN NAME="ghidra.util.table.field.OffcutReferenceCountToAddressTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.SymbolTypeTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.MemorySectionProgramLocationBasedTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.ReferenceCountToAddressTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.FunctionBodySizeTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.FunctionParameterCountTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.NamespaceTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.FunctionNameTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.SourceTypeTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.FunctionPurgeTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.MemoryTypeProgramLocationBasedTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.ByteCountProgramLocationBasedTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.BytesTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.FunctionCallingConventionTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.PreviewTableColumn" WIDTH="75" VISIBLE="false" />
-                        <TABLE_SORT_STATE>
-                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="1" SORT_DIRECTION="ascending" SORT_ORDER="1" />
-                        </TABLE_SORT_STATE>
-                    </Table_State>
-                </XML>
-            </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel:Snap:Timestamp:Event Thread:Schedule:Description:">
-                <XML NAME="COLUMN_DATA">
-                    <Table_State>
-                        <COLUMN NAME="Snap" WIDTH="181" VISIBLE="true" />
-                        <COLUMN NAME="Timestamp" WIDTH="339" VISIBLE="true" />
-                        <COLUMN NAME="Event Thread" WIDTH="182" VISIBLE="true" />
-                        <COLUMN NAME="Schedule" WIDTH="201" VISIBLE="true" />
-                        <COLUMN NAME="Description" WIDTH="339" VISIBLE="true" />
+                        <COLUMN NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel$EnumeratedDynamicTableColumn.Dynamic Address" WIDTH="156" VISIBLE="true" />
+                        <COLUMN NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel$EnumeratedDynamicTableColumn.Static Program" WIDTH="156" VISIBLE="true" />
+                        <COLUMN NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel$EnumeratedDynamicTableColumn.Static Address" WIDTH="156" VISIBLE="true" />
+                        <COLUMN NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel$EnumeratedDynamicTableColumn.Length" WIDTH="155" VISIBLE="true" />
+                        <COLUMN NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel$EnumeratedDynamicTableColumn.Shift" WIDTH="156" VISIBLE="true" />
+                        <COLUMN NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel$EnumeratedDynamicTableColumn.Lifespan" WIDTH="155" VISIBLE="true" />
                         <TABLE_SORT_STATE>
                             <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="0" SORT_DIRECTION="ascending" SORT_ORDER="1" />
                         </TABLE_SORT_STATE>
                     </Table_State>
                 </XML>
             </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.debug.gui.console.DebuggerConsoleProvider$LogTableModel:Level:Message:Actions:Time:">
+            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.debug.gui.watch.DebuggerWatchesProvider$WatchTableModel:Expression:Address:Symbol:Value:Type:Repr:Error:">
                 <XML NAME="COLUMN_DATA">
                     <Table_State>
-                        <COLUMN NAME="Level" WIDTH="24" VISIBLE="true" />
-                        <COLUMN NAME="Message" WIDTH="237" VISIBLE="true" />
-                        <COLUMN NAME="Actions" WIDTH="88" VISIBLE="true" />
-                        <COLUMN NAME="Time" WIDTH="110" VISIBLE="true" />
-                        <TABLE_SORT_STATE>
-                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="2" SORT_DIRECTION="descending" SORT_ORDER="1" />
-                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="3" SORT_DIRECTION="descending" SORT_ORDER="2" />
-                        </TABLE_SORT_STATE>
-                    </Table_State>
-                </XML>
-            </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.analysis.AnalysisPanel$1:Enabled:Analyzer Name:">
-                <XML NAME="COLUMN_DATA">
-                    <Table_State>
-                        <COLUMN NAME="Enabled" WIDTH="75" VISIBLE="true" />
-                        <COLUMN NAME="Analyzer Name" WIDTH="254" VISIBLE="true" />
-                    </Table_State>
-                </XML>
-            </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="docking.widgets.filechooser.DirectoryTableModel:Filename:Size:Modified:">
-                <XML NAME="COLUMN_DATA">
-                    <Table_State>
-                        <COLUMN NAME="Filename" WIDTH="225" VISIBLE="true" />
-                        <COLUMN NAME="Size" WIDTH="226" VISIBLE="true" />
-                        <COLUMN NAME="Modified" WIDTH="226" VISIBLE="true" />
+                        <COLUMN NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel$EnumeratedDynamicTableColumn.Expression" WIDTH="71" VISIBLE="true" />
+                        <COLUMN NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel$EnumeratedDynamicTableColumn.Address" WIDTH="71" VISIBLE="true" />
+                        <COLUMN NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel$EnumeratedDynamicTableColumn.Symbol" WIDTH="71" VISIBLE="true" />
+                        <COLUMN NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel$EnumeratedDynamicTableColumn.Value" WIDTH="71" VISIBLE="true" />
+                        <COLUMN NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel$EnumeratedDynamicTableColumn.Type" WIDTH="71" VISIBLE="true" />
+                        <COLUMN NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel$EnumeratedDynamicTableColumn.Repr" WIDTH="71" VISIBLE="true" />
+                        <COLUMN NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel$EnumeratedDynamicTableColumn.Error" WIDTH="70" VISIBLE="true" />
                         <TABLE_SORT_STATE>
                             <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="0" SORT_DIRECTION="ascending" SORT_ORDER="1" />
                         </TABLE_SORT_STATE>
                     </Table_State>
                 </XML>
             </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.debug.gui.stack.DebuggerStackProvider$StackTableModel:Level:PC:Function:Comment:">
+            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.debug.gui.stack.DebuggerStackPanel$StackTableModel:Level:PC:Function:Module:">
                 <XML NAME="COLUMN_DATA">
                     <Table_State>
-                        <COLUMN NAME="Level" WIDTH="166" VISIBLE="true" />
-                        <COLUMN NAME="PC" WIDTH="165" VISIBLE="true" />
-                        <COLUMN NAME="Function" WIDTH="165" VISIBLE="true" />
-                        <COLUMN NAME="Comment" WIDTH="164" VISIBLE="true" />
+                        <COLUMN NAME="ghidra.app.plugin.core.debug.gui.stack.DebuggerStackPanel$FrameLevelColumn.Level" WIDTH="28" VISIBLE="true" />
+                        <COLUMN NAME="ghidra.app.plugin.core.debug.gui.stack.DebuggerStackPanel$FramePcColumn.PC" WIDTH="156" VISIBLE="true" />
+                        <COLUMN NAME="ghidra.app.plugin.core.debug.gui.stack.DebuggerStackPanel$FrameFunctionColumn.Function" WIDTH="156" VISIBLE="true" />
+                        <COLUMN NAME="ghidra.app.plugin.core.debug.gui.stack.DebuggerStackPanel$FrameModuleColumn.Module" WIDTH="156" VISIBLE="true" />
                         <TABLE_SORT_STATE>
                             <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="0" SORT_DIRECTION="ascending" SORT_ORDER="1" />
                         </TABLE_SORT_STATE>
                     </Table_State>
                 </XML>
             </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel:Base Address:Max Address:Module Name:Lifespan:Length:">
+            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.debug.gui.model.ObjectTableModel:Key:Value:Life:">
                 <XML NAME="COLUMN_DATA">
                     <Table_State>
-                        <COLUMN NAME="Base Address" WIDTH="102" VISIBLE="true" />
-                        <COLUMN NAME="Max Address" WIDTH="102" VISIBLE="true" />
-                        <COLUMN NAME="Module Name" WIDTH="102" VISIBLE="true" />
-                        <COLUMN NAME="Lifespan" WIDTH="102" VISIBLE="true" />
-                        <COLUMN NAME="Length" WIDTH="101" VISIBLE="true" />
+                        <COLUMN NAME="ghidra.app.plugin.core.debug.gui.model.columns.TraceValueKeyColumn.Key" WIDTH="82" VISIBLE="true" />
+                        <COLUMN NAME="ghidra.app.plugin.core.debug.gui.model.columns.TraceValueValColumn.Value" WIDTH="82" VISIBLE="true" />
+                        <COLUMN NAME="ghidra.app.plugin.core.debug.gui.model.columns.TraceValueLifeColumn.Life" WIDTH="82" VISIBLE="true" />
+                        <COLUMN NAME="ghidra.app.plugin.core.debug.gui.model.columns.TraceValueLifePlotColumn.Plot" WIDTH="500" VISIBLE="false" />
                         <TABLE_SORT_STATE>
                             <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="0" SORT_DIRECTION="ascending" SORT_ORDER="1" />
+                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="2" SORT_DIRECTION="ascending" SORT_ORDER="2" />
                         </TABLE_SORT_STATE>
                     </Table_State>
                 </XML>
             </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.debug.gui.pcode.DebuggerPcodeStepperProvider$UniqueTableModel:Name:Value:Type:Repr:">
-                <XML NAME="COLUMN_DATA">
-                    <Table_State>
-                        <COLUMN NAME="Name" WIDTH="103" VISIBLE="true" />
-                        <COLUMN NAME="Value" WIDTH="103" VISIBLE="true" />
-                        <COLUMN NAME="Type" WIDTH="103" VISIBLE="true" />
-                        <COLUMN NAME="Repr" WIDTH="103" VISIBLE="true" />
-                        <TABLE_SORT_STATE>
-                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="0" SORT_DIRECTION="ascending" SORT_ORDER="1" />
-                        </TABLE_SORT_STATE>
-                    </Table_State>
-                </XML>
-            </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.debug.gui.breakpoint.DebuggerBreakpointsProvider$BreakpointLocationTableModel:Enabled:Name:Address:Trace:Threads:Comment:">
-                <XML NAME="COLUMN_DATA">
-                    <Table_State>
-                        <COLUMN NAME="Enabled" WIDTH="18" VISIBLE="true" />
-                        <COLUMN NAME="Name" WIDTH="86" VISIBLE="true" />
-                        <COLUMN NAME="Address" WIDTH="87" VISIBLE="true" />
-                        <COLUMN NAME="Trace" WIDTH="86" VISIBLE="true" />
-                        <COLUMN NAME="Threads" WIDTH="87" VISIBLE="true" />
-                        <COLUMN NAME="Comment" WIDTH="87" VISIBLE="true" />
-                        <TABLE_SORT_STATE>
-                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="2" SORT_DIRECTION="ascending" SORT_ORDER="1" />
-                        </TABLE_SORT_STATE>
-                    </Table_State>
-                </XML>
-            </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.debug.gui.thread.DebuggerThreadsProvider$ThreadTableModel:Name:Created:Destroyed:State:Comment:">
-                <XML NAME="COLUMN_DATA">
-                    <Table_State>
-                        <COLUMN NAME="Name" WIDTH="152" VISIBLE="true" />
-                        <COLUMN NAME="Created" WIDTH="152" VISIBLE="true" />
-                        <COLUMN NAME="Destroyed" WIDTH="152" VISIBLE="true" />
-                        <COLUMN NAME="State" WIDTH="152" VISIBLE="true" />
-                        <COLUMN NAME="Comment" WIDTH="151" VISIBLE="true" />
-                        <TABLE_SORT_STATE>
-                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="0" SORT_DIRECTION="ascending" SORT_ORDER="1" />
-                        </TABLE_SORT_STATE>
-                    </Table_State>
-                </XML>
-            </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.datawindow.DataTableModel:Data:Location:Type:Size:">
-                <XML NAME="COLUMN_DATA">
-                    <Table_State>
-                        <COLUMN NAME="ghidra.app.plugin.core.datawindow.DataTableModel$DataValueTableColumn" WIDTH="122" VISIBLE="true" />
-                        <COLUMN NAME="ghidra.util.table.field.AddressTableColumn" WIDTH="98" VISIBLE="true" />
-                        <COLUMN NAME="ghidra.app.plugin.core.datawindow.DataTableModel$TypeTableColumn" WIDTH="122" VISIBLE="true" />
-                        <COLUMN NAME="ghidra.app.plugin.core.datawindow.DataTableModel$SizeTableColumn" WIDTH="78" VISIBLE="true" />
-                        <COLUMN NAME="ghidra.util.table.field.OffcutReferenceCountToAddressTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.SymbolTypeTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.MemorySectionProgramLocationBasedTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.ReferenceCountToAddressTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.FunctionParameterCountTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.FunctionNameTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.NamespaceTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.SourceTypeTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.MemoryTypeProgramLocationBasedTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.LabelTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.ByteCountProgramLocationBasedTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.BytesTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.PreviewTableColumn" WIDTH="75" VISIBLE="false" />
-                        <TABLE_SORT_STATE>
-                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="1" SORT_DIRECTION="ascending" SORT_ORDER="1" />
-                        </TABLE_SORT_STATE>
-                    </Table_State>
-                </XML>
-            </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="docking.ErrLogDialog$ErrEntryTableModel:#:Message:Details:">
-                <XML NAME="COLUMN_DATA">
-                    <Table_State>
-                        <COLUMN NAME="docking.ErrLogDialog$ErrEntryTableModel$IdColumn.#" WIDTH="331" VISIBLE="true" />
-                        <COLUMN NAME="docking.ErrLogDialog$ErrEntryTableModel$MessageColumn.Message" WIDTH="332" VISIBLE="true" />
-                        <COLUMN NAME="docking.ErrLogDialog$ErrEntryTableModel$DetailsColumn.Details" WIDTH="500" VISIBLE="false" />
-                        <COLUMN NAME="docking.ErrLogDialog$ErrEntryTableModel$TimestampColumn.Time" WIDTH="331" VISIBLE="true" />
-                        <TABLE_SORT_STATE>
-                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="0" SORT_DIRECTION="ascending" SORT_ORDER="1" />
-                        </TABLE_SORT_STATE>
-                    </Table_State>
-                </XML>
-            </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.datapreview.DataTypePreviewPlugin$MyTableModel:Name:Preview:">
-                <XML NAME="COLUMN_DATA">
-                    <Table_State>
-                        <COLUMN NAME="Name" WIDTH="682" VISIBLE="true" />
-                        <COLUMN NAME="Preview" WIDTH="681" VISIBLE="true" />
-                        <TABLE_SORT_STATE>
-                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="0" SORT_DIRECTION="ascending" SORT_ORDER="1" />
-                        </TABLE_SORT_STATE>
-                    </Table_State>
-                </XML>
-            </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel:Tick:Description:">
-                <XML NAME="COLUMN_DATA">
-                    <Table_State>
-                        <COLUMN NAME="Tick" WIDTH="321" VISIBLE="true" />
-                        <COLUMN NAME="Description" WIDTH="780" VISIBLE="true" />
-                        <TABLE_SORT_STATE>
-                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="0" SORT_DIRECTION="ascending" SORT_ORDER="1" />
-                        </TABLE_SORT_STATE>
-                    </Table_State>
-                </XML>
-            </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.equate.EquateReferenceTableModel:Ref Addr:Op Index:">
-                <XML NAME="COLUMN_DATA">
-                    <Table_State>
-                        <COLUMN NAME="Ref Addr" WIDTH="82" VISIBLE="true" />
-                        <COLUMN NAME="Op Index" WIDTH="82" VISIBLE="true" />
-                        <TABLE_SORT_STATE>
-                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="0" SORT_DIRECTION="ascending" SORT_ORDER="1" />
-                        </TABLE_SORT_STATE>
-                    </Table_State>
-                </XML>
-            </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="docking.widgets.table.GTableFilterPanel$SortedTableModelWrapper:Action Name:KeyBinding:Plugin Name:">
-                <XML NAME="COLUMN_DATA">
-                    <Table_State>
-                        <COLUMN NAME="Action Name" WIDTH="359" VISIBLE="true" />
-                        <COLUMN NAME="KeyBinding" WIDTH="180" VISIBLE="true" />
-                        <COLUMN NAME="Plugin Name" WIDTH="179" VISIBLE="true" />
-                        <TABLE_SORT_STATE>
-                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="0" SORT_DIRECTION="ascending" SORT_ORDER="1" />
-                        </TABLE_SORT_STATE>
-                    </Table_State>
-                </XML>
-            </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel:Remove:Module:Section:Dynamic Base:Program:Block:Static Base:Size:Choose:">
-                <XML NAME="COLUMN_DATA">
-                    <Table_State>
-                        <COLUMN NAME="Remove" WIDTH="32" VISIBLE="true" />
-                        <COLUMN NAME="Module" WIDTH="75" VISIBLE="true" />
-                        <COLUMN NAME="Section" WIDTH="75" VISIBLE="true" />
-                        <COLUMN NAME="Dynamic Base" WIDTH="75" VISIBLE="true" />
-                        <COLUMN NAME="Program" WIDTH="75" VISIBLE="true" />
-                        <COLUMN NAME="Block" WIDTH="75" VISIBLE="true" />
-                        <COLUMN NAME="Static Base" WIDTH="75" VISIBLE="true" />
-                        <COLUMN NAME="Size" WIDTH="74" VISIBLE="true" />
-                        <COLUMN NAME="Choose" WIDTH="32" VISIBLE="true" />
-                        <TABLE_SORT_STATE>
-                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="0" SORT_DIRECTION="ascending" SORT_ORDER="1" />
-                        </TABLE_SORT_STATE>
-                    </Table_State>
-                </XML>
-            </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.bookmark.BookmarkTableModel:Type:Category:Description:Location:Label:Preview:">
-                <XML NAME="COLUMN_DATA">
-                    <Table_State>
-                        <COLUMN NAME="ghidra.app.plugin.core.bookmark.BookmarkTableModel$TypeTableColumn" WIDTH="189" VISIBLE="true" />
-                        <COLUMN NAME="ghidra.app.plugin.core.bookmark.BookmarkTableModel$CategoryTableColumn" WIDTH="204" VISIBLE="true" />
-                        <COLUMN NAME="ghidra.app.plugin.core.bookmark.BookmarkTableModel$DescriptionTableColumn" WIDTH="313" VISIBLE="true" />
-                        <COLUMN NAME="ghidra.util.table.field.AddressTableColumn" WIDTH="204" VISIBLE="true" />
-                        <COLUMN NAME="ghidra.util.table.field.LabelTableColumn" WIDTH="189" VISIBLE="true" />
-                        <COLUMN NAME="ghidra.util.table.field.PreviewTableColumn" WIDTH="263" VISIBLE="true" />
-                        <COLUMN NAME="ghidra.util.table.field.OffcutReferenceCountToAddressTableColumn" WIDTH="15" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.SymbolTypeTableColumn" WIDTH="15" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.MemorySectionProgramLocationBasedTableColumn" WIDTH="15" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.ReferenceCountToAddressTableColumn" WIDTH="15" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.FunctionParameterCountTableColumn" WIDTH="15" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.FunctionNameTableColumn" WIDTH="15" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.NamespaceTableColumn" WIDTH="15" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.SourceTypeTableColumn" WIDTH="15" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.MemoryTypeProgramLocationBasedTableColumn" WIDTH="15" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.ByteCountProgramLocationBasedTableColumn" WIDTH="15" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.BytesTableColumn" WIDTH="15" VISIBLE="false" />
-                        <TABLE_SORT_STATE>
-                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="0" SORT_DIRECTION="ascending" SORT_ORDER="1" />
-                        </TABLE_SORT_STATE>
-                    </Table_State>
-                </XML>
-            </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.debug.gui.pcode.DebuggerPcodeStepperProvider$PcodeTableModel:Sequence:Code:">
-                <XML NAME="COLUMN_DATA">
-                    <Table_State>
-                        <COLUMN NAME="Sequence" WIDTH="27" VISIBLE="true" />
-                        <COLUMN NAME="Code" WIDTH="423" VISIBLE="true" />
-                        <TABLE_SORT_STATE>
-                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="0" SORT_DIRECTION="ascending" SORT_ORDER="1" />
-                        </TABLE_SORT_STATE>
-                    </Table_State>
-                </XML>
-            </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.debug.gui.listing.DebuggerModuleImportDialog$FileTableModel:Remove:Ignore:Path:Import:">
-                <XML NAME="COLUMN_DATA">
-                    <Table_State>
-                        <COLUMN NAME="Remove" WIDTH="32" VISIBLE="true" />
-                        <COLUMN NAME="Ignore" WIDTH="26" VISIBLE="true" />
-                        <COLUMN NAME="Path" WIDTH="368" VISIBLE="true" />
-                        <COLUMN NAME="Import" WIDTH="32" VISIBLE="true" />
-                        <TABLE_SORT_STATE>
-                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="0" SORT_DIRECTION="ascending" SORT_ORDER="1" />
-                        </TABLE_SORT_STATE>
-                    </Table_State>
-                </XML>
-            </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.debug.gui.watch.DebuggerWatchesProvider$WatchTableModel:Expression:Address:Value:Type:Repr:Error:">
-                <XML NAME="COLUMN_DATA">
-                    <Table_State>
-                        <COLUMN NAME="Expression" WIDTH="110" VISIBLE="true" />
-                        <COLUMN NAME="Address" WIDTH="110" VISIBLE="true" />
-                        <COLUMN NAME="Value" WIDTH="110" VISIBLE="true" />
-                        <COLUMN NAME="Type" WIDTH="110" VISIBLE="true" />
-                        <COLUMN NAME="Repr" WIDTH="110" VISIBLE="true" />
-                        <COLUMN NAME="Error" WIDTH="110" VISIBLE="true" />
-                        <TABLE_SORT_STATE>
-                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="0" SORT_DIRECTION="ascending" SORT_ORDER="1" />
-                        </TABLE_SORT_STATE>
-                    </Table_State>
-                </XML>
-            </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="SymbolTablePlugin">
-                <STATE NAME="SELECTION_NAVIGATION_SELECTED_STATE" TYPE="boolean" VALUE="true" />
-            </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.debug.gui.pcode.DebuggerPcodeStepperProvider$UniqueTableModel:Ref:Unique:Bytes:Value:Type:Repr:">
-                <XML NAME="COLUMN_DATA">
-                    <Table_State>
-                        <COLUMN NAME="Ref" WIDTH="45" VISIBLE="true" />
-                        <COLUMN NAME="Unique" WIDTH="138" VISIBLE="true" />
-                        <COLUMN NAME="Bytes" WIDTH="147" VISIBLE="true" />
-                        <COLUMN NAME="Value" WIDTH="138" VISIBLE="true" />
-                        <COLUMN NAME="Type" WIDTH="153" VISIBLE="true" />
-                        <COLUMN NAME="Repr" WIDTH="153" VISIBLE="true" />
-                        <TABLE_SORT_STATE>
-                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="4" SORT_DIRECTION="ascending" SORT_ORDER="1" />
-                        </TABLE_SORT_STATE>
-                    </Table_State>
-                </XML>
-            </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel:Snap:Timestamp:Event Thread:Ticks:Description:">
-                <XML NAME="COLUMN_DATA">
-                    <Table_State>
-                        <COLUMN NAME="Snap" WIDTH="95" VISIBLE="true" />
-                        <COLUMN NAME="Timestamp" WIDTH="288" VISIBLE="true" />
-                        <COLUMN NAME="Event Thread" WIDTH="287" VISIBLE="true" />
-                        <COLUMN NAME="Ticks" WIDTH="286" VISIBLE="true" />
-                        <COLUMN NAME="Description" WIDTH="286" VISIBLE="true" />
-                        <TABLE_SORT_STATE>
-                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="0" SORT_DIRECTION="ascending" SORT_ORDER="1" />
-                        </TABLE_SORT_STATE>
-                    </Table_State>
-                </XML>
-            </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.strings.ViewStringsTableModel:Location:String:">
-                <XML NAME="COLUMN_DATA">
-                    <Table_State>
-                        <COLUMN NAME="ghidra.util.table.field.AddressTableColumn" WIDTH="210" VISIBLE="true" />
-                        <COLUMN NAME="ghidra.app.plugin.core.strings.ViewStringsTableModel$DataValueColumn" WIDTH="210" VISIBLE="true" />
-                        <COLUMN NAME="ghidra.util.table.field.OffcutReferenceCountToAddressTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.SymbolTypeTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.MemorySectionProgramLocationBasedTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.ReferenceCountToAddressTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.FunctionBodySizeTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.FunctionSignatureTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.FunctionParameterCountTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.NamespaceTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.FunctionNameTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.SourceTypeTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.FunctionPurgeTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.MemoryTypeProgramLocationBasedTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.LabelTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.ByteCountProgramLocationBasedTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.BytesTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.FunctionCallingConventionTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.PreviewTableColumn" WIDTH="75" VISIBLE="false" />
+            <PREFERENCE_STATE NAME="GRAPH_DISPLAY_SERVICE" />
+            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.strings.ViewStringsTableModel:Location:String Value:String Representation:Data Type:">
+                <XML NAME="COLUMN_DATA">
+                    <Table_State>
+                        <COLUMN NAME="ghidra.app.plugin.core.strings.ViewStringsTableModel$DataLocationColumn.Location" WIDTH="117" VISIBLE="true" />
+                        <COLUMN NAME="ghidra.app.plugin.core.strings.ViewStringsTableModel$DataValueColumn.String Value" WIDTH="117" VISIBLE="true" />
+                        <COLUMN NAME="ghidra.app.plugin.core.strings.ViewStringsTableModel$StringRepColumn.String Representation" WIDTH="117" VISIBLE="true" />
+                        <COLUMN NAME="ghidra.app.plugin.core.strings.ViewStringsTableModel$DataTypeColumn.Data Type" WIDTH="117" VISIBLE="true" />
+                        <COLUMN NAME="ghidra.app.plugin.core.strings.ViewStringsTableModel$IsAsciiColumn.Is Ascii" WIDTH="500" VISIBLE="false" />
+                        <COLUMN NAME="ghidra.app.plugin.core.strings.ViewStringsTableModel$CharsetColumn.Charset" WIDTH="500" VISIBLE="false" />
+                        <COLUMN NAME="ghidra.app.plugin.core.strings.ViewStringsTableModel$HasEncodingErrorColumn.Has Encoding Error" WIDTH="500" VISIBLE="false" />
+                        <COLUMN NAME="ghidra.app.plugin.core.strings.ViewStringsTableModel$UnicodeScriptColumn.Unicode Script" WIDTH="500" VISIBLE="false" />
+                        <COLUMN NAME="ghidra.app.plugin.core.strings.ViewStringsTableModel$TranslatedValueColumn.Translated Value" WIDTH="500" VISIBLE="false" />
+                        <COLUMN NAME="ghidra.util.table.field.PreviewTableColumn.Preview" WIDTH="500" VISIBLE="false" />
+                        <COLUMN NAME="ghidra.util.table.field.AddressTableColumn.Location" WIDTH="200" VISIBLE="false" />
+                        <COLUMN NAME="ghidra.util.table.field.ByteCountProgramLocationBasedTableColumn.Byte Count" WIDTH="500" VISIBLE="false" />
+                        <COLUMN NAME="ghidra.util.table.field.EOLCommentTableColumn.EOL Comment" WIDTH="500" VISIBLE="false" />
+                        <COLUMN NAME="ghidra.util.table.field.FunctionSignatureTableColumn.Function Signature" WIDTH="200" VISIBLE="false" />
+                        <COLUMN NAME="ghidra.util.table.field.OffcutReferenceCountToAddressTableColumn.Offcut Reference Count" WIDTH="500" VISIBLE="false" />
+                        <COLUMN NAME="ghidra.util.table.field.IsFunctionNonReturningTableColumn.Non-returning" WIDTH="500" VISIBLE="false" />
+                        <COLUMN NAME="ghidra.util.table.field.BytesTableColumn.Bytes" WIDTH="500" VISIBLE="false" />
+                        <COLUMN NAME="ghidra.util.table.field.SourceTypeTableColumn.Symbol Source" WIDTH="500" VISIBLE="false" />
+                        <COLUMN NAME="ghidra.util.table.field.SymbolTypeTableColumn.Symbol Type" WIDTH="500" VISIBLE="false" />
+                        <COLUMN NAME="ghidra.util.table.field.FunctionTagTableColumn.Tags" WIDTH="500" VISIBLE="false" />
+                        <COLUMN NAME="ghidra.util.table.field.IsFunctionInlineTableColumn.Inline" WIDTH="500" VISIBLE="false" />
+                        <COLUMN NAME="ghidra.util.table.field.IsFunctionVarargsTableColumn.Varargs" WIDTH="500" VISIBLE="false" />
+                        <COLUMN NAME="ghidra.util.table.field.CodeUnitTableColumn.Code Unit" WIDTH="500" VISIBLE="false" />
+                        <COLUMN NAME="ghidra.util.table.field.LabelTableColumn.Label" WIDTH="200" VISIBLE="false" />
+                        <COLUMN NAME="ghidra.util.table.field.FunctionCallingConventionTableColumn.Function Calling Convention" WIDTH="500" VISIBLE="false" />
+                        <COLUMN NAME="ghidra.util.table.field.MemoryTypeProgramLocationBasedTableColumn.Mem Type" WIDTH="500" VISIBLE="false" />
+                        <COLUMN NAME="ghidra.util.table.field.FunctionNameTableColumn.Function Name" WIDTH="500" VISIBLE="false" />
+                        <COLUMN NAME="ghidra.util.table.field.FunctionPurgeTableColumn.Function Purge" WIDTH="500" VISIBLE="false" />
+                        <COLUMN NAME="ghidra.util.table.field.NamespaceTableColumn.Namespace" WIDTH="500" VISIBLE="false" />
+                        <COLUMN NAME="ghidra.util.table.field.ReferenceCountToAddressTableColumn.Reference Count" WIDTH="500" VISIBLE="false" />
+                        <COLUMN NAME="ghidra.util.table.field.IsFunctionCustomStorageTableColumn.Custom Storage" WIDTH="500" VISIBLE="false" />
+                        <COLUMN NAME="ghidra.util.table.field.FunctionParameterCountTableColumn.Param Count" WIDTH="500" VISIBLE="false" />
+                        <COLUMN NAME="ghidra.util.table.field.MemorySectionProgramLocationBasedTableColumn.Mem Block" WIDTH="500" VISIBLE="false" />
+                        <COLUMN NAME="ghidra.util.table.field.FunctionBodySizeTableColumn.Function Size" WIDTH="500" VISIBLE="false" />
                         <TABLE_SORT_STATE>
                             <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="0" SORT_DIRECTION="ascending" SORT_ORDER="1" />
                         </TABLE_SORT_STATE>
                     </Table_State>
                 </XML>
             </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.debug.gui.breakpoint.DebuggerBreakpointsProvider$LogicalBreakpointTableModel:Enabled:Image:Address:Length:Kinds:Locations:">
+            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.debug.gui.breakpoint.DebuggerBreakpointsProvider$LogicalBreakpointTableModel:State:Name:Address:Image:Length:Kinds:Locations:Sleigh:">
                 <XML NAME="COLUMN_DATA">
                     <Table_State>
-                        <COLUMN NAME="Enabled" WIDTH="38" VISIBLE="true" />
-                        <COLUMN NAME="Image" WIDTH="125" VISIBLE="true" />
-                        <COLUMN NAME="Address" WIDTH="61" VISIBLE="true" />
-                        <COLUMN NAME="Length" WIDTH="43" VISIBLE="true" />
-                        <COLUMN NAME="Kinds" WIDTH="61" VISIBLE="true" />
-                        <COLUMN NAME="Locations" WIDTH="123" VISIBLE="true" />
+                        <COLUMN NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel$EnumeratedDynamicTableColumn.State" WIDTH="24" VISIBLE="true" />
+                        <COLUMN NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel$EnumeratedDynamicTableColumn.Name" WIDTH="96" VISIBLE="true" />
+                        <COLUMN NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel$EnumeratedDynamicTableColumn.Address" WIDTH="96" VISIBLE="true" />
+                        <COLUMN NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel$EnumeratedDynamicTableColumn.Image" WIDTH="66" VISIBLE="true" />
+                        <COLUMN NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel$EnumeratedDynamicTableColumn.Length" WIDTH="42" VISIBLE="true" />
+                        <COLUMN NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel$EnumeratedDynamicTableColumn.Kinds" WIDTH="96" VISIBLE="true" />
+                        <COLUMN NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel$EnumeratedDynamicTableColumn.Locations" WIDTH="18" VISIBLE="true" />
+                        <COLUMN NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel$EnumeratedDynamicTableColumn.Sleigh" WIDTH="30" VISIBLE="true" />
                         <TABLE_SORT_STATE>
-                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="2" SORT_DIRECTION="ascending" SORT_ORDER="1" />
+                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="3" SORT_DIRECTION="ascending" SORT_ORDER="1" />
+                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="2" SORT_DIRECTION="ascending" SORT_ORDER="2" />
+                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="1" SORT_DIRECTION="ascending" SORT_ORDER="3" />
                         </TABLE_SORT_STATE>
                     </Table_State>
                 </XML>
             </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="docking.widgets.table.GTableFilterPanel$SortedTableModelWrapper:In Tool:Status:Filename:Description:Key Binding:Full Path:Category:">
-                <XML NAME="COLUMN_DATA">
-                    <Table_State>
-                        <COLUMN NAME="In Tool" WIDTH="50" VISIBLE="true" />
-                        <COLUMN NAME="Status" WIDTH="50" VISIBLE="true" />
-                        <COLUMN NAME="Filename" WIDTH="147" VISIBLE="true" />
-                        <COLUMN NAME="Description" WIDTH="245" VISIBLE="true" />
-                        <COLUMN NAME="Key Binding" WIDTH="100" VISIBLE="true" />
-                        <COLUMN NAME="Full Path" WIDTH="122" VISIBLE="true" />
-                        <COLUMN NAME="Category" WIDTH="122" VISIBLE="true" />
-                        <TABLE_SORT_STATE>
-                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="2" SORT_DIRECTION="ascending" SORT_ORDER="1" />
-                        </TABLE_SORT_STATE>
-                    </Table_State>
-                </XML>
-            </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel:Dynamic Address:Static Program:Static Address:Length:Shift:Lifespan:">
+            <PREFERENCE_STATE NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel:Snap:Timestamp:Event Thread:Schedule:Description:">
                 <XML NAME="COLUMN_DATA">
                     <Table_State>
-                        <COLUMN NAME="Dynamic Address" WIDTH="76" VISIBLE="true" />
-                        <COLUMN NAME="Static Program" WIDTH="76" VISIBLE="true" />
-                        <COLUMN NAME="Static Address" WIDTH="77" VISIBLE="true" />
-                        <COLUMN NAME="Length" WIDTH="76" VISIBLE="true" />
-                        <COLUMN NAME="Shift" WIDTH="77" VISIBLE="true" />
-                        <COLUMN NAME="Lifespan" WIDTH="76" VISIBLE="true" />
+                        <COLUMN NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel$EnumeratedDynamicTableColumn.Snap" WIDTH="119" VISIBLE="true" />
+                        <COLUMN NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel$EnumeratedDynamicTableColumn.Timestamp" WIDTH="279" VISIBLE="true" />
+                        <COLUMN NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel$EnumeratedDynamicTableColumn.Event Thread" WIDTH="119" VISIBLE="true" />
+                        <COLUMN NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel$EnumeratedDynamicTableColumn.Schedule" WIDTH="139" VISIBLE="true" />
+                        <COLUMN NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel$EnumeratedDynamicTableColumn.Description" WIDTH="278" VISIBLE="true" />
                         <TABLE_SORT_STATE>
                             <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="0" SORT_DIRECTION="ascending" SORT_ORDER="1" />
                         </TABLE_SORT_STATE>
                     </Table_State>
                 </XML>
             </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="docking.widgets.table.SelectColumnsDialog$SelectColumnsModel:Visible:Column Name:Is Default?:">
+            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.debug.gui.memory.DebuggerRegionsPanel$RegionTableModel:Key:Path:Name:Start:End:Length:Read:">
                 <XML NAME="COLUMN_DATA">
                     <Table_State>
-                        <COLUMN NAME="Visible" WIDTH="30" VISIBLE="true" />
-                        <COLUMN NAME="Column Name" WIDTH="179" VISIBLE="true" />
-                        <COLUMN NAME="Is Default?" WIDTH="179" VISIBLE="true" />
-                    </Table_State>
-                </XML>
-            </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.reloc.RelocationTableModel:Location:Type:Values:Original Bytes:Name:">
-                <XML NAME="COLUMN_DATA">
-                    <Table_State>
-                        <COLUMN NAME="ghidra.util.table.field.AddressTableColumn" WIDTH="87" VISIBLE="true" />
-                        <COLUMN NAME="ghidra.app.plugin.core.reloc.RelocationTableModel$RelocationTypeColumn" WIDTH="88" VISIBLE="true" />
-                        <COLUMN NAME="ghidra.app.plugin.core.reloc.RelocationTableModel$RelocationValueColumn" WIDTH="87" VISIBLE="true" />
-                        <COLUMN NAME="ghidra.app.plugin.core.reloc.RelocationTableModel$RelocationBytesColumn" WIDTH="88" VISIBLE="true" />
-                        <COLUMN NAME="ghidra.app.plugin.core.reloc.RelocationTableModel$RelocationNameColumn" WIDTH="87" VISIBLE="true" />
-                        <COLUMN NAME="ghidra.util.table.field.OffcutReferenceCountToAddressTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.ReferenceCountToAddressTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.FunctionParameterCountTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.FunctionNameTableColumn" WIDTH="75" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.BytesTableColumn" WIDTH="75" VISIBLE="false" />
+                        <COLUMN NAME="ghidra.app.plugin.core.debug.gui.memory.DebuggerRegionsPanel$RegionKeyColumn.Key" WIDTH="500" VISIBLE="false" />
+                        <COLUMN NAME="ghidra.app.plugin.core.debug.gui.memory.DebuggerRegionsPanel$RegionPathColumn.Path" WIDTH="500" VISIBLE="false" />
+                        <COLUMN NAME="ghidra.app.plugin.core.debug.gui.memory.DebuggerRegionsPanel$RegionNameColumn.Name" WIDTH="104" VISIBLE="true" />
+                        <COLUMN NAME="ghidra.app.plugin.core.debug.gui.memory.DebuggerRegionsPanel$RegionStartColumn.Start" WIDTH="104" VISIBLE="true" />
+                        <COLUMN NAME="ghidra.app.plugin.core.debug.gui.memory.DebuggerRegionsPanel$RegionEndColumn.End" WIDTH="104" VISIBLE="true" />
+                        <COLUMN NAME="ghidra.app.plugin.core.debug.gui.memory.DebuggerRegionsPanel$RegionLengthColumn.Length" WIDTH="103" VISIBLE="true" />
+                        <COLUMN NAME="ghidra.app.plugin.core.debug.gui.memory.DebuggerRegionsPanel$RegionReadColumn.Read" WIDTH="27" VISIBLE="true" />
+                        <COLUMN NAME="ghidra.app.plugin.core.debug.gui.memory.DebuggerRegionsPanel$RegionWriteColumn.Write" WIDTH="27" VISIBLE="true" />
+                        <COLUMN NAME="ghidra.app.plugin.core.debug.gui.memory.DebuggerRegionsPanel$RegionExecuteColumn.Execute" WIDTH="27" VISIBLE="true" />
                         <TABLE_SORT_STATE>
-                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="0" SORT_DIRECTION="ascending" SORT_ORDER="1" />
-                        </TABLE_SORT_STATE>
-                    </Table_State>
-                </XML>
-            </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="docking.widgets.pathmanager.PathManagerModel:Use:Path:">
-                <XML NAME="COLUMN_DATA">
-                    <Table_State>
-                        <COLUMN NAME="Use" WIDTH="50" VISIBLE="true" />
-                        <COLUMN NAME="Path" WIDTH="294" VISIBLE="true" />
-                    </Table_State>
-                </XML>
-            </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="ghidra.app.plugin.core.symtable.SymbolTableModel:Name:Location:Type:Data Type:Namespace:Source:Reference Count:">
-                <XML NAME="COLUMN_DATA">
-                    <Table_State>
-                        <COLUMN NAME="ghidra.app.plugin.core.symtable.SymbolTableModel$NameTableColumn.Name" WIDTH="200" VISIBLE="true" />
-                        <COLUMN NAME="ghidra.app.plugin.core.symtable.SymbolTableModel$LocationTableColumn.Location" WIDTH="200" VISIBLE="true" />
-                        <COLUMN NAME="ghidra.app.plugin.core.symtable.SymbolTableModel$SymbolTypeTableColumn.Type" WIDTH="199" VISIBLE="true" />
-                        <COLUMN NAME="ghidra.app.plugin.core.symtable.SymbolTableModel$DataTypeTableColumn.Data Type" WIDTH="500" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.app.plugin.core.symtable.SymbolTableModel$NamespaceTableColumn.Namespace" WIDTH="200" VISIBLE="true" />
-                        <COLUMN NAME="ghidra.app.plugin.core.symtable.SymbolTableModel$SourceTableColumn.Source" WIDTH="199" VISIBLE="true" />
-                        <COLUMN NAME="ghidra.app.plugin.core.symtable.SymbolTableModel$ReferenceCountTableColumn.Reference Count" WIDTH="200" VISIBLE="true" />
-                        <COLUMN NAME="ghidra.app.plugin.core.symtable.SymbolTableModel$OffcutReferenceCountTableColumn.Offcut Ref Count" WIDTH="199" VISIBLE="true" />
-                        <COLUMN NAME="ghidra.app.plugin.core.symtable.SymbolTableModel$PinnedTableColumn.Pinned" WIDTH="500" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.app.plugin.core.symtable.SymbolTableModel$UserTableColumn.User" WIDTH="500" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.app.plugin.core.symtable.SymbolTableModel$OriginalNameColumn.Original Imported Name" WIDTH="500" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.PreviewTableColumn.Preview" WIDTH="500" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.CodeUnitTableColumn.Code Unit" WIDTH="500" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.LabelTableColumn.Label" WIDTH="200" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.MemoryTypeProgramLocationBasedTableColumn.Mem Type" WIDTH="500" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.FunctionNameTableColumn.Function Name" WIDTH="500" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.AddressTableColumn.Location" WIDTH="200" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.ByteCountProgramLocationBasedTableColumn.Byte Count" WIDTH="500" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.NamespaceTableColumn.Namespace" WIDTH="500" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.ReferenceCountToAddressTableColumn.Reference Count" WIDTH="500" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.EOLCommentTableColumn.EOL Comment" WIDTH="500" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.FunctionParameterCountTableColumn.Param Count" WIDTH="500" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.OffcutReferenceCountToAddressTableColumn.Offcut Reference Count" WIDTH="500" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.MemorySectionProgramLocationBasedTableColumn.Mem Block" WIDTH="500" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.BytesTableColumn.Bytes" WIDTH="500" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.SourceTypeTableColumn.Symbol Source" WIDTH="500" VISIBLE="false" />
-                        <COLUMN NAME="ghidra.util.table.field.SymbolTypeTableColumn.Symbol Type" WIDTH="500" VISIBLE="false" />
-                        <TABLE_SORT_STATE>
-                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="1" SORT_DIRECTION="ascending" SORT_ORDER="1" />
-                        </TABLE_SORT_STATE>
-                    </Table_State>
-                </XML>
-            </PREFERENCE_STATE>
-            <PREFERENCE_STATE NAME="docking.widgets.table.DefaultEnumeratedColumnTableModel:Base Address:Max Address:Name:Module Name:Lifespan:Length:">
-                <XML NAME="COLUMN_DATA">
-                    <Table_State>
-                        <COLUMN NAME="Base Address" WIDTH="85" VISIBLE="true" />
-                        <COLUMN NAME="Max Address" WIDTH="84" VISIBLE="true" />
-                        <COLUMN NAME="Name" WIDTH="85" VISIBLE="true" />
-                        <COLUMN NAME="Module Name" WIDTH="85" VISIBLE="true" />
-                        <COLUMN NAME="Lifespan" WIDTH="85" VISIBLE="true" />
-                        <COLUMN NAME="Length" WIDTH="85" VISIBLE="true" />
-                        <TABLE_SORT_STATE>
-                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="0" SORT_DIRECTION="ascending" SORT_ORDER="1" />
+                            <COLUMN_SORT_STATE COLUMN_MODEL_INDEX="3" SORT_DIRECTION="ascending" SORT_ORDER="1" />
                         </TABLE_SORT_STATE>
                     </Table_State>
                 </XML>