diff --git a/README.md b/README.md
index 08e2dff9..f80170cc 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ Ensure that you match the Terminal.Gui library version you reference to the desi
 
 ## Demo
 
-![long-demo](https://github.com/gui-cs/TerminalGuiDesigner/assets/31306100/5df9f545-8c61-4655-bc0c-1e75d1c149d9)
+![long-demo](https://github.com/tui-cs/TerminalGuiDesigner/assets/31306100/5df9f545-8c61-4655-bc0c-1e75d1c149d9)
 
 ### Building
 ----------------
@@ -204,7 +204,7 @@ italics are experimental and require passing the `-e` flag when starting applica
     - [ ] Copy/Paste preserve menu entries
   - [x] ProgressBar
   - [x] OptionSelector
-  - [ ] [SplitContainer](https://github.com/gui-cs/Terminal.Gui/pull/2258) (Unreleased)
+  - [ ] [SplitContainer](https://github.com/tui-cs/Terminal.Gui/pull/2258) (Unreleased)
     - [ ] Copy/Paste preserve split content panels
   - [x] StatusBar
     - [ ] Copy/Paste preserve menu entries
diff --git a/Showcase/Text.Designer.cs b/Showcase/Text.Designer.cs
index 1cd75c98..38abd179 100644
--- a/Showcase/Text.Designer.cs
+++ b/Showcase/Text.Designer.cs
@@ -275,7 +275,7 @@ private void InitializeComponent() {
             this.link.Visible = true;
             this.link.CanFocus = true;
             this.link.ShadowStyle = null;
-            this.link.Url = "https://github.com/gui-cs/TerminalGuiDesigner";
+            this.link.Url = "https://github.com/tui-cs/TerminalGuiDesigner";
             this.link.Data = "link";
             this.link.Text = "Terminal Gui Designer Link";
             this.link.TextAlignment = Terminal.Gui.ViewBase.Alignment.Start;
diff --git a/src/UI/Editor.cs b/src/UI/Editor.cs
index 56579c05..20622776 100644
--- a/src/UI/Editor.cs
+++ b/src/UI/Editor.cs
@@ -974,7 +974,7 @@ private void CreateAndShowContextMenu(Mouse? m, Design? rightClicked)
         if (hasPropsItems)
         {
             // Also add to the submenu an 'All' version
-            // Workaround for https://github.com/gui-cs/Terminal.Gui/issues/4876 
+            // Workaround for https://github.com/tui-cs/Terminal.Gui/issues/4876 
             // Previously user could do it by selecting the root 'Properties' expandable
             // menu
             setPropsItems.Insert(0, new MenuItem() { 
@@ -993,7 +993,7 @@ private void CreateAndShowContextMenu(Mouse? m, Design? rightClicked)
                 Title = name,
                 SubMenu = new Menu(setPropsItems)
                 /*
-                 * No longer supported, see https://github.com/gui-cs/Terminal.Gui/issues/4876
+                 * No longer supported, see https://github.com/tui-cs/Terminal.Gui/issues/4876
                  * ,Action = () =>
                 {
                     if (selected.Length == 1 || rightClicked != null)
diff --git a/src/ViewExtensions.cs b/src/ViewExtensions.cs
index b4d202a1..ab27c7eb 100644
--- a/src/ViewExtensions.cs
+++ b/src/ViewExtensions.cs
@@ -99,7 +99,7 @@ public static void SetActualText(this View view, string text)
     /// keyword on this property.
     /// </para>
     /// <para>
-    /// See https://github.com/gui-cs/Terminal.Gui/issues/1619 for more info.
+    /// See https://github.com/tui-cs/Terminal.Gui/issues/1619 for more info.
     /// </para>
     /// </summary>
     /// <param name="view">The <see cref="View"/> whose text you want.</param>
diff --git a/src/ViewFactory.cs b/src/ViewFactory.cs
index 1ba7d833..1e678d1c 100644
--- a/src/ViewFactory.cs
+++ b/src/ViewFactory.cs
@@ -44,7 +44,7 @@ public static class ViewFactory
         typeof( Wizard ),
         typeof( WizardStep ),
 
-        // This is unstable when added directly as a view see https://github.com/gui-cs/Terminal.Gui/issues/3664
+        // This is unstable when added directly as a view see https://github.com/tui-cs/Terminal.Gui/issues/3664
         typeof(Shortcut),
 
         typeof(CharMap),
diff --git a/tests/MenuBarTests.cs b/tests/MenuBarTests.cs
index bb78fc98..5138bb80 100644
--- a/tests/MenuBarTests.cs
+++ b/tests/MenuBarTests.cs
@@ -547,9 +547,9 @@ public void TestMenuOperations( )
         Assume.That( OperationManager.Instance.UndoStackSize, Is.Zero );
         Assume.That( OperationManager.Instance.RedoStackSize, Is.Zero );
 
-        Assert.Warn( "MenuTracker.Instance.CurrentlyOpenMenuItem cannot be guaranteed null at this time. See https://github.com/gui-cs/TerminalGuiDesigner/issues/270" );
+        Assert.Warn( "MenuTracker.Instance.CurrentlyOpenMenuItem cannot be guaranteed null at this time. See https://github.com/tui-cs/TerminalGuiDesigner/issues/270" );
         // TODO: Enable this pre-condition once MenuTracker changes are implemented.
-        // See https://github.com/gui-cs/TerminalGuiDesigner/issues/270
+        // See https://github.com/tui-cs/TerminalGuiDesigner/issues/270
         //Assume.That( MenuTracker.Instance.CurrentlyOpenMenuItem, Is.Null );
 
         MenuTracker.Instance.Register( mbOut );