diff --git a/doc/classes/Basis.xml b/doc/classes/Basis.xml
index 8b2a0c337..610399bb2 100644
--- a/doc/classes/Basis.xml
+++ b/doc/classes/Basis.xml
@@ -15,7 +15,7 @@
 		<link title="Using 3D transforms">$DOCS_URL/tutorials/3d/using_transforms.md</link>
 		<link title="Matrix Transform Demo">https://godotengine.org/asset-library/asset/584</link>
 		<link title="3D Platformer Demo">$DOCS_URL/07_demo_projects/3d/platformer</link>
-		<link title="3D Voxel Demo">https://godotengine.org/asset-library/asset/676</link>
+		<link title="3D Voxel Demo">$DOCS_URL/07_demo_projects/3d/voxel</link>
 		<link title="2.5D Demo">https://godotengine.org/asset-library/asset/583</link>
 	</tutorials>
 	<methods>
diff --git a/doc/classes/BoxShape.xml b/doc/classes/BoxShape.xml
index c52fe4d71..408b6a564 100644
--- a/doc/classes/BoxShape.xml
+++ b/doc/classes/BoxShape.xml
@@ -7,8 +7,8 @@
 		3D box shape that can be a child of a [PhysicsBody] or [Area].
 	</description>
 	<tutorials>
-		<link title="3D Physics Tests Demo">https://godotengine.org/asset-library/asset/675</link>
-		<link title="3D Kinematic Character Demo">https://godotengine.org/asset-library/asset/126</link>
+		<link title="3D Physics Tests Demo">$DOCS_URL/07_demo_projects/3d/physics_tests</link>
+		<link title="3D Kinematic Character Demo">$DOCS_URL/07_demo_projects/3d/kinematic_character</link>
 		<link title="3D Platformer Demo">$DOCS_URL/07_demo_projects/3d/platformer</link>
 	</tutorials>
 	<methods>
diff --git a/doc/classes/Button.xml b/doc/classes/Button.xml
index b7dd664a8..88ac940f0 100644
--- a/doc/classes/Button.xml
+++ b/doc/classes/Button.xml
@@ -22,7 +22,7 @@
 	</description>
 	<tutorials>
 		<link title="2D Dodge The Creeps Demo">$DOCS_URL/07_demo_projects/2d/dodge_the_creeps</link>
-		<link title="OS Test Demo">https://godotengine.org/asset-library/asset/677</link>
+		<link title="OS Test Demo">$DOCS_URL/07_demo_projects/misc/os_test</link>
 	</tutorials>
 	<methods>
 	</methods>
diff --git a/doc/classes/Camera2D.xml b/doc/classes/Camera2D.xml
index 6efe28810..749ada70f 100644
--- a/doc/classes/Camera2D.xml
+++ b/doc/classes/Camera2D.xml
@@ -10,8 +10,8 @@
 	</description>
 	<tutorials>
 		<link title="2D Platformer Demo">$DOCS_URL/07_demo_projects/2d/platformer</link>
-		<link title="2D Isometric Demo">https://godotengine.org/asset-library/asset/112</link>
-		<link title="2D HDR Demo">https://godotengine.org/asset-library/asset/110</link>
+		<link title="2D Isometric Demo">$DOCS_URL/07_demo_projects/2d/isometric</link>
+		<link title="2D HDR Demo">$DOCS_URL/07_demo_projects/2d/hdr</link>
 	</tutorials>
 	<methods>
 		<method name="align">
diff --git a/doc/classes/CanvasItem.xml b/doc/classes/CanvasItem.xml
index cb2342fb4..714f61cb5 100644
--- a/doc/classes/CanvasItem.xml
+++ b/doc/classes/CanvasItem.xml
@@ -12,8 +12,8 @@
 		[b]Note:[/b] Unless otherwise specified, all methods that have angle parameters must have angles specified as [i]radians[/i]. To convert degrees to radians, use [method @GDScript.deg2rad].
 	</description>
 	<tutorials>
-		<link title="Viewport and canvas transforms">$DOCS_URL/tutorials/2d/2d_transforms.md</link>
-		<link title="Custom drawing in 2D">$DOCS_URL/tutorials/2d/custom_drawing_in_2d.md</link>
+		<link title="Viewport and canvas transforms">$DOCS_URL/03_usage/02_2d/02_2d_transforms.md</link>
+		<link title="Custom drawing in 2D">$DOCS_URL/03_usage/02_2d/07_custom_drawing_in_2d.md</link>
 		<link title="Audio Spectrum Demo">$DOCS_URL/07_demo_projects/audio/spectrum</link>
 	</tutorials>
 	<methods>
diff --git a/doc/classes/CanvasLayer.xml b/doc/classes/CanvasLayer.xml
index bb25ea17d..337f68a38 100644
--- a/doc/classes/CanvasLayer.xml
+++ b/doc/classes/CanvasLayer.xml
@@ -7,8 +7,8 @@
 		Canvas drawing layer. [CanvasItem] nodes that are direct or indirect children of a [CanvasLayer] will be drawn in that layer. The layer is a numeric index that defines the draw order. The default 2D scene renders with index 0, so a [CanvasLayer] with index -1 will be drawn below, and one with index 1 will be drawn above. This is very useful for HUDs (in layer 1+ or above), or backgrounds (in layer -1 or below).
 	</description>
 	<tutorials>
-		<link title="Viewport and canvas transforms">$DOCS_URL/tutorials/2d/2d_transforms.md</link>
-		<link title="Canvas layers">$DOCS_URL/tutorials/2d/canvas_layers.md</link>
+		<link title="Viewport and canvas transforms">$DOCS_URL/03_usage/02_2d/02_2d_transforms.md</link>
+		<link title="Canvas layers">$DOCS_URL/03_usage/02_2d/01_canvas_layers.md</link>
 		<link title="2D Dodge The Creeps Demo">$DOCS_URL/07_demo_projects/2d/dodge_the_creeps</link>
 	</tutorials>
 	<methods>
diff --git a/doc/classes/CapsuleShape.xml b/doc/classes/CapsuleShape.xml
index d2b7ff317..d38ef9b72 100644
--- a/doc/classes/CapsuleShape.xml
+++ b/doc/classes/CapsuleShape.xml
@@ -7,7 +7,7 @@
 		Capsule shape for collisions.
 	</description>
 	<tutorials>
-		<link title="3D Physics Tests Demo">https://godotengine.org/asset-library/asset/675</link>
+		<link title="3D Physics Tests Demo">$DOCS_URL/07_demo_projects/3d/physics_tests</link>
 	</tutorials>
 	<methods>
 	</methods>
diff --git a/doc/classes/CollisionShape.xml b/doc/classes/CollisionShape.xml
index c68438a98..3e5946f0c 100644
--- a/doc/classes/CollisionShape.xml
+++ b/doc/classes/CollisionShape.xml
@@ -9,8 +9,8 @@
 		[b]Warning:[/b] A non-uniformly scaled CollisionShape3D node will probably not function as expected. Please make sure to keep its scale uniform (i.e. the same on all axes), and change the size of its [member shape] resource instead.
 	</description>
 	<tutorials>
-		<link title="Physics introduction">$DOCS_URL/tutorials/physics/physics_introduction.md</link>
-		<link title="3D Kinematic Character Demo">https://godotengine.org/asset-library/asset/126</link>
+		<link title="Physics introduction">$DOCS_URL/03_usage/10_physics/01_physics_introduction.md</link>
+		<link title="3D Kinematic Character Demo">$DOCS_URL/07_demo_projects/3d/kinematic_character</link>
 		<link title="3D Platformer Demo">$DOCS_URL/07_demo_projects/3d/platformer</link>
 	</tutorials>
 	<methods>
diff --git a/doc/classes/CollisionShape2D.xml b/doc/classes/CollisionShape2D.xml
index c2ee4c7a5..18d7b623f 100644
--- a/doc/classes/CollisionShape2D.xml
+++ b/doc/classes/CollisionShape2D.xml
@@ -8,7 +8,7 @@
 		You can use this node to represent all sorts of collision shapes, for example, add this to an [Area2D] to give it a detection shape, or add it to a [PhysicsBody2D] to create a solid object.
 	</description>
 	<tutorials>
-		<link title="Physics introduction">$DOCS_URL/tutorials/physics/physics_introduction.md</link>
+		<link title="Physics introduction">$DOCS_URL/03_usage/10_physics/01_physics_introduction.md</link>
 		<link title="2D Dodge The Creeps Demo">$DOCS_URL/07_demo_projects/2d/dodge_the_creeps</link>
 		<link title="2D Pong Demo">$DOCS_URL/07_demo_projects/2d/pong</link>
 		<link title="2D Kinematic Character Demo">$DOCS_URL/07_demo_projects/2d/kinematic_character</link>
diff --git a/doc/classes/Color.xml b/doc/classes/Color.xml
index f45b67da3..aea04daca 100644
--- a/doc/classes/Color.xml
+++ b/doc/classes/Color.xml
@@ -11,9 +11,9 @@
 		[url=https://raw.githubusercontent.com/godotengine/godot-docs/master/img/color_constants.png]Color constants cheatsheet[/url]
 	</description>
 	<tutorials>
-		<link title="2D GD Paint Demo">https://godotengine.org/asset-library/asset/517</link>
-		<link title="Tween Demo">https://godotengine.org/asset-library/asset/146</link>
-		<link title="GUI Drag And Drop Demo">https://godotengine.org/asset-library/asset/133</link>
+		<link title="2D GD Paint Demo">$DOCS_URL/07_demo_projects/2d/gd_paint</link>
+		<link title="Tween Demo">$DOCS_URL/07_demo_projects/2d/tween</link>
+		<link title="GUI Drag And Drop Demo">$DOCS_URL/07_demo_projects/gui/drag_and_drop</link>
 	</tutorials>
 	<methods>
 		<method name="Color">
diff --git a/doc/classes/ColorPicker.xml b/doc/classes/ColorPicker.xml
index 94f0b2622..5bfd3fecf 100644
--- a/doc/classes/ColorPicker.xml
+++ b/doc/classes/ColorPicker.xml
@@ -8,7 +8,7 @@
 		[b]Note:[/b] This control is the color picker widget itself. You can use a [ColorPickerButton] instead if you need a button that brings up a [ColorPicker] in a pop-up.
 	</description>
 	<tutorials>
-		<link title="Tween Demo">https://godotengine.org/asset-library/asset/146</link>
+		<link title="Tween Demo">$DOCS_URL/07_demo_projects/2d/tween</link>
 	</tutorials>
 	<methods>
 		<method name="add_preset">
diff --git a/doc/classes/ColorPickerButton.xml b/doc/classes/ColorPickerButton.xml
index 7492eb976..73cf14f77 100644
--- a/doc/classes/ColorPickerButton.xml
+++ b/doc/classes/ColorPickerButton.xml
@@ -9,8 +9,8 @@
 		[b]Note:[/b] By default, the button may not be wide enough for the color preview swatch to be visible. Make sure to set [member Control.rect_min_size] to a big enough value to give the button enough space.
 	</description>
 	<tutorials>
-		<link title="GUI Drag And Drop Demo">https://godotengine.org/asset-library/asset/133</link>
-		<link title="2D GD Paint Demo">https://godotengine.org/asset-library/asset/517</link>
+		<link title="GUI Drag And Drop Demo">$DOCS_URL/07_demo_projects/gui/drag_and_drop</link>
+		<link title="2D GD Paint Demo">$DOCS_URL/07_demo_projects/2d/gd_paint</link>
 	</tutorials>
 	<methods>
 		<method name="get_picker">
diff --git a/doc/classes/ConcavePolygonShape.xml b/doc/classes/ConcavePolygonShape.xml
index 725f68d52..130580ea3 100644
--- a/doc/classes/ConcavePolygonShape.xml
+++ b/doc/classes/ConcavePolygonShape.xml
@@ -9,7 +9,7 @@
 		[b]Warning:[/b] Using this shape for an [Area] (via a [CollisionShape] node, created e.g. by using the [i]Create Trimesh Collision Sibling[/i] option in the [i]Mesh[/i] menu that appears when selecting a [MeshInstance] node) may give unexpected results: when using Godot Physics, the area will only detect collisions with the triangle faces in the [ConcavePolygonShape] (and not with any "inside" of the shape, for example), and when using Bullet Physics the area will not detect any collisions with the concave shape at all (this is a known bug).
 	</description>
 	<tutorials>
-		<link title="3D Physics Tests Demo">https://godotengine.org/asset-library/asset/675</link>
+		<link title="3D Physics Tests Demo">$DOCS_URL/07_demo_projects/3d/physics_tests</link>
 	</tutorials>
 	<methods>
 		<method name="get_faces" qualifiers="const">
diff --git a/doc/classes/Control.xml b/doc/classes/Control.xml
index 4f87245f9..df4e7b5cf 100644
--- a/doc/classes/Control.xml
+++ b/doc/classes/Control.xml
@@ -15,7 +15,7 @@
 	</description>
 	<tutorials>
 		<link title="GUI tutorial index">$DOCS_URL/tutorials/ui/index.md</link>
-		<link title="Custom drawing in 2D">$DOCS_URL/tutorials/2d/custom_drawing_in_2d.md</link>
+		<link title="Custom drawing in 2D">$DOCS_URL/03_usage/02_2d/07_custom_drawing_in_2d.md</link>
 		<link title="Control node gallery">$DOCS_URL/tutorials/ui/control_node_gallery.md</link>
 		<link title="All GUI Demos">https://github.com/Relintai/pandemonium_demo_projects/tree/master/gui</link>
 	</tutorials>
diff --git a/doc/classes/ConvexPolygonShape.xml b/doc/classes/ConvexPolygonShape.xml
index fef25f216..b483e56dd 100644
--- a/doc/classes/ConvexPolygonShape.xml
+++ b/doc/classes/ConvexPolygonShape.xml
@@ -7,7 +7,7 @@
 		Convex polygon shape resource, which can be added to a [PhysicsBody] or area.
 	</description>
 	<tutorials>
-		<link title="3D Physics Tests Demo">https://godotengine.org/asset-library/asset/675</link>
+		<link title="3D Physics Tests Demo">$DOCS_URL/07_demo_projects/3d/physics_tests</link>
 	</tutorials>
 	<methods>
 	</methods>
diff --git a/doc/classes/CylinderShape.xml b/doc/classes/CylinderShape.xml
index 742cbec9c..b17ade229 100644
--- a/doc/classes/CylinderShape.xml
+++ b/doc/classes/CylinderShape.xml
@@ -7,8 +7,8 @@
 		Cylinder shape for collisions.
 	</description>
 	<tutorials>
-		<link title="3D Physics Tests Demo">https://godotengine.org/asset-library/asset/675</link>
-		<link title="3D Voxel Demo">https://godotengine.org/asset-library/asset/676</link>
+		<link title="3D Physics Tests Demo">$DOCS_URL/07_demo_projects/3d/physics_tests</link>
+		<link title="3D Voxel Demo">$DOCS_URL/07_demo_projects/3d/voxel</link>
 	</tutorials>
 	<methods>
 	</methods>
diff --git a/doc/classes/Dictionary.xml b/doc/classes/Dictionary.xml
index 98a96bf56..750eb07da 100644
--- a/doc/classes/Dictionary.xml
+++ b/doc/classes/Dictionary.xml
@@ -85,8 +85,8 @@
 	</description>
 	<tutorials>
 		<link title="GDScript basics: Dictionary">$DOCS_URL/tutorials/scripting/gdscript/gdscript_basics.html#dictionary</link>
-		<link title="3D Voxel Demo">https://godotengine.org/asset-library/asset/676</link>
-		<link title="OS Test Demo">https://godotengine.org/asset-library/asset/677</link>
+		<link title="3D Voxel Demo">$DOCS_URL/07_demo_projects/3d/voxel</link>
+		<link title="OS Test Demo">$DOCS_URL/07_demo_projects/misc/os_test</link>
 	</tutorials>
 	<methods>
 		<method name="clear">
diff --git a/doc/classes/DynamicFont.xml b/doc/classes/DynamicFont.xml
index 733c508da..edbd2c222 100644
--- a/doc/classes/DynamicFont.xml
+++ b/doc/classes/DynamicFont.xml
@@ -15,7 +15,7 @@
 		[b]Note:[/b] DynamicFont doesn't support features such as kerning, right-to-left typesetting, ligatures, text shaping, variable fonts and optional font features yet. If you wish to "bake" an optional font feature into a TTF font file, you can use [url=https://fontforge.org/]FontForge[/url] to do so. In FontForge, use [b]File &gt; Generate Fonts[/b], click [b]Options[/b], choose the desired features then generate the font.
 	</description>
 	<tutorials>
-		<link title="3D Voxel Demo">https://godotengine.org/asset-library/asset/676</link>
+		<link title="3D Voxel Demo">$DOCS_URL/07_demo_projects/3d/voxel</link>
 	</tutorials>
 	<methods>
 		<method name="add_fallback">
diff --git a/doc/classes/DynamicFontData.xml b/doc/classes/DynamicFontData.xml
index 4de890c93..4c1083f70 100644
--- a/doc/classes/DynamicFontData.xml
+++ b/doc/classes/DynamicFontData.xml
@@ -7,7 +7,7 @@
 		Used with [DynamicFont] to describe the location of a vector font file for dynamic rendering at runtime.
 	</description>
 	<tutorials>
-		<link title="3D Voxel Demo">https://godotengine.org/asset-library/asset/676</link>
+		<link title="3D Voxel Demo">$DOCS_URL/07_demo_projects/3d/voxel</link>
 	</tutorials>
 	<methods>
 	</methods>
diff --git a/doc/classes/Environment3D.xml b/doc/classes/Environment3D.xml
index 15da1ca23..24b6870b3 100644
--- a/doc/classes/Environment3D.xml
+++ b/doc/classes/Environment3D.xml
@@ -19,7 +19,7 @@
 		<link title="Environment3D and post-processing">$DOCS_URL/tutorials/3d/environment_and_post_processing.md</link>
 		<link title="Light transport in game engines">$DOCS_URL/tutorials/3d/high_dynamic_range.md</link>
 		<link title="3D Material Testers Demo">https://godotengine.org/asset-library/asset/123</link>
-		<link title="2D HDR Demo">https://godotengine.org/asset-library/asset/110</link>
+		<link title="2D HDR Demo">$DOCS_URL/07_demo_projects/2d/hdr</link>
 	</tutorials>
 	<methods>
 		<method name="is_glow_level_enabled" qualifiers="const">
diff --git a/doc/classes/File.xml b/doc/classes/File.xml
index 7a6e6fd56..9533c13e7 100644
--- a/doc/classes/File.xml
+++ b/doc/classes/File.xml
@@ -26,7 +26,7 @@
 	</description>
 	<tutorials>
 		<link title="File system">$DOCS_URL/tutorials/scripting/filesystem.md</link>
-		<link title="3D Voxel Demo">https://godotengine.org/asset-library/asset/676</link>
+		<link title="3D Voxel Demo">$DOCS_URL/07_demo_projects/3d/voxel</link>
 	</tutorials>
 	<methods>
 		<method name="close">
diff --git a/doc/classes/GridContainer.xml b/doc/classes/GridContainer.xml
index c67fa123a..ca1940815 100644
--- a/doc/classes/GridContainer.xml
+++ b/doc/classes/GridContainer.xml
@@ -10,7 +10,7 @@
 	</description>
 	<tutorials>
 		<link title="GUI containers">$DOCS_URL/03_usage/04_ui/02_gui_containers.md</link>
-		<link title="OS Test Demo">https://godotengine.org/asset-library/asset/677</link>
+		<link title="OS Test Demo">$DOCS_URL/07_demo_projects/misc/os_test</link>
 	</tutorials>
 	<methods>
 	</methods>
diff --git a/doc/classes/Input.xml b/doc/classes/Input.xml
index a2bdacae0..70a3f9d44 100644
--- a/doc/classes/Input.xml
+++ b/doc/classes/Input.xml
@@ -9,7 +9,7 @@
 	<tutorials>
 		<link title="Inputs tutorial index">$DOCS_URL/tutorials/inputs/index.md</link>
 		<link title="2D Dodge The Creeps Demo">$DOCS_URL/07_demo_projects/2d/dodge_the_creeps</link>
-		<link title="3D Voxel Demo">https://godotengine.org/asset-library/asset/676</link>
+		<link title="3D Voxel Demo">$DOCS_URL/07_demo_projects/3d/voxel</link>
 	</tutorials>
 	<methods>
 		<method name="action_press">
diff --git a/doc/classes/InputEvent.xml b/doc/classes/InputEvent.xml
index 9cedd0f3f..f3895e12f 100644
--- a/doc/classes/InputEvent.xml
+++ b/doc/classes/InputEvent.xml
@@ -8,9 +8,9 @@
 	</description>
 	<tutorials>
 		<link title="InputEvent">$DOCS_URL/tutorials/inputs/inputevent.md</link>
-		<link title="Viewport and canvas transforms">$DOCS_URL/tutorials/2d/2d_transforms.md</link>
+		<link title="Viewport and canvas transforms">$DOCS_URL/03_usage/02_2d/02_2d_transforms.md</link>
 		<link title="2D Dodge The Creeps Demo">$DOCS_URL/07_demo_projects/2d/dodge_the_creeps</link>
-		<link title="3D Voxel Demo">https://godotengine.org/asset-library/asset/676</link>
+		<link title="3D Voxel Demo">$DOCS_URL/07_demo_projects/3d/voxel</link>
 	</tutorials>
 	<methods>
 		<method name="accumulate">
diff --git a/doc/classes/InputEventAction.xml b/doc/classes/InputEventAction.xml
index 892add6a9..db89e6a46 100644
--- a/doc/classes/InputEventAction.xml
+++ b/doc/classes/InputEventAction.xml
@@ -9,7 +9,7 @@
 	<tutorials>
 		<link title="InputEvent: Actions">$DOCS_URL/tutorials/inputs/inputevent.html#actions</link>
 		<link title="2D Dodge The Creeps Demo">$DOCS_URL/07_demo_projects/2d/dodge_the_creeps</link>
-		<link title="3D Voxel Demo">https://godotengine.org/asset-library/asset/676</link>
+		<link title="3D Voxel Demo">$DOCS_URL/07_demo_projects/3d/voxel</link>
 	</tutorials>
 	<methods>
 	</methods>
diff --git a/doc/classes/InputEventMouseMotion.xml b/doc/classes/InputEventMouseMotion.xml
index a2a93d63a..04da7a119 100644
--- a/doc/classes/InputEventMouseMotion.xml
+++ b/doc/classes/InputEventMouseMotion.xml
@@ -10,7 +10,7 @@
 	</description>
 	<tutorials>
 		<link title="Mouse and input coordinates">$DOCS_URL/tutorials/inputs/mouse_and_input_coordinates.md</link>
-		<link title="3D Voxel Demo">https://godotengine.org/asset-library/asset/676</link>
+		<link title="3D Voxel Demo">$DOCS_URL/07_demo_projects/3d/voxel</link>
 	</tutorials>
 	<methods>
 	</methods>
diff --git a/doc/classes/KinematicBody.xml b/doc/classes/KinematicBody.xml
index 1941fe783..f0e8dd345 100644
--- a/doc/classes/KinematicBody.xml
+++ b/doc/classes/KinematicBody.xml
@@ -11,9 +11,9 @@
 	</description>
 	<tutorials>
 		<link title="Kinematic character (2D)">$DOCS_URL/tutorials/physics/kinematic_character_2d.md</link>
-		<link title="3D Kinematic Character Demo">https://godotengine.org/asset-library/asset/126</link>
+		<link title="3D Kinematic Character Demo">$DOCS_URL/07_demo_projects/3d/kinematic_character</link>
 		<link title="3D Platformer Demo">$DOCS_URL/07_demo_projects/3d/platformer</link>
-		<link title="3D Voxel Demo">https://godotengine.org/asset-library/asset/676</link>
+		<link title="3D Voxel Demo">$DOCS_URL/07_demo_projects/3d/voxel</link>
 	</tutorials>
 	<methods>
 		<method name="get_axis_lock" qualifiers="const">
diff --git a/doc/classes/Mesh.xml b/doc/classes/Mesh.xml
index 6c13acddf..ee87204fc 100644
--- a/doc/classes/Mesh.xml
+++ b/doc/classes/Mesh.xml
@@ -8,7 +8,7 @@
 	</description>
 	<tutorials>
 		<link title="3D Material Testers Demo">https://godotengine.org/asset-library/asset/123</link>
-		<link title="3D Kinematic Character Demo">https://godotengine.org/asset-library/asset/126</link>
+		<link title="3D Kinematic Character Demo">$DOCS_URL/07_demo_projects/3d/kinematic_character</link>
 		<link title="3D Platformer Demo">$DOCS_URL/07_demo_projects/3d/platformer</link>
 	</tutorials>
 	<methods>
diff --git a/doc/classes/MeshInstance.xml b/doc/classes/MeshInstance.xml
index c3bdae755..ad2afb59e 100644
--- a/doc/classes/MeshInstance.xml
+++ b/doc/classes/MeshInstance.xml
@@ -8,7 +8,7 @@
 	</description>
 	<tutorials>
 		<link title="3D Material Testers Demo">https://godotengine.org/asset-library/asset/123</link>
-		<link title="3D Kinematic Character Demo">https://godotengine.org/asset-library/asset/126</link>
+		<link title="3D Kinematic Character Demo">$DOCS_URL/07_demo_projects/3d/kinematic_character</link>
 		<link title="3D Platformer Demo">$DOCS_URL/07_demo_projects/3d/platformer</link>
 	</tutorials>
 	<methods>
diff --git a/doc/classes/Node2D.xml b/doc/classes/Node2D.xml
index 36b40937c..8a0f0c92c 100644
--- a/doc/classes/Node2D.xml
+++ b/doc/classes/Node2D.xml
@@ -7,7 +7,7 @@
 		A 2D game object, with a transform (position, rotation, and scale). All 2D nodes, including physics objects and sprites, inherit from Node2D. Use Node2D as a parent node to move, scale and rotate children in a 2D project. Also gives control of the node's render order.
 	</description>
 	<tutorials>
-		<link title="Custom drawing in 2D">$DOCS_URL/tutorials/2d/custom_drawing_in_2d.md</link>
+		<link title="Custom drawing in 2D">$DOCS_URL/03_usage/02_2d/07_custom_drawing_in_2d.md</link>
 		<link title="All 2D Demos">https://github.com/Relintai/pandemonium_demo_projects/tree/master/2d</link>
 	</tutorials>
 	<methods>
diff --git a/doc/classes/OS.xml b/doc/classes/OS.xml
index 330601e62..9e5c33cc8 100644
--- a/doc/classes/OS.xml
+++ b/doc/classes/OS.xml
@@ -7,7 +7,7 @@
 		Operating System functions. OS wraps the most common functionality to communicate with the host operating system, such as the clipboard, video driver, date and time, timers, environment variables, execution of binaries, command line, etc.
 	</description>
 	<tutorials>
-		<link title="OS Test Demo">https://godotengine.org/asset-library/asset/677</link>
+		<link title="OS Test Demo">$DOCS_URL/07_demo_projects/misc/os_test</link>
 	</tutorials>
 	<methods>
 		<method name="alert">
diff --git a/doc/classes/Physics2DDirectBodyState.xml b/doc/classes/Physics2DDirectBodyState.xml
index 729ce7458..27827e0fb 100644
--- a/doc/classes/Physics2DDirectBodyState.xml
+++ b/doc/classes/Physics2DDirectBodyState.xml
@@ -7,7 +7,7 @@
 		Provides direct access to a physics body in the [Physics2DServer], allowing safe changes to physics properties. This object is passed via the direct state callback of rigid/character bodies, and is intended for changing the direct state of that body. See [method RigidBody2D._integrate_forces].
 	</description>
 	<tutorials>
-		<link title="Physics introduction">$DOCS_URL/tutorials/physics/physics_introduction.md</link>
+		<link title="Physics introduction">$DOCS_URL/03_usage/10_physics/01_physics_introduction.md</link>
 		<link title="Ray-casting">$DOCS_URL/tutorials/physics/ray-casting.md</link>
 	</tutorials>
 	<methods>
diff --git a/doc/classes/Physics2DDirectSpaceState.xml b/doc/classes/Physics2DDirectSpaceState.xml
index 0ed68d2a7..6016fffa3 100644
--- a/doc/classes/Physics2DDirectSpaceState.xml
+++ b/doc/classes/Physics2DDirectSpaceState.xml
@@ -7,7 +7,7 @@
 		Direct access object to a space in the [Physics2DServer]. It's used mainly to do queries against objects and areas residing in a given space.
 	</description>
 	<tutorials>
-		<link title="Physics introduction">$DOCS_URL/tutorials/physics/physics_introduction.md</link>
+		<link title="Physics introduction">$DOCS_URL/03_usage/10_physics/01_physics_introduction.md</link>
 		<link title="Ray-casting">$DOCS_URL/tutorials/physics/ray-casting.md</link>
 	</tutorials>
 	<methods>
diff --git a/doc/classes/PhysicsDirectBodyState.xml b/doc/classes/PhysicsDirectBodyState.xml
index 8bcfa6603..299963f1d 100644
--- a/doc/classes/PhysicsDirectBodyState.xml
+++ b/doc/classes/PhysicsDirectBodyState.xml
@@ -7,7 +7,7 @@
 		Provides direct access to a physics body in the [PhysicsServer], allowing safe changes to physics properties. This object is passed via the direct state callback of rigid/character bodies, and is intended for changing the direct state of that body. See [method RigidBody._integrate_forces].
 	</description>
 	<tutorials>
-		<link title="Physics introduction">$DOCS_URL/tutorials/physics/physics_introduction.md</link>
+		<link title="Physics introduction">$DOCS_URL/03_usage/10_physics/01_physics_introduction.md</link>
 		<link title="Ray-casting">$DOCS_URL/tutorials/physics/ray-casting.md</link>
 	</tutorials>
 	<methods>
diff --git a/doc/classes/PhysicsDirectSpaceState.xml b/doc/classes/PhysicsDirectSpaceState.xml
index 07327c8aa..b1e8631bc 100644
--- a/doc/classes/PhysicsDirectSpaceState.xml
+++ b/doc/classes/PhysicsDirectSpaceState.xml
@@ -7,7 +7,7 @@
 		Direct access object to a space in the [PhysicsServer]. It's used mainly to do queries against objects and areas residing in a given space.
 	</description>
 	<tutorials>
-		<link title="Physics introduction">$DOCS_URL/tutorials/physics/physics_introduction.md</link>
+		<link title="Physics introduction">$DOCS_URL/03_usage/10_physics/01_physics_introduction.md</link>
 		<link title="Ray-casting">$DOCS_URL/tutorials/physics/ray-casting.md</link>
 	</tutorials>
 	<methods>
diff --git a/doc/classes/PoolStringArray.xml b/doc/classes/PoolStringArray.xml
index 7277e5dd2..28ae3f61d 100644
--- a/doc/classes/PoolStringArray.xml
+++ b/doc/classes/PoolStringArray.xml
@@ -21,7 +21,7 @@
 		[/codeblock]
 	</description>
 	<tutorials>
-		<link title="OS Test Demo">https://godotengine.org/asset-library/asset/677</link>
+		<link title="OS Test Demo">$DOCS_URL/07_demo_projects/misc/os_test</link>
 	</tutorials>
 	<methods>
 		<method name="PoolStringArray">
diff --git a/doc/classes/ProjectSettings.xml b/doc/classes/ProjectSettings.xml
index a62bcd422..97e4c164f 100644
--- a/doc/classes/ProjectSettings.xml
+++ b/doc/classes/ProjectSettings.xml
@@ -10,9 +10,9 @@
 		[b]Overriding:[/b] Any project setting can be overridden by creating a file named [code]override.cfg[/code] in the project's root directory. This can also be used in exported projects by placing this file in the same directory as the project binary. Overriding will still take the base project settings' [url=$DOCS_URL/tutorials/export/feature_tags.html]feature tags[/url] in account. Therefore, make sure to [i]also[/i] override the setting with the desired feature tags if you want them to override base project settings on all platforms and configurations.
 	</description>
 	<tutorials>
-		<link title="3D Physics Tests Demo">https://godotengine.org/asset-library/asset/675</link>
+		<link title="3D Physics Tests Demo">$DOCS_URL/07_demo_projects/3d/physics_tests</link>
 		<link title="3D Platformer Demo">$DOCS_URL/07_demo_projects/3d/platformer</link>
-		<link title="OS Test Demo">https://godotengine.org/asset-library/asset/677</link>
+		<link title="OS Test Demo">$DOCS_URL/07_demo_projects/misc/os_test</link>
 	</tutorials>
 	<methods>
 		<method name="add_property_info">
diff --git a/doc/classes/RayCast.xml b/doc/classes/RayCast.xml
index f8f2077d8..b6e3ac162 100644
--- a/doc/classes/RayCast.xml
+++ b/doc/classes/RayCast.xml
@@ -12,7 +12,7 @@
 	</description>
 	<tutorials>
 		<link title="Ray-casting">$DOCS_URL/tutorials/physics/ray-casting.md</link>
-		<link title="3D Voxel Demo">https://godotengine.org/asset-library/asset/676</link>
+		<link title="3D Voxel Demo">$DOCS_URL/07_demo_projects/3d/voxel</link>
 	</tutorials>
 	<methods>
 		<method name="add_exception">
diff --git a/doc/classes/ResourceLoader.xml b/doc/classes/ResourceLoader.xml
index 16dda55d9..d8f1d848b 100644
--- a/doc/classes/ResourceLoader.xml
+++ b/doc/classes/ResourceLoader.xml
@@ -8,7 +8,7 @@
 		It uses the many [ResourceFormatLoader] classes registered in the engine (either built-in or from a plugin) to load files into memory and convert them to a format that can be used by the engine.
 	</description>
 	<tutorials>
-		<link title="OS Test Demo">https://godotengine.org/asset-library/asset/677</link>
+		<link title="OS Test Demo">$DOCS_URL/07_demo_projects/misc/os_test</link>
 	</tutorials>
 	<methods>
 		<method name="exists">
diff --git a/doc/classes/RichTextLabel.xml b/doc/classes/RichTextLabel.xml
index 54e480d9a..3ef81c0da 100644
--- a/doc/classes/RichTextLabel.xml
+++ b/doc/classes/RichTextLabel.xml
@@ -14,7 +14,7 @@
 	<tutorials>
 		<link title="BBCode in RichTextLabel">$DOCS_URL/tutorials/ui/bbcode_in_richtextlabel.md</link>
 		<link title="GUI Rich Text/BBcode Demo">https://godotengine.org/asset-library/asset/132</link>
-		<link title="OS Test Demo">https://godotengine.org/asset-library/asset/677</link>
+		<link title="OS Test Demo">$DOCS_URL/07_demo_projects/misc/os_test</link>
 	</tutorials>
 	<methods>
 		<method name="add_image">
diff --git a/doc/classes/RigidBody.xml b/doc/classes/RigidBody.xml
index e677dbbbf..d74b70417 100644
--- a/doc/classes/RigidBody.xml
+++ b/doc/classes/RigidBody.xml
@@ -12,9 +12,9 @@
 		[b]Warning:[/b] With a non-uniform scale this node will probably not function as expected. Please make sure to keep its scale uniform (i.e. the same on all axes), and change the size(s) of its collision shape(s) instead.
 	</description>
 	<tutorials>
-		<link title="Physics introduction">$DOCS_URL/tutorials/physics/physics_introduction.md</link>
+		<link title="Physics introduction">$DOCS_URL/03_usage/10_physics/01_physics_introduction.md</link>
 		<link title="3D Truck Town Demo">https://godotengine.org/asset-library/asset/524</link>
-		<link title="3D Physics Tests Demo">https://godotengine.org/asset-library/asset/675</link>
+		<link title="3D Physics Tests Demo">$DOCS_URL/07_demo_projects/3d/physics_tests</link>
 	</tutorials>
 	<methods>
 		<method name="_integrate_forces" qualifiers="virtual">
diff --git a/doc/classes/SphereShape.xml b/doc/classes/SphereShape.xml
index 84b46a28a..d67032dbb 100644
--- a/doc/classes/SphereShape.xml
+++ b/doc/classes/SphereShape.xml
@@ -7,7 +7,7 @@
 		Sphere shape for 3D collisions, which can be set into a [PhysicsBody] or [Area]. This shape is useful for modeling sphere-like 3D objects.
 	</description>
 	<tutorials>
-		<link title="3D Physics Tests Demo">https://godotengine.org/asset-library/asset/675</link>
+		<link title="3D Physics Tests Demo">$DOCS_URL/07_demo_projects/3d/physics_tests</link>
 	</tutorials>
 	<methods>
 	</methods>
diff --git a/doc/classes/StaticBody.xml b/doc/classes/StaticBody.xml
index f20a8b566..737b675e9 100644
--- a/doc/classes/StaticBody.xml
+++ b/doc/classes/StaticBody.xml
@@ -12,8 +12,8 @@
 		[b]Warning:[/b] With a non-uniform scale this node will probably not function as expected. Please make sure to keep its scale uniform (i.e. the same on all axes), and change the size(s) of its collision shape(s) instead.
 	</description>
 	<tutorials>
-		<link title="3D Physics Tests Demo">https://godotengine.org/asset-library/asset/675</link>
-		<link title="3D Voxel Demo">https://godotengine.org/asset-library/asset/676</link>
+		<link title="3D Physics Tests Demo">$DOCS_URL/07_demo_projects/3d/physics_tests</link>
+		<link title="3D Voxel Demo">$DOCS_URL/07_demo_projects/3d/voxel</link>
 	</tutorials>
 	<methods>
 	</methods>
diff --git a/doc/classes/SurfaceTool.xml b/doc/classes/SurfaceTool.xml
index 537bb748d..2066d9e2d 100644
--- a/doc/classes/SurfaceTool.xml
+++ b/doc/classes/SurfaceTool.xml
@@ -19,7 +19,7 @@
 		[b]Note:[/b] Godot uses clockwise [url=https://learnopengl.com/Advanced-OpenGL/Face-culling]winding order[/url] for front faces of triangle primitive modes.
 	</description>
 	<tutorials>
-		<link title="3D Voxel Demo">https://godotengine.org/asset-library/asset/676</link>
+		<link title="3D Voxel Demo">$DOCS_URL/07_demo_projects/3d/voxel</link>
 	</tutorials>
 	<methods>
 		<method name="add_bones">
diff --git a/doc/classes/TextureButton.xml b/doc/classes/TextureButton.xml
index 0c8c2db0c..fd78f7006 100644
--- a/doc/classes/TextureButton.xml
+++ b/doc/classes/TextureButton.xml
@@ -9,7 +9,7 @@
 		See also [BaseButton] which contains common properties and methods associated with this node.
 	</description>
 	<tutorials>
-		<link title="3D Voxel Demo">https://godotengine.org/asset-library/asset/676</link>
+		<link title="3D Voxel Demo">$DOCS_URL/07_demo_projects/3d/voxel</link>
 	</tutorials>
 	<methods>
 	</methods>
diff --git a/doc/classes/TextureRect.xml b/doc/classes/TextureRect.xml
index c3a264888..e9e57a407 100644
--- a/doc/classes/TextureRect.xml
+++ b/doc/classes/TextureRect.xml
@@ -8,7 +8,7 @@
 		[b]Note:[/b] You should enable [member flip_v] when using a TextureRect to display a [ViewportTexture]. Alternatively, you can enable [member Viewport.render_target_v_flip] on the Viewport. Otherwise, the image will appear upside down.
 	</description>
 	<tutorials>
-		<link title="3D Voxel Demo">https://godotengine.org/asset-library/asset/676</link>
+		<link title="3D Voxel Demo">$DOCS_URL/07_demo_projects/3d/voxel</link>
 	</tutorials>
 	<methods>
 	</methods>
diff --git a/doc/classes/Thread.xml b/doc/classes/Thread.xml
index ef186a01a..fa8d7200d 100644
--- a/doc/classes/Thread.xml
+++ b/doc/classes/Thread.xml
@@ -9,7 +9,7 @@
 	<tutorials>
 		<link title="Using multiple threads">$DOCS_URL/tutorials/performance/threads/using_multiple_threads.md</link>
 		<link title="Thread-safe APIs">$DOCS_URL/tutorials/performance/threads/thread_safe_apis.md</link>
-		<link title="3D Voxel Demo">https://godotengine.org/asset-library/asset/676</link>
+		<link title="3D Voxel Demo">$DOCS_URL/07_demo_projects/3d/voxel</link>
 	</tutorials>
 	<methods>
 		<method name="get_id" qualifiers="const">
diff --git a/doc/classes/VBoxContainer.xml b/doc/classes/VBoxContainer.xml
index 7830e1cc1..9a90f18dd 100644
--- a/doc/classes/VBoxContainer.xml
+++ b/doc/classes/VBoxContainer.xml
@@ -8,7 +8,7 @@
 	</description>
 	<tutorials>
 		<link title="GUI containers">$DOCS_URL/03_usage/04_ui/02_gui_containers.md</link>
-		<link title="3D Voxel Demo">https://godotengine.org/asset-library/asset/676</link>
+		<link title="3D Voxel Demo">$DOCS_URL/07_demo_projects/3d/voxel</link>
 	</tutorials>
 	<methods>
 	</methods>
diff --git a/doc/classes/Viewport.xml b/doc/classes/Viewport.xml
index 14a099b1e..680332ed7 100644
--- a/doc/classes/Viewport.xml
+++ b/doc/classes/Viewport.xml
@@ -13,7 +13,7 @@
 		[b]Note:[/b] By default, a newly created Viewport in Godot 3.x will appear to be upside down. Enabling [member render_target_v_flip] will display the Viewport with the correct orientation.
 	</description>
 	<tutorials>
-		<link title="Viewport and canvas transforms">$DOCS_URL/tutorials/2d/2d_transforms.md</link>
+		<link title="Viewport and canvas transforms">$DOCS_URL/03_usage/02_2d/02_2d_transforms.md</link>
 		<link title="Viewports tutorial index">$DOCS_URL/tutorials/rendering/index.md</link>
 		<link title="GUI in 3D Demo">https://godotengine.org/asset-library/asset/127</link>
 		<link title="3D in 2D Demo">https://godotengine.org/asset-library/asset/128</link>
diff --git a/doc/classes/WorldEnvironment3D.xml b/doc/classes/WorldEnvironment3D.xml
index e509e6898..cb8cebc59 100644
--- a/doc/classes/WorldEnvironment3D.xml
+++ b/doc/classes/WorldEnvironment3D.xml
@@ -11,7 +11,7 @@
 	<tutorials>
 		<link title="Environment and post-processing">$DOCS_URL/tutorials/3d/environment_and_post_processing.md</link>
 		<link title="3D Material Testers Demo">https://godotengine.org/asset-library/asset/123</link>
-		<link title="2D HDR Demo">https://godotengine.org/asset-library/asset/110</link>
+		<link title="2D HDR Demo">$DOCS_URL/07_demo_projects/2d/hdr</link>
 	</tutorials>
 	<methods>
 	</methods>
diff --git a/modules/csg/doc_classes/CSGBox.xml b/modules/csg/doc_classes/CSGBox.xml
index 33e71e28b..218bab1af 100644
--- a/modules/csg/doc_classes/CSGBox.xml
+++ b/modules/csg/doc_classes/CSGBox.xml
@@ -8,7 +8,7 @@
 		[b]Note:[/b] CSG nodes are intended to be used for level prototyping. Creating CSG nodes has a significant CPU cost compared to creating a [MeshInstance] with a [PrimitiveMesh]. Moving a CSG node within another CSG node also has a significant CPU cost, so it should be avoided during gameplay.
 	</description>
 	<tutorials>
-		<link title="Prototyping levels with CSG">$DOCS_URL/tutorials/3d/csg_tools.md</link>
+		<link title="Prototyping levels with CSG">$DOCS_URL/04_modules/csg/01_csg_tools.md</link>
 	</tutorials>
 	<methods>
 	</methods>
diff --git a/modules/csg/doc_classes/CSGCombiner.xml b/modules/csg/doc_classes/CSGCombiner.xml
index 25c50b355..2836633b0 100644
--- a/modules/csg/doc_classes/CSGCombiner.xml
+++ b/modules/csg/doc_classes/CSGCombiner.xml
@@ -8,7 +8,7 @@
 		[b]Note:[/b] CSG nodes are intended to be used for level prototyping. Creating CSG nodes has a significant CPU cost compared to creating a [MeshInstance] with a [PrimitiveMesh]. Moving a CSG node within another CSG node also has a significant CPU cost, so it should be avoided during gameplay.
 	</description>
 	<tutorials>
-		<link title="Prototyping levels with CSG">$DOCS_URL/tutorials/3d/csg_tools.md</link>
+		<link title="Prototyping levels with CSG">$DOCS_URL/04_modules/csg/01_csg_tools.md</link>
 	</tutorials>
 	<methods>
 	</methods>
diff --git a/modules/csg/doc_classes/CSGCylinder.xml b/modules/csg/doc_classes/CSGCylinder.xml
index aae17d2df..5f34d4929 100644
--- a/modules/csg/doc_classes/CSGCylinder.xml
+++ b/modules/csg/doc_classes/CSGCylinder.xml
@@ -8,7 +8,7 @@
 		[b]Note:[/b] CSG nodes are intended to be used for level prototyping. Creating CSG nodes has a significant CPU cost compared to creating a [MeshInstance] with a [PrimitiveMesh]. Moving a CSG node within another CSG node also has a significant CPU cost, so it should be avoided during gameplay.
 	</description>
 	<tutorials>
-		<link title="Prototyping levels with CSG">$DOCS_URL/tutorials/3d/csg_tools.md</link>
+		<link title="Prototyping levels with CSG">$DOCS_URL/04_modules/csg/01_csg_tools.md</link>
 	</tutorials>
 	<methods>
 	</methods>
diff --git a/modules/csg/doc_classes/CSGMesh.xml b/modules/csg/doc_classes/CSGMesh.xml
index 607485f61..6ca17d6be 100644
--- a/modules/csg/doc_classes/CSGMesh.xml
+++ b/modules/csg/doc_classes/CSGMesh.xml
@@ -8,7 +8,7 @@
 		[b]Note:[/b] CSG nodes are intended to be used for level prototyping. Creating CSG nodes has a significant CPU cost compared to creating a [MeshInstance] with a [PrimitiveMesh]. Moving a CSG node within another CSG node also has a significant CPU cost, so it should be avoided during gameplay.
 	</description>
 	<tutorials>
-		<link title="Prototyping levels with CSG">$DOCS_URL/tutorials/3d/csg_tools.md</link>
+		<link title="Prototyping levels with CSG">$DOCS_URL/04_modules/csg/01_csg_tools.md</link>
 	</tutorials>
 	<methods>
 	</methods>
diff --git a/modules/csg/doc_classes/CSGPolygon.xml b/modules/csg/doc_classes/CSGPolygon.xml
index 79829adcf..5822a2d50 100644
--- a/modules/csg/doc_classes/CSGPolygon.xml
+++ b/modules/csg/doc_classes/CSGPolygon.xml
@@ -8,7 +8,7 @@
 		[b]Note:[/b] CSG nodes are intended to be used for level prototyping. Creating CSG nodes has a significant CPU cost compared to creating a [MeshInstance] with a [PrimitiveMesh]. Moving a CSG node within another CSG node also has a significant CPU cost, so it should be avoided during gameplay.
 	</description>
 	<tutorials>
-		<link title="Prototyping levels with CSG">$DOCS_URL/tutorials/3d/csg_tools.md</link>
+		<link title="Prototyping levels with CSG">$DOCS_URL/04_modules/csg/01_csg_tools.md</link>
 	</tutorials>
 	<methods>
 	</methods>
diff --git a/modules/csg/doc_classes/CSGPrimitive.xml b/modules/csg/doc_classes/CSGPrimitive.xml
index b67bbb00b..d1f153e17 100644
--- a/modules/csg/doc_classes/CSGPrimitive.xml
+++ b/modules/csg/doc_classes/CSGPrimitive.xml
@@ -8,7 +8,7 @@
 		[b]Note:[/b] CSG nodes are intended to be used for level prototyping. Creating CSG nodes has a significant CPU cost compared to creating a [MeshInstance] with a [PrimitiveMesh]. Moving a CSG node within another CSG node also has a significant CPU cost, so it should be avoided during gameplay.
 	</description>
 	<tutorials>
-		<link title="Prototyping levels with CSG">$DOCS_URL/tutorials/3d/csg_tools.md</link>
+		<link title="Prototyping levels with CSG">$DOCS_URL/04_modules/csg/01_csg_tools.md</link>
 	</tutorials>
 	<methods>
 	</methods>
diff --git a/modules/csg/doc_classes/CSGShape.xml b/modules/csg/doc_classes/CSGShape.xml
index 1b71402f5..019576a5e 100644
--- a/modules/csg/doc_classes/CSGShape.xml
+++ b/modules/csg/doc_classes/CSGShape.xml
@@ -8,7 +8,7 @@
 		[b]Note:[/b] CSG nodes are intended to be used for level prototyping. Creating CSG nodes has a significant CPU cost compared to creating a [MeshInstance] with a [PrimitiveMesh]. Moving a CSG node within another CSG node also has a significant CPU cost, so it should be avoided during gameplay.
 	</description>
 	<tutorials>
-		<link title="Prototyping levels with CSG">$DOCS_URL/tutorials/3d/csg_tools.md</link>
+		<link title="Prototyping levels with CSG">$DOCS_URL/04_modules/csg/01_csg_tools.md</link>
 	</tutorials>
 	<methods>
 		<method name="get_collision_layer_bit" qualifiers="const">
diff --git a/modules/csg/doc_classes/CSGSphere.xml b/modules/csg/doc_classes/CSGSphere.xml
index ed930264b..93405b4fa 100644
--- a/modules/csg/doc_classes/CSGSphere.xml
+++ b/modules/csg/doc_classes/CSGSphere.xml
@@ -8,7 +8,7 @@
 		[b]Note:[/b] CSG nodes are intended to be used for level prototyping. Creating CSG nodes has a significant CPU cost compared to creating a [MeshInstance] with a [PrimitiveMesh]. Moving a CSG node within another CSG node also has a significant CPU cost, so it should be avoided during gameplay.
 	</description>
 	<tutorials>
-		<link title="Prototyping levels with CSG">$DOCS_URL/tutorials/3d/csg_tools.md</link>
+		<link title="Prototyping levels with CSG">$DOCS_URL/04_modules/csg/01_csg_tools.md</link>
 	</tutorials>
 	<methods>
 	</methods>
diff --git a/modules/csg/doc_classes/CSGTorus.xml b/modules/csg/doc_classes/CSGTorus.xml
index 337a6e7bd..5beee095f 100644
--- a/modules/csg/doc_classes/CSGTorus.xml
+++ b/modules/csg/doc_classes/CSGTorus.xml
@@ -8,7 +8,7 @@
 		[b]Note:[/b] CSG nodes are intended to be used for level prototyping. Creating CSG nodes has a significant CPU cost compared to creating a [MeshInstance] with a [PrimitiveMesh]. Moving a CSG node within another CSG node also has a significant CPU cost, so it should be avoided during gameplay.
 	</description>
 	<tutorials>
-		<link title="Prototyping levels with CSG">$DOCS_URL/tutorials/3d/csg_tools.md</link>
+		<link title="Prototyping levels with CSG">$DOCS_URL/04_modules/csg/01_csg_tools.md</link>
 	</tutorials>
 	<methods>
 	</methods>
diff --git a/modules/database/doc_classes/Database.xml b/modules/database/doc_classes/Database.xml
index 1ddc1a832..b32cc05b1 100644
--- a/modules/database/doc_classes/Database.xml
+++ b/modules/database/doc_classes/Database.xml
@@ -10,9 +10,7 @@
 		Currently only an sqlite backend is available, however communication with other systems (like MySQL, or PostgreSQL) can be implemented without too much hassle using engine modules.
 	</description>
 	<tutorials>
-		<link title="Simple Database Demo Project">https://github.com/Relintai/pandemonium_demo_projects/tree/master/database/database_simple</link>
-		<link title="Prepared Statement Database Demo Project">https://github.com/Relintai/pandemonium_demo_projects/tree/master/database/prepared_statements</link>
-		<link title="Web Demo Projects">https://github.com/Relintai/pandemonium_demo_projects/tree/master/web</link>
+		<link title="Database Demo Projects">$DOCS_URL/07_demo_projects/database</link>
 	</tutorials>
 	<methods>
 		<method name="get_backend_name" qualifiers="const">
diff --git a/modules/gridmap/doc_classes/GridMap.xml b/modules/gridmap/doc_classes/GridMap.xml
index 465b9196c..a9cd93062 100644
--- a/modules/gridmap/doc_classes/GridMap.xml
+++ b/modules/gridmap/doc_classes/GridMap.xml
@@ -13,7 +13,7 @@
 	<tutorials>
 		<link title="Using gridmaps">$DOCS_URL/tutorials/3d/using_gridmaps.md</link>
 		<link title="3D Platformer Demo">$DOCS_URL/07_demo_projects/3d/platformer</link>
-		<link title="3D Kinematic Character Demo">https://godotengine.org/asset-library/asset/126</link>
+		<link title="3D Kinematic Character Demo">$DOCS_URL/07_demo_projects/3d/kinematic_character</link>
 	</tutorials>
 	<methods>
 		<method name="clear">
diff --git a/modules/gridmap/doc_classes/MeshLibrary.xml b/modules/gridmap/doc_classes/MeshLibrary.xml
index ad4fec764..767225ddf 100644
--- a/modules/gridmap/doc_classes/MeshLibrary.xml
+++ b/modules/gridmap/doc_classes/MeshLibrary.xml
@@ -7,7 +7,7 @@
 		A library of meshes. Contains a list of [Mesh] resources, each with a name and ID. Each item can also include collision and navigation shapes. This resource is used in [GridMap].
 	</description>
 	<tutorials>
-		<link title="3D Kinematic Character Demo">https://godotengine.org/asset-library/asset/126</link>
+		<link title="3D Kinematic Character Demo">$DOCS_URL/07_demo_projects/3d/kinematic_character</link>
 		<link title="3D Platformer Demo">$DOCS_URL/07_demo_projects/3d/platformer</link>
 	</tutorials>
 	<methods>
diff --git a/modules/layered_tile_map/doc_classes/LayeredTileMap.xml b/modules/layered_tile_map/doc_classes/LayeredTileMap.xml
index 93452632b..9316a2569 100644
--- a/modules/layered_tile_map/doc_classes/LayeredTileMap.xml
+++ b/modules/layered_tile_map/doc_classes/LayeredTileMap.xml
@@ -11,7 +11,7 @@
 	<tutorials>
 		<link title="Using Tilemaps">$DOCS_URL/tutorials/2d/using_tilemaps.html</link>
 		<link title="2D Platformer Demo">$DOCS_URL/07_demo_projects/2d/platformer</link>
-		<link title="2D Isometric Demo">https://godotengine.org/asset-library/asset/112</link>
+		<link title="2D Isometric Demo">$DOCS_URL/07_demo_projects/2d/isometric</link>
 		<link title="2D Hexagonal Demo">https://godotengine.org/asset-library/asset/111</link>
 		<link title="2D Navigation Astar Demo">https://godotengine.org/asset-library/asset/519</link>
 		<link title="2D Role Playing Game Demo">https://godotengine.org/asset-library/asset/520</link>
diff --git a/modules/layered_tile_map/doc_classes/LayeredTileSet.xml b/modules/layered_tile_map/doc_classes/LayeredTileSet.xml
index 652d3d2bc..37ef6b49e 100644
--- a/modules/layered_tile_map/doc_classes/LayeredTileSet.xml
+++ b/modules/layered_tile_map/doc_classes/LayeredTileSet.xml
@@ -14,7 +14,7 @@
 	<tutorials>
 		<link title="Using Tilemaps">$DOCS_URL/tutorials/2d/using_tilemaps.html</link>
 		<link title="2D Platformer Demo">$DOCS_URL/07_demo_projects/2d/platformer</link>
-		<link title="2D Isometric Demo">https://godotengine.org/asset-library/asset/112</link>
+		<link title="2D Isometric Demo">$DOCS_URL/07_demo_projects/2d/isometric</link>
 		<link title="2D Hexagonal Demo">https://godotengine.org/asset-library/asset/111</link>
 		<link title="2D Navigation Astar Demo">https://godotengine.org/asset-library/asset/519</link>
 		<link title="2D Role Playing Game Demo">https://godotengine.org/asset-library/asset/520</link>