diff --git a/nick/blades/Generator.md b/nick/blades/Generator.md
index 89d9628..f01d3e7 100644
--- a/nick/blades/Generator.md
+++ b/nick/blades/Generator.md
@@ -2,38 +2,38 @@
 
  |
 --- | ---
-First Name | `dice: [[tables/names-first]]`
-Family Name | `dice: [[tables/names-family]]`
-Alias | `dice: [[tables/names-aliases]]`
-Heritage | `dice: [[tables/people-heritage]]`
-Style | `dice: [[tables/people-style]]`
+First Name | `dice: [[tables/names-first#^table-names-first]]`
+Family Name | `dice: [[tables/names-family#^table-names-family]]`
+Alias | `dice: [[tables/names-aliases#^table-names-aliases]]`
+Heritage | `dice: [[tables/people-heritage#^people-heritage]]`
+Style | `dice: [[tables/people-style#^table-people-style]]`
 
 
 ## Location
 ### Street
  |
 --- | ---
-Detail | `dice: [[tables/streets-details]]`
-Impression ( Sight ) | `dice: [[tables/streets-impressions-sights]]`
-Impression ( Sound ) | `dice: [[tables/streets-impressions-sounds]]`
-Impression ( Smell ) | `dice: [[tables/streets-impressions-smells]]`
-Mood | `dice: [[tables/streets-mood]]`
-Type | `dice: [[tables/streets-type]]`
-Use | `dice: [[tables/streets-uses]]`
+Detail | `dice: [[streets-type#^table-streets-type]]`
+Impression ( Sight ) | `dice: [[tables/streets-impressions-sights#^table-impressions-sights]]`
+Impression ( Sound ) | `dice: [[tables/streets-impressions-sounds#^table-impressions-sounds]]`
+Impression ( Smell ) | `dice: [[tables/streets-impressions-smells#^table-impressions-smells]]`
+Mood | `dice: [[tables/streets-mood#^table-mood]]`
+Type | `dice: [[streets-type#^table-streets-type]]`
+Use | `dice: [[tables/streets-uses#^table-streets-uses]]`
 
 
 ### Building
  |
 --- | ---
-Exterior Detail | `dice: [[tables/buildings-details-exterior]]`
-Exterior Materials | `dice: [[tables/buildings-details-exterior-materials]]`
-Interior Detail | `dice: [[tables/names-first]]`
+Exterior Detail | `dice: [[tables/buildings-details-exterior#^table-building-exterior-details]]`
+Exterior Materials | `dice: [[tables/buildings-details-exterior-materials#^table-building-exterior-materials]]`
+Interior Detail | `dice: [[tables/names-first#^table-names-first]]`
 Use | `dice: [[tables/buildings-use]]`
 
 
 ## Score
  |
 --- | ---
-Client | `dice: [[tables/scores-client-target]]`
-Target | `dice: [[tables/scores-client-target]]`
-Work | `dice: [[tables/scores-work]]`
+Client | `dice: [[tables/scores-client-target#^table-doskvol-scores-client-target]]`
+Target | `dice: [[tables/scores-client-target#^table-doskvol-scores-client-target]]`
+Work | `dice: [[tables/scores-work#^table-doskvol-scores-work]]`
diff --git a/nick/blades/tables/people-heritage.md b/nick/blades/tables/people-heritage.md
index 2f5fb5c..be7bc9f 100644
--- a/nick/blades/tables/people-heritage.md
+++ b/nick/blades/tables/people-heritage.md
@@ -1,4 +1,6 @@
 | dice: 1d6 | Heritage |
 | :--: | :--- |
 | 1-3 | [[Akoros\|Akorosi]] |
-| 4-6 | `dice: [[tables/people-heritage-foreigners]]` |
+| 4-6 | `dice: [[tables/people-heritage-foreigners#^table-people-heritage-foreigners]]` |
+^people-heritage
+
diff --git a/nick/blades/tables/street-details.md b/nick/blades/tables/street-details.md
index 59cd104..d637545 100644
--- a/nick/blades/tables/street-details.md
+++ b/nick/blades/tables/street-details.md
@@ -1,9 +1,9 @@
 | dice: 1d6 | Street: Details|
 |:---:|:---|
-|1|`dice: [[Projects/Blades in the Dark/Roll Tables#^table-street-details-a]]`|
-|2|`dice: [[Projects/Blades in the Dark/Roll Tables#^table-street-details-b]]`|
-|3|`dice: [[Projects/Blades in the Dark/Roll Tables#^table-street-details-c]]`|
-|4|`dice: [[Projects/Blades in the Dark/Roll Tables#^table-street-details-d]]`|
-|5|`dice: [[Projects/Blades in the Dark/Roll Tables#^table-street-details-e]]`|
-|6|`dice: [[Projects/Blades in the Dark/Roll Tables#^table-street-details-f]]`|
+|1|`dice: [[tables/table-street-details-a#^table-street-details-a]]`|
+|2|`dice: [[tables/table-street-details-b#^table-street-details-b]]`|
+|3|`dice: [[tables/table-street-details-c#^table-street-details-c]]`|
+|4|`dice: [[table/stable-street-details-d#^table-street-details-d]]`|
+|5|`dice: [[tables/table-street-details-e#^table-street-details-e]]`|
+|6|`dice: [[tables/table-street-details-f#^table-street-details-f]]`|
 ^table-streets-details
diff --git a/nick/blades/tables/streets-type.md b/nick/blades/tables/streets-type.md
index d64c838..cb2ca53 100644
--- a/nick/blades/tables/streets-type.md
+++ b/nick/blades/tables/streets-type.md
@@ -1,6 +1,6 @@
 | dice: 1d6 | Street: Type|
 |:---:|:---|
-|1-3|`dice [[Projects/Blades in the Dark/Roll Tables#^table-street-type-a]]`|
-|4-5|`dice [[Projects/Blades in the Dark/Roll Tables#^table-street-type-b]]`|
-|6|`dice [[Projects/Blades in the Dark/Roll Tables#^table-street-type-c]]`|
+|1-3|`dice [[streets-type-a#^table-street-type-a]]`|
+|4-5|`dice [[streets-type-b#^table-street-type-b]]`|
+|6|`dice [[streets-type-c#^table-street-type-c]]`|
 ^table-streets-type