diff --git a/release-notes/docs/announcements/index.md b/release-notes/docs/announcements/index.md
index 2275f225a9c..1677264f8f2 100644
--- a/release-notes/docs/announcements/index.md
+++ b/release-notes/docs/announcements/index.md
@@ -37,6 +37,10 @@ Images of docker containers that host Dyalog running on ARM64 Linux are availabl
## Changes
+### Windows IDE Classic Mode
+
+The Windows IDE Classic Mode, which was previously enabled and customised via **Options**>**Configure**>**Trace/Edit** or the configuration parameters **ClassicMode**, **SingleTrace**, **SessionOnTop**, and **ClassicModeSavePosition** has been replaced with a pre-configuration of the Default mode. This gives a similar experience, while enabling the inline tracing interface and thread tabs in the Tracer/Debugger. You can activate this configuration via **Layout**>**Classic**, but note that you must now save the session for the changes to be saved.
+
### Defining Dfns with Unmatched Brackets
The rules around whether a function can be fixed have been tightened to prevent dfns with unmatched parentheses and brackets from being fixed. This is to accommodate array notation, which changes the meaning of parentheses and brackets that span more than one statement. TradFns will continue to fix as before, but subtle differences in how the code behaves might not be backwards-compatible and could have unexpected results.
diff --git a/release-notes/docs/new-enhanced.md b/release-notes/docs/new-enhanced.md
index 1304f6ed595..b004e96392c 100644
--- a/release-notes/docs/new-enhanced.md
+++ b/release-notes/docs/new-enhanced.md
@@ -66,8 +66,8 @@ A new variant option, **Mode**, has been added. This specifies the intended purp
- [`⎕FIX`](../../language-reference-guide/system-functions/fx/) and [`⎕FX`](../../language-reference-guide/system-functions/fx/) – Fix Script/Definition
The rules around whether a function can be fixed have been tightened to prevent dfns with unmatched parentheses and brackets from being fixed. This is to accommodate array notation, which changes the meaning of parentheses and brackets that span more than one statement. TradFns will continue to fix as before, but subtle differences in how the code behaves might not be backwards-compatible and could have unexpected results.
- !!! Hint "Hints and Recommendations"
- If the enhanced restrictions on `⎕FIX` and `⎕FX` cause problems for you, please contact [support@dyalog.com](mailto:support@dyalog.com) to discuss tools and techniques for mitigation.
+!!! Hint "Hints and Recommendations"
+ If the enhanced restrictions on `⎕FIX` and `⎕FX` cause problems for you, please contact [support@dyalog.com](mailto:support@dyalog.com) to discuss tools and techniques for mitigation.
- [`⎕MKDIR`](../../language-reference-guide/system-functions/mkdir/) – Make Directory
A new variant option, **Unique**, has been added. This specifies whether the base name in the right argument is modified so that the name is unique.
diff --git a/windows-installation-and-configuration-guide/docs/configuration-parameters/classicmode.md b/windows-installation-and-configuration-guide/docs/configuration-parameters/classicmode.md
deleted file mode 100644
index e0d21d3fa9f..00000000000
--- a/windows-installation-and-configuration-guide/docs/configuration-parameters/classicmode.md
+++ /dev/null
@@ -1,7 +0,0 @@
-ClassicMode
-
-This parameter specifies whether or not the Session operates in *Dyalog Classic mode* . The default is 0. If this parameter is set to 1, the Editor and Tracer behave in a manner that is consistent with earlier versions of Dyalog APL.
-
-Note that in this mode, a maximum of 50 Trace windows may be displayed.
-
-See also [Classic Dyalog mode](../configuring-the-ide/configuration-dialog/configuration-dialog-trace-edit-tab.md).
diff --git a/windows-installation-and-configuration-guide/docs/configuration-parameters/classicmodesaveposition.md b/windows-installation-and-configuration-guide/docs/configuration-parameters/classicmodesaveposition.md
deleted file mode 100644
index 59a0d5992a8..00000000000
--- a/windows-installation-and-configuration-guide/docs/configuration-parameters/classicmodesaveposition.md
+++ /dev/null
@@ -1,8 +0,0 @@
-ClassicModeSavePosition
-
-This parameter specifies whether or not the current size and location of the first of the editor and tracer windows are remembered for next time.
- This applies only if **ClassicMode** is 1. See [ ClassicMode](./classicmode.md).
-
-The size and location of the windows are saved in the registry in the subfolder WindowRects/EditWindow and TraceWindow.
-
-See also [Remember previous window position](../configuring-the-ide/configuration-dialog/configuration-dialog-trace-edit-tab.md).
diff --git a/windows-installation-and-configuration-guide/docs/configuration-parameters/sessionontop.md b/windows-installation-and-configuration-guide/docs/configuration-parameters/sessionontop.md
deleted file mode 100644
index f0ab15eb148..00000000000
--- a/windows-installation-and-configuration-guide/docs/configuration-parameters/sessionontop.md
+++ /dev/null
@@ -1,6 +0,0 @@
-SessionOnTop
-
-Specifies whether or not the Session may appear on top of Edit and Trace Windows in Classic Dyalog mode.
- This applies only if **ClassicMode** is 1. See [ ClassicMode](./classicmode.md).
-
-See also [Allow session above edit windows](../configuring-the-ide/configuration-dialog/configuration-dialog-trace-edit-tab.md).
diff --git a/windows-installation-and-configuration-guide/docs/configuration-parameters/singletrace.md b/windows-installation-and-configuration-guide/docs/configuration-parameters/singletrace.md
deleted file mode 100644
index aa792595633..00000000000
--- a/windows-installation-and-configuration-guide/docs/configuration-parameters/singletrace.md
+++ /dev/null
@@ -1,6 +0,0 @@
-SingleTrace
-
-Specifies whether there is a single Trace window, or one Trace window per function.
- This applies only if **ClassicMode** is 1. See [ ClassicMode](./classicmode.md).
-
-See also [Single trace window](../configuring-the-ide/configuration-dialog/configuration-dialog-trace-edit-tab.md).
diff --git a/windows-installation-and-configuration-guide/docs/configuring-the-ide/configuration-dialog/configuration-dialog-trace-edit-tab.md b/windows-installation-and-configuration-guide/docs/configuring-the-ide/configuration-dialog/configuration-dialog-trace-edit-tab.md
index ed3f92b7138..f8a1e3cc708 100644
--- a/windows-installation-and-configuration-guide/docs/configuring-the-ide/configuration-dialog/configuration-dialog-trace-edit-tab.md
+++ b/windows-installation-and-configuration-guide/docs/configuring-the-ide/configuration-dialog/configuration-dialog-trace-edit-tab.md
@@ -6,10 +6,10 @@ Table: Configuration dialog: Trace/Edit
|Label|Parameter|Description|
|---|---|---|
-|Classic Dyalog mode|[ClassicMode](../../configuration-parameters/classicmode.md)|Selects pre-Version 9 behaviour for Edit and Trace windows.|
-|Allow session above edit windows|[SessionOnTop](../../configuration-parameters/sessionontop.md)|Specifies whether or not the Session may appear on top of Edit and Trace Windows|
-|Single trace window|[ SingleTrace](../../configuration-parameters/singletrace.md)|Specifies whether or not there is a single Trace window|
-|Remember previous window position|[ClassicModeSavePosition](../../configuration-parameters/classicmodesaveposition.md)|Specifies whether or not the current size and location of the first of the editor and tracer windows are remembered in the registry for next time.|
+|Classic Dyalog mode| | These options have been replaced with a pre-configuration of the Default mode, giving a similar experience. You can activate this configuration via **Layout**>**Classic**, but note that you must save the session for the changes to be saved. |
+|Allow session above edit windows| | |
+|Single trace window| | |
+|Remember previous window position| |_ - _|
|Allow floating edit windows|[DockableEditWindows](../../configuration-parameters/dockableeditwindows.md)|Allows individual Edit windows to be undocked from (and re-docked in) the main Edit window|
|Show status bars|[ StatusOnEdit](../../configuration-parameters/statusonedit.md)|Specifies whether or not status bars are displayed along the bottom of individual Edit windows|
|Show tool bars|[ ToolBarsOnEdit](../../configuration-parameters/toolbarsonedit.md)|Specifies whether or not tool bars are displayed along the top of individual Edit windows|
diff --git a/windows-ui-guide/docs/editor.md b/windows-ui-guide/docs/editor.md
index a1c58f82779..2f3e0c8caec 100644
--- a/windows-ui-guide/docs/editor.md
+++ b/windows-ui-guide/docs/editor.md
@@ -14,50 +14,44 @@ If the name is not already being edited, it is assigned a new edit window. If yo
If the name is followed by a line-number in square brackets, for example, `MyFn[1000]`, the Editor will position the cursor on the specified line. This applies to all methods of invoking the Editor, except `⎕ED`. There must not be a space between the last character of the name and the "[".
-## Window Management (Standard)
+## Window Management
-Unless *Classic Dyalog mode* is selected (*Options/Configure/Trace/Edit*), the Editor is a Multiple Document Interface (MDI) window that may be a stand-alone window, or be docked in the Session window. Each of the objects being edited is displayed in a separate sub-window. Individual edit windows are managed using standard MDI facilities.
+By default, the Session has an Editor windows which is docked along the right edge of the Session window. When you edit a function, the Editor window automatically springs into view as illustrated below.
-
+
-The first edit sub-window window is created at the position specified by the **edit_first_y** and **edit_first_x** parameters which are specified in terms of the size of a character in the current font relative to the top-left corner of the main Editor window. Subsequent ones are staggered according to the values of the **edit_offset_y** and **edit_offset_x** parameters.
+A functionally identical interface, especially suitable for wide screens, can be configured via **Layout**>**Debugger on the left**. As an alternative, **Layout**>**Classic** removes the Editor window, instead opening objects in individual edit windows. The default configuration can be restored via **Layout**>**Debugger at the bottom**. See below for details on the different configurations.
-The initial size of an edit window is specified by the **edit_rows** and **edit_cols** parameters.
+Independently of the editing configuration, the first edited object opens in an edit window window at the position specified by the **edit_first_y** and **edit_first_x** parameters which are specified in terms of the size of a character in the current font relative to the top-left corner of the main Editor window or, if this windows was removed, the screen. Subsequent ones are staggered according to the values of the **edit_offset_y** and **edit_offset_x** parameters.
-Note that the blue triangles indicate that the line of text is longer than can be displayed in the current Edit window.
+
-By default, the Session has the Editor docked along the right edge of the Session window. When you edit a function, the Editor window automatically springs into view as illustrated below.
+Note that a triangle at the end of a line indicates that the line is longer than can be displayed in the current edit window. Click and hold the left mouse button on such a triangle to show the full line in a pop-up.
-
+The initial size of an edit window is specified by the **edit_rows** and **edit_cols** parameters.
-
+### Classic Layout
-You can resize the Editor pane to view more or less of the Session itself, by dragging its title bar.
+This configuration is set via **Layout**>**Classic**. It removes the Editor window and instead displays each object in a separate window, as if they had been undocked from the Editor. Note that these edit windows cannot be docked anywhere. Each window has the full functionality of the Editor, and all settings and documentation for the Editor are also relevant for these object windows.
-Using the buttons in the title bar, you can instantly maximise the Editor pane to allow you to concentrate on editing, or minimise it to reveal the entire Session. In either case, the restore button quickly restores the 2-pane layout.
+### Debugger at the bottom/on the left Layout
-The picture below shows the effect of maximising the Editor. The `BUILD_SESSION` edit window is itself maximised within the Editor too.
+These configurations are set via **Layout**>**Debugger at the bottom** and **Layout**>**Debugger on the left**. They provide a single Editor in the form of a Multiple Document Interface (MDI) window that may be a stand-alone window, or be docked in the Session window, as seen in the pictures below. Each of the objects being edited is displayed in a separate sub-window. Individual edit windows are managed using standard MDI facilities, and can be undocked and redocked in the Editor window, but not directly in the Session window.
-
-
-Note that when the Editor has the focus, the Editor menubar is displayed in place of the Session menubar.
-
-## Window Management (Classic Dyalog mode)
+
-If *Classic Dyalog mode* is selected (*Options/Configure/Trace/Edit*) each Edit window is a top-level window created as a child of the Session window. This means that normally Edit windows appear on top of the Session. However, if the **SessionOnTop** parameter is set, the Session window, when given the focus, will appear on top of Edit windows.
-When the first Edit window is opened, its position is determined as follows:
+
-- If the **ClassicModeSavePosition** parameter is set, the first Edit window is displayed at the position that was previously occupied by the most recently saved Edit window.
-- If not, the first edit window is created at the position specified by the **edit_first_y** and **edit_first_x** parameters which are specified in terms of the size of a character in the current font relative to the top-left corner of the screen.
+You can resize the Editor pane to view more or less of the Session itself, by dragging the border between its title bar and the Session pane.
-The initial size of an edit window is specified by the **edit_rows** and **edit_cols** parameters.
+Using the buttons in the title bar, you can instantly maximise the Editor pane to allow you to concentrate on editing, or minimise it to reveal the entire Session. In either case, the restore button quickly restores the 2-pane layout.
-
+The picture below shows the effect of maximising the Editor. The `BUILD_SESSION` edit window is itself maximised within the Editor too.
-Subsequent ones are staggered according to the values of the **edit_offset_y** and **edit_offset_x** parameters.
+
-
+Note that when the Editor is docked and has the focus, the Editor menubar is displayed in place of the Session menubar.
### Moving around an edit window