diff --git a/books/manual/scripts/calculate_cloud_pricing.sh b/books/manual/scripts/calculate_cloud_pricing.sh
index 8d03a7e..ebce4bb 100755
--- a/books/manual/scripts/calculate_cloud_pricing.sh
+++ b/books/manual/scripts/calculate_cloud_pricing.sh
@@ -4,26 +4,26 @@ cd ../../collections/manual/values
 
 value=$(cat tft_value.md)
 
-CU=$(cat CU_MUSD_HOUR.md)
+CU=$(cat cu_musd_hour.md)
 CUTFT=$(echo "$CU / $value" | bc -l)
-printf "%.2f" $CUTFT > CU_MTFT_HOUR.md
+printf "%.2f" $CUTFT > cu_mtft_hour.md
 
-SU=$(cat SU_MUSD_HOUR.md)
+SU=$(cat su_musd_hour.md)
 SUTFT=$(echo "$SU / $value" | bc -l)
-printf "%.2f" $SUTFT > SU_MTFT_HOUR.md
+printf "%.2f" $SUTFT > su_mtft_hour.md
 
-NU=$(cat NU_MUSD_HOUR.md)
+NU=$(cat nu_musd_hour.md)
 NUTFT=$(echo "$NU / $value" | bc -l)
-printf "%.2f" $NUTFT > NU_MTFT_HOUR.md
+printf "%.2f" $NUTFT > nu_mtft_hour.md
 
-IP=$(cat IP_MUSD_HOUR.md)
+IP=$(cat ip_musd_hour.md)
 IPTFT=$(echo "$IP / $value" | bc -l)
-printf "%.2f" $IPTFT > IP_MTFT_HOUR.md
+printf "%.2f" $IPTFT > ip_mtft_hour.md
 
-NAME=$(cat NAME_MUSD_HOUR.md)
+NAME=$(cat name_musd_hour.md)
 NAME=$(echo "$NAME / $value" | bc -l)
-printf "%.2f" $NAME > NAME_MTFT_HOUR.md
+printf "%.2f" $NAME > name_mtft_hour.md
 
-DNAME=$(cat DNAME_MUSD_HOUR.md)
+DNAME=$(cat dname_musd_hour.md)
 DNAME=$(echo "$DNAME / $value" | bc -l)
-printf "%.2f" $DNAME > DNAME_MTFT_HOUR.md
\ No newline at end of file
+printf "%.2f" $DNAME > dname_mtft_hour.md
\ No newline at end of file
diff --git a/books/manual/scripts/generate_wallets.sh b/books/manual/scripts/generate_wallets.sh
index 48ba405..08a4483 100755
--- a/books/manual/scripts/generate_wallets.sh
+++ b/books/manual/scripts/generate_wallets.sh
@@ -21,5 +21,5 @@ GAUGOSYLCX7JZTQYF2K7RIMHFWKSA3WSI2OQ4IRKXMDMVE6ABJIJMFQR
 )
 
 for wallet in "${wallets[@]}"; do
-    curl -sL "https://horizon.stellar.org/accounts/${wallet}" -H 'Accept: application/json' | jq --raw-output '.balances[] | select(.asset_code == "TFT") | .balance' | xargs printf "%.2f" > ${wallet}.md
+    curl -sL "https://horizon.stellar.org/accounts/${wallet}" -H 'Accept: application/json' | jq --raw-output '.balances[] | select(.asset_code == "TFT") | .balance' | xargs printf "%.2f" > ${wallet,,}.md
 done
\ No newline at end of file
diff --git a/collections/manual/knowledge_base/about/token_overview/special_wallets/stats_special_wallets.md b/collections/manual/knowledge_base/about/token_overview/special_wallets/stats_special_wallets.md
index 2ee00a3..b561f4d 100644
--- a/collections/manual/knowledge_base/about/token_overview/special_wallets/stats_special_wallets.md
+++ b/collections/manual/knowledge_base/about/token_overview/special_wallets/stats_special_wallets.md
@@ -19,30 +19,30 @@ We present special wallets that hold a given amount of TFT.
 
 | **Description**    | **TFT Balance** | **Address**                                                                      |
 | ------------------ | ----------- | -------------------------------------------------------------------------------- |
-| Liquid Exchange #1 |  {{#include ./wallet_data/GA7OPN4A3JNHLPHPEWM4PJDOYYDYNZOM7ES6YL3O7NC3PRY3V3UX6ANM.md}}      | [GA7OPN4A3JNHLPHPEWM4PJDOYYDYNZOM7ES6YL3O7NC3PRY3V3UX6ANM](https://stellar.expert/explorer/public/account/GA7OPN4A3JNHLPHPEWM4PJDOYYDYNZOM7ES6YL3O7NC3PRY3V3UX6ANM) |
-| Liquid Exchange #2 | {{#include ./wallet_data/GDSKFYNMZWTB3V5AN26CEAQ27643Q3KB4X6MY4UTO2LIIDFND4SPQZYU.md}}           | [GDSKFYNMZWTB3V5AN26CEAQ27643Q3KB4X6MY4UTO2LIIDFND4SPQZYU](https://stellar.expert/explorer/public/account/GDSKFYNMZWTB3V5AN26CEAQ27643Q3KB4X6MY4UTO2LIIDFND4SPQZYU) |
-| gettft.com         | {{#include ./wallet_data/GBQHN7RL4LSRPR2TT74ID2UJPZ2AXCHQY2WKGCTDLJM3NXVJ7GQHUCOD.md}}     | [GBQHN7RL4LSRPR2TT74ID2UJPZ2AXCHQY2WKGCTDLJM3NXVJ7GQHUCOD](https://stellar.expert/explorer/public/account/GBQHN7RL4LSRPR2TT74ID2UJPZ2AXCHQY2WKGCTDLJM3NXVJ7GQHUCOD) |
-| BTC-Alpha Exchange | {{#include ./wallet_data/GBTPAXXP6534UPC4MLNGFGJWCD6DNSRVIPPOZWXAQAWI4FKTLOJY2A2S.md}}     | [GBTPAXXP6534UPC4MLNGFGJWCD6DNSRVIPPOZWXAQAWI4FKTLOJY2A2S](https://stellar.expert/explorer/public/account/GBTPAXXP6534UPC4MLNGFGJWCD6DNSRVIPPOZWXAQAWI4FKTLOJY2A2S) |
+| Liquid Exchange #1 |  !!wiki.include page:'manual:ga7opn4a3jnhlphpewm4pjdoyydynzom7es6yl3o7nc3pry3v3ux6anm.md' | [GA7OPN4A3JNHLPHPEWM4PJDOYYDYNZOM7ES6YL3O7NC3PRY3V3UX6ANM](https://stellar.expert/explorer/public/account/GA7OPN4A3JNHLPHPEWM4PJDOYYDYNZOM7ES6YL3O7NC3PRY3V3UX6ANM) |
+| Liquid Exchange #2 |  !!wiki.include page:'manual:gdskfynmzwtb3v5an26ceaq27643q3kb4x6my4uto2liidfnd4spqzyu.md'           | [GDSKFYNMZWTB3V5AN26CEAQ27643Q3KB4X6MY4UTO2LIIDFND4SPQZYU](https://stellar.expert/explorer/public/account/GDSKFYNMZWTB3V5AN26CEAQ27643Q3KB4X6MY4UTO2LIIDFND4SPQZYU) |
+| gettft.com         | !!wiki.include page:'manual:gbqhn7rl4lsrpr2tt74id2ujpz2axchqy2wkgctdljm3nxvj7gqhucod.md'    | [GBQHN7RL4LSRPR2TT74ID2UJPZ2AXCHQY2WKGCTDLJM3NXVJ7GQHUCOD](https://stellar.expert/explorer/public/account/GBQHN7RL4LSRPR2TT74ID2UJPZ2AXCHQY2WKGCTDLJM3NXVJ7GQHUCOD) |
+| BTC-Alpha Exchange | !!wiki.include page:'manual:gbtpaxxp6534upc4mlngfgjwcd6dnsrvippozwxaqawi4fktlojy2a2s.md'     | [GBTPAXXP6534UPC4MLNGFGJWCD6DNSRVIPPOZWXAQAWI4FKTLOJY2A2S](https://stellar.expert/explorer/public/account/GBTPAXXP6534UPC4MLNGFGJWCD6DNSRVIPPOZWXAQAWI4FKTLOJY2A2S) |
 
 ## ThreeFold Contribution Wallets
 
 | **Description**                 | **TFT Balance** | **Address**                                                                      |
 | ------------------------------- | ----------- | -------------------------------------------------------------------------------- |
-| TF DAY2DAY operations           | {{#include ./wallet_data/GB2C5HCZYWNGVM6JGXDWQBJTMUY4S2HPPTCAH63HFAQVL2ALXDW7SSJ7.md}}    | [GB2C5HCZYWNGVM6JGXDWQBJTMUY4S2HPPTCAH63HFAQVL2ALXDW7SSJ7](https://stellar.expert/explorer/public/account/GB2C5HCZYWNGVM6JGXDWQBJTMUY4S2HPPTCAH63HFAQVL2ALXDW7SSJ7) |
-| TF Promotion Wallet             | {{#include ./wallet_data/GDLVIB44LVONM5K67LUPSFZMSX7G2RLYVBM5MMHUJ4NAQJU7CH4HBJBO.md}}    | [GDLVIB44LVONM5K67LUPSFZMSX7G2RLYVBM5MMHUJ4NAQJU7CH4HBJBO](https://stellar.expert/explorer/public/account/GDLVIB44LVONM5K67LUPSFZMSX7G2RLYVBM5MMHUJ4NAQJU7CH4HBJBO) |
-| TF Grants Wallet                | {{#include ./wallet_data/GDKXTUYNW4BJKDM2L7B5XUYFUISV52KUU4G7VPNLF4ZSIKBURM622YPZ.md}}    | [GDKXTUYNW4BJKDM2L7B5XUYFUISV52KUU4G7VPNLF4ZSIKBURM622YPZ](https://stellar.expert/explorer/public/account/GDKXTUYNW4BJKDM2L7B5XUYFUISV52KUU4G7VPNLF4ZSIKBURM622YPZ) |
-| ThreeFold Carbon Credit Funding | {{#include ./wallet_data/GDIJY6K2BBRIRX423ZFUYKKFDN66XP2KMSBZFQSE2PSNDZ6EDVQTRLSU.md}}     | [GDIJY6K2BBRIRX423ZFUYKKFDN66XP2KMSBZFQSE2PSNDZ6EDVQTRLSU](https://stellar.expert/explorer/public/account/GDIJY6K2BBRIRX423ZFUYKKFDN66XP2KMSBZFQSE2PSNDZ6EDVQTRLSU) |
-| TF Team Wallet                  | {{#include ./wallet_data/GCWHWDRXYPXQAOYMQKB66SZPLM6UANKGMSL4SP7LSOIA6OTTOYQ6HBIH.md}}      | [GCWHWDRXYPXQAOYMQKB66SZPLM6UANKGMSL4SP7LSOIA6OTTOYQ6HBIH](https://stellar.expert/explorer/public/account/GCWHWDRXYPXQAOYMQKB66SZPLM6UANKGMSL4SP7LSOIA6OTTOYQ6HBIH) |
+| TF DAY2DAY operations           | !!wiki.include page:'manual:gb2c5hczywngvm6jgxdwqbjtmuy4s2hpptcah63hfaqvl2alxdw7ssj7.md'    | [GB2C5HCZYWNGVM6JGXDWQBJTMUY4S2HPPTCAH63HFAQVL2ALXDW7SSJ7](https://stellar.expert/explorer/public/account/GB2C5HCZYWNGVM6JGXDWQBJTMUY4S2HPPTCAH63HFAQVL2ALXDW7SSJ7) |
+| TF Promotion Wallet             | !!wiki.include page:'manual:gdlvib44lvonm5k67lupsfzmsx7g2rlyvbm5mmhuj4naqju7ch4hbjbo.md'    | [GDLVIB44LVONM5K67LUPSFZMSX7G2RLYVBM5MMHUJ4NAQJU7CH4HBJBO](https://stellar.expert/explorer/public/account/GDLVIB44LVONM5K67LUPSFZMSX7G2RLYVBM5MMHUJ4NAQJU7CH4HBJBO) |
+| TF Grants Wallet                | !!wiki.include page:'manual:gdkxtuynw4bjkdm2l7b5xuyfuisv52kuu4g7vpnlf4zsikburm622ypz.md'     | [GDKXTUYNW4BJKDM2L7B5XUYFUISV52KUU4G7VPNLF4ZSIKBURM622YPZ](https://stellar.expert/explorer/public/account/GDKXTUYNW4BJKDM2L7B5XUYFUISV52KUU4G7VPNLF4ZSIKBURM622YPZ) |
+| ThreeFold Carbon Credit Funding | !!wiki.include page:'manual:gdijy6k2bbrirx423zfuykkfdn66xp2kmsbzfqse2psndz6edvqtrlsu.md'     | [GDIJY6K2BBRIRX423ZFUYKKFDN66XP2KMSBZFQSE2PSNDZ6EDVQTRLSU](https://stellar.expert/explorer/public/account/GDIJY6K2BBRIRX423ZFUYKKFDN66XP2KMSBZFQSE2PSNDZ6EDVQTRLSU) |
+| TF Team Wallet                  | !!wiki.include page:'manual:gcwhwdrxypxqaoymqkb66szplm6uankgmsl4sp7lsoia6ottoyq6hbih.md'      | [GCWHWDRXYPXQAOYMQKB66SZPLM6UANKGMSL4SP7LSOIA6OTTOYQ6HBIH](https://stellar.expert/explorer/public/account/GCWHWDRXYPXQAOYMQKB66SZPLM6UANKGMSL4SP7LSOIA6OTTOYQ6HBIH) |
 
 ## Wisdom Council Wallets
 
 | **Description**                         | **TFT Balance** | **Address**                                                                      |
 | --------------------------------------- | ----------- | -------------------------------------------------------------------------------- |
-| Liquidity/Ecosystem Contribution Wisdom | {{#include ./wallet_data/GBV734I2SV4YDDPVJMYXU3IZ2AIU5GEAJRAD4E4BQG7CA2N63NXSPMD6.md}}    | [GBV734I2SV4YDDPVJMYXU3IZ2AIU5GEAJRAD4E4BQG7CA2N63NXSPMD6](https://stellar.expert/explorer/public/account/GBV734I2SV4YDDPVJMYXU3IZ2AIU5GEAJRAD4E4BQG7CA2N63NXSPMD6) |
-| TF Promotion Wisdom                     | {{#include ./wallet_data/GAI4C2BGOA3YHVQZZW7OW4FHOGGYWTUBEVNHB6MW4ZAFG7ZAA7D5IPC3.md}}         | [GAI4C2BGOA3YHVQZZW7OW4FHOGGYWTUBEVNHB6MW4ZAFG7ZAA7D5IPC3](https://stellar.expert/explorer/public/account/GAI4C2BGOA3YHVQZZW7OW4FHOGGYWTUBEVNHB6MW4ZAFG7ZAA7D5IPC3) |
-| TF Grants Wisdom                        | {{#include ./wallet_data/GCEJ7DMULFTT25UH4FAAGOZ6KER4WXAYQGJUSIITQD527DGTKSXKBQGR.md}}    | [GCEJ7DMULFTT25UH4FAAGOZ6KER4WXAYQGJUSIITQD527DGTKSXKBQGR](https://stellar.expert/explorer/public/account/GCEJ7DMULFTT25UH4FAAGOZ6KER4WXAYQGJUSIITQD527DGTKSXKBQGR) |
-| TF Team Wisdom                          | {{#include ./wallet_data/GAQXBLFG4BZGIVY6DBJVWE5EAP3UNHMIA2PYCUVLY2JUSPVWPUF36BW4.md}}     | [GAQXBLFG4BZGIVY6DBJVWE5EAP3UNHMIA2PYCUVLY2JUSPVWPUF36BW4](https://stellar.expert/explorer/public/account/GAQXBLFG4BZGIVY6DBJVWE5EAP3UNHMIA2PYCUVLY2JUSPVWPUF36BW4) |
-| Wisdom Council Locked                   | {{#include ./wallet_data/GAUGOSYLCX7JZTQYF2K7RIMHFWKSA3WSI2OQ4IRKXMDMVE6ABJIJMFQR.md}}    | [GAUGOSYLCX7JZTQYF2K7RIMHFWKSA3WSI2OQ4IRKXMDMVE6ABJIJMFQR](https://stellar.expert/explorer/public/account/GAUGOSYLCX7JZTQYF2K7RIMHFWKSA3WSI2OQ4IRKXMDMVE6ABJIJMFQR) |
+| Liquidity/Ecosystem Contribution Wisdom | !!wiki.include page:'manual:gbv734i2sv4yddpvjmyxu3iz2aiu5geajrad4e4bqg7ca2n63nxspmd6.md'     | [GBV734I2SV4YDDPVJMYXU3IZ2AIU5GEAJRAD4E4BQG7CA2N63NXSPMD6](https://stellar.expert/explorer/public/account/GBV734I2SV4YDDPVJMYXU3IZ2AIU5GEAJRAD4E4BQG7CA2N63NXSPMD6) |
+| TF Promotion Wisdom                     | !!wiki.include page:'manual:gai4c2bgoa3yhvqzzw7ow4fhoggywtubevnhb6mw4zafg7zaa7d5ipc3.md'        | [GAI4C2BGOA3YHVQZZW7OW4FHOGGYWTUBEVNHB6MW4ZAFG7ZAA7D5IPC3](https://stellar.expert/explorer/public/account/GAI4C2BGOA3YHVQZZW7OW4FHOGGYWTUBEVNHB6MW4ZAFG7ZAA7D5IPC3) |
+| TF Grants Wisdom                        | !!wiki.include page:'manual:gcej7dmulftt25uh4faagoz6ker4wxayqgjusiitqd527dgtksxkbqgr.md'    | [GCEJ7DMULFTT25UH4FAAGOZ6KER4WXAYQGJUSIITQD527DGTKSXKBQGR](https://stellar.expert/explorer/public/account/GCEJ7DMULFTT25UH4FAAGOZ6KER4WXAYQGJUSIITQD527DGTKSXKBQGR) |
+| TF Team Wisdom                          | !!wiki.include page:'manual:gaqxblfg4bzgivy6dbjvwe5eap3unhmia2pycuvly2juspvwpuf36bw4.md'      | [GAQXBLFG4BZGIVY6DBJVWE5EAP3UNHMIA2PYCUVLY2JUSPVWPUF36BW4](https://stellar.expert/explorer/public/account/GAQXBLFG4BZGIVY6DBJVWE5EAP3UNHMIA2PYCUVLY2JUSPVWPUF36BW4) |
+| Wisdom Council Locked                   | !!wiki.include page:'manual:gaugosylcx7jztqyf2k7rimhfwksa3wsi2oq4irkxmdmve6abjijmfqr.md'    | [GAUGOSYLCX7JZTQYF2K7RIMHFWKSA3WSI2OQ4IRKXMDMVE6ABJIJMFQR](https://stellar.expert/explorer/public/account/GAUGOSYLCX7JZTQYF2K7RIMHFWKSA3WSI2OQ4IRKXMDMVE6ABJIJMFQR) |
 
 ## Important Note
  
diff --git a/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/GA7OPN4A3JNHLPHPEWM4PJDOYYDYNZOM7ES6YL3O7NC3PRY3V3UX6ANM.md b/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/GA7OPN4A3JNHLPHPEWM4PJDOYYDYNZOM7ES6YL3O7NC3PRY3V3UX6ANM.md
deleted file mode 100644
index a34c7a2..0000000
--- a/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/GA7OPN4A3JNHLPHPEWM4PJDOYYDYNZOM7ES6YL3O7NC3PRY3V3UX6ANM.md
+++ /dev/null
@@ -1 +0,0 @@
-3340735.94
\ No newline at end of file
diff --git a/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/GAI4C2BGOA3YHVQZZW7OW4FHOGGYWTUBEVNHB6MW4ZAFG7ZAA7D5IPC3.md b/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/GAI4C2BGOA3YHVQZZW7OW4FHOGGYWTUBEVNHB6MW4ZAFG7ZAA7D5IPC3.md
deleted file mode 100644
index cd1f5fd..0000000
--- a/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/GAI4C2BGOA3YHVQZZW7OW4FHOGGYWTUBEVNHB6MW4ZAFG7ZAA7D5IPC3.md
+++ /dev/null
@@ -1 +0,0 @@
-258.80
\ No newline at end of file
diff --git a/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/GAQXBLFG4BZGIVY6DBJVWE5EAP3UNHMIA2PYCUVLY2JUSPVWPUF36BW4.md b/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/GAQXBLFG4BZGIVY6DBJVWE5EAP3UNHMIA2PYCUVLY2JUSPVWPUF36BW4.md
deleted file mode 100644
index bab954e..0000000
--- a/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/GAQXBLFG4BZGIVY6DBJVWE5EAP3UNHMIA2PYCUVLY2JUSPVWPUF36BW4.md
+++ /dev/null
@@ -1 +0,0 @@
-5000000.00
\ No newline at end of file
diff --git a/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/GAUGOSYLCX7JZTQYF2K7RIMHFWKSA3WSI2OQ4IRKXMDMVE6ABJIJMFQR.md b/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/GAUGOSYLCX7JZTQYF2K7RIMHFWKSA3WSI2OQ4IRKXMDMVE6ABJIJMFQR.md
deleted file mode 100644
index 5fd95eb..0000000
--- a/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/GAUGOSYLCX7JZTQYF2K7RIMHFWKSA3WSI2OQ4IRKXMDMVE6ABJIJMFQR.md
+++ /dev/null
@@ -1 +0,0 @@
-10468506.00
\ No newline at end of file
diff --git a/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/GB2C5HCZYWNGVM6JGXDWQBJTMUY4S2HPPTCAH63HFAQVL2ALXDW7SSJ7.md b/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/GB2C5HCZYWNGVM6JGXDWQBJTMUY4S2HPPTCAH63HFAQVL2ALXDW7SSJ7.md
deleted file mode 100644
index 6641a70..0000000
--- a/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/GB2C5HCZYWNGVM6JGXDWQBJTMUY4S2HPPTCAH63HFAQVL2ALXDW7SSJ7.md
+++ /dev/null
@@ -1 +0,0 @@
-12447988.00
\ No newline at end of file
diff --git a/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/GBQHN7RL4LSRPR2TT74ID2UJPZ2AXCHQY2WKGCTDLJM3NXVJ7GQHUCOD.md b/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/GBQHN7RL4LSRPR2TT74ID2UJPZ2AXCHQY2WKGCTDLJM3NXVJ7GQHUCOD.md
deleted file mode 100644
index 8cd46f1..0000000
--- a/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/GBQHN7RL4LSRPR2TT74ID2UJPZ2AXCHQY2WKGCTDLJM3NXVJ7GQHUCOD.md
+++ /dev/null
@@ -1 +0,0 @@
-2908686.63
\ No newline at end of file
diff --git a/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/GBTPAXXP6534UPC4MLNGFGJWCD6DNSRVIPPOZWXAQAWI4FKTLOJY2A2S.md b/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/GBTPAXXP6534UPC4MLNGFGJWCD6DNSRVIPPOZWXAQAWI4FKTLOJY2A2S.md
deleted file mode 100644
index d49104a..0000000
--- a/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/GBTPAXXP6534UPC4MLNGFGJWCD6DNSRVIPPOZWXAQAWI4FKTLOJY2A2S.md
+++ /dev/null
@@ -1 +0,0 @@
-1832242.73
\ No newline at end of file
diff --git a/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/GBV734I2SV4YDDPVJMYXU3IZ2AIU5GEAJRAD4E4BQG7CA2N63NXSPMD6.md b/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/GBV734I2SV4YDDPVJMYXU3IZ2AIU5GEAJRAD4E4BQG7CA2N63NXSPMD6.md
deleted file mode 100644
index df521e3..0000000
--- a/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/GBV734I2SV4YDDPVJMYXU3IZ2AIU5GEAJRAD4E4BQG7CA2N63NXSPMD6.md
+++ /dev/null
@@ -1 +0,0 @@
-16999920.00
\ No newline at end of file
diff --git a/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/GCEJ7DMULFTT25UH4FAAGOZ6KER4WXAYQGJUSIITQD527DGTKSXKBQGR.md b/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/GCEJ7DMULFTT25UH4FAAGOZ6KER4WXAYQGJUSIITQD527DGTKSXKBQGR.md
deleted file mode 100644
index 1b01949..0000000
--- a/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/GCEJ7DMULFTT25UH4FAAGOZ6KER4WXAYQGJUSIITQD527DGTKSXKBQGR.md
+++ /dev/null
@@ -1 +0,0 @@
-10000000.00
\ No newline at end of file
diff --git a/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/GCWHWDRXYPXQAOYMQKB66SZPLM6UANKGMSL4SP7LSOIA6OTTOYQ6HBIH.md b/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/GCWHWDRXYPXQAOYMQKB66SZPLM6UANKGMSL4SP7LSOIA6OTTOYQ6HBIH.md
deleted file mode 100644
index 182e928..0000000
--- a/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/GCWHWDRXYPXQAOYMQKB66SZPLM6UANKGMSL4SP7LSOIA6OTTOYQ6HBIH.md
+++ /dev/null
@@ -1 +0,0 @@
-328241.81
\ No newline at end of file
diff --git a/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/GDIJY6K2BBRIRX423ZFUYKKFDN66XP2KMSBZFQSE2PSNDZ6EDVQTRLSU.md b/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/GDIJY6K2BBRIRX423ZFUYKKFDN66XP2KMSBZFQSE2PSNDZ6EDVQTRLSU.md
deleted file mode 100644
index 76e10f5..0000000
--- a/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/GDIJY6K2BBRIRX423ZFUYKKFDN66XP2KMSBZFQSE2PSNDZ6EDVQTRLSU.md
+++ /dev/null
@@ -1 +0,0 @@
-10110962.98
\ No newline at end of file
diff --git a/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/GDKXTUYNW4BJKDM2L7B5XUYFUISV52KUU4G7VPNLF4ZSIKBURM622YPZ.md b/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/GDKXTUYNW4BJKDM2L7B5XUYFUISV52KUU4G7VPNLF4ZSIKBURM622YPZ.md
deleted file mode 100644
index c280877..0000000
--- a/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/GDKXTUYNW4BJKDM2L7B5XUYFUISV52KUU4G7VPNLF4ZSIKBURM622YPZ.md
+++ /dev/null
@@ -1 +0,0 @@
-12996500.00
\ No newline at end of file
diff --git a/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/GDLVIB44LVONM5K67LUPSFZMSX7G2RLYVBM5MMHUJ4NAQJU7CH4HBJBO.md b/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/GDLVIB44LVONM5K67LUPSFZMSX7G2RLYVBM5MMHUJ4NAQJU7CH4HBJBO.md
deleted file mode 100644
index 4fb9d52..0000000
--- a/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/GDLVIB44LVONM5K67LUPSFZMSX7G2RLYVBM5MMHUJ4NAQJU7CH4HBJBO.md
+++ /dev/null
@@ -1 +0,0 @@
-14784445.77
\ No newline at end of file
diff --git a/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/GDSKFYNMZWTB3V5AN26CEAQ27643Q3KB4X6MY4UTO2LIIDFND4SPQZYU.md b/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/GDSKFYNMZWTB3V5AN26CEAQ27643Q3KB4X6MY4UTO2LIIDFND4SPQZYU.md
deleted file mode 100644
index 1d65b3e..0000000
--- a/collections/manual/knowledge_base/about/token_overview/special_wallets/wallet_data/GDSKFYNMZWTB3V5AN26CEAQ27643Q3KB4X6MY4UTO2LIIDFND4SPQZYU.md
+++ /dev/null
@@ -1 +0,0 @@
-0.00
\ No newline at end of file
diff --git a/collections/manual/knowledge_base/about/token_overview/token_overview.md b/collections/manual/knowledge_base/about/token_overview/token_overview.md
index 4319621..96ad8b8 100644
--- a/collections/manual/knowledge_base/about/token_overview/token_overview.md
+++ b/collections/manual/knowledge_base/about/token_overview/token_overview.md
@@ -69,8 +69,12 @@ The TFT market price and marketcap are as follows:
 
 | **Description**           | **Value**     |
 | ------------------------- | ------------- |
-| TFT Market Price       | {{#include ../../../values/tft_value.md}} USD |
-| TFT Market Cap | {{#include ../../../values/tft_marketcap.md}}  USD |
+| TFT Market Price       | !!wiki.include page:'manual:tft_value.md' USD |
+| TFT Market Cap | !!wiki.include page:'manual:tft_marketcap.md'  USD |
+
+!!wiki.include page:'manual:tft_value.md' USD
+
+!!wiki.include page:'manual:tft_marketcap.md'
 
 The market cap is equal to the product of the TFT market price and the circulating supply.
 
diff --git a/collections/manual/knowledge_base/cloud/pricing/pricing.md b/collections/manual/knowledge_base/cloud/pricing/pricing.md
index 8854e3d..e09c1aa 100644
--- a/collections/manual/knowledge_base/cloud/pricing/pricing.md
+++ b/collections/manual/knowledge_base/cloud/pricing/pricing.md
@@ -19,21 +19,21 @@
 
 | Cloud Units       | Description                                      | mUSD               | mTFT               |
 | ----------------- | ------------------------------------------------ | ------------------ | ------------------ |
-| Compute Unit (CU) | typically 2 vcpu, 4 GB mem, 50 GB storage        | {{#include ../../../values/CU_MUSD_HOUR.md}}/hour | {{#include ../../../values/CU_MTFT_HOUR.md}}/hour |
-| Storage Unit (SU) | typically 1 TB of netto usable storage (*)       | {{#include ../../../values/SU_MUSD_HOUR.md}}/hour | {{#include ../../../values/SU_MTFT_HOUR.md}}/hour |
-| Network Unit (NU) | 1 GB transfer, bandwidth as used by TFGrid users | {{#include ../../../values/NU_MUSD_HOUR.md}}/hour     | {{#include ../../../values/NU_MTFT_HOUR.md}}/hour     |
+| Compute Unit (CU) | typically 2 vcpu, 4 GB mem, 50 GB storage        | !!wiki.include page:'manual:su_musd_hour.md' | !!wiki.include page:'manual:cu_mtft_hour.md' |
+| Storage Unit (SU) | typically 1 TB of netto usable storage (*)       | !!wiki.include page:'manual:cu_musd_hour.md' | !!wiki.include page:'manual:su_mtft_hour.md' |
+| Network Unit (NU) | 1 GB transfer, bandwidth as used by TFGrid users | !!wiki.include page:'manual:nu_musd_hour.md' | !!wiki.include page:'manual:nu_mtft_hour.md' |
 
 <br>
 
-| Network Addressing | Description                                | mUSD                  | mTFT                  |
-| ------------------ | ------------------------------------------ | --------------------- | --------------------- |
-| IPv4 Address       | Public Ip Address as used by a TFGrid user | {{#include ../../../values/IP_MUSD_HOUR.md}}/hour    | {{#include ../../../values/IP_MTFT_HOUR.md}}/hour    |
-| Unique Name        | Usable as name on webgateways              | {{#include ../../../values/NAME_MUSD_HOUR.md}}  | {{#include ../../../values/NAME_MTFT_HOUR.md}}/hour  |
-| Unique Domain Name | Usable as dns name on webgateways          | {{#include ../../../values/DNAME_MUSD_HOUR.md}}/hour | {{#include ../../../values/DNAME_MTFT_HOUR.md}}/hour |
+| Network Addressing | Description                                | mUSD                  | mTFT                    |
+| ------------------ | ------------------------------------------ | --------------------- | ---------------------   |
+| IPv4 Address       | Public Ip Address as used by a TFGrid user | !!wiki.include page:'manual:ip_musd_hour.md'    | !!wiki.include page:'manual:ip_mtft_hour.md'    |
+| Unique Name        | Usable as name on webgateways              | !!wiki.include page:'manual:name_musd_hour.md'  | !!wiki.include page:'manual:name_mtft_hour.md'  |
+| Unique Domain Name | Usable as dns name on webgateways          | !!wiki.include page:'manual:dname_musd_hour.md' | !!wiki.include page:'manual:dname_mtft_hour.md' |
 
 - mUSD = 1/1000 of USD, mTFT = 1/1000 of TFT
 - TFT pricing pegged to USD (pricing changes in line with TFT/USD rate)
-- The current TFT to USD price is {{#include ../../../values/tft_value.md}} USD
+- The current TFT to USD price is !!wiki.include page:'manual:tft_value.md' USD
 - pricing is calculated per hour for the TFGrid 3.0
 
 > Please check our [Cloud Pricing for utilization sheet](https://docs.google.com/spreadsheets/d/1E6MpGs15h1_flyT5AtyKp1TixH1ILuGo5tzHdmjeYdQ/edit#gid=2014089775) for more details.
diff --git a/collections/manual/knowledge_base/legal/privacypolicy.md b/collections/manual/knowledge_base/legal/privacypolicy.md
index 1d0c4a8..4251396 100644
--- a/collections/manual/knowledge_base/legal/privacypolicy.md
+++ b/collections/manual/knowledge_base/legal/privacypolicy.md
@@ -2,7 +2,7 @@
 
 *This privacy policy will explain how ThreeFold Movement ("companies", “we”, or “us”) uses the personal data we collect from you when you use any of our:*
 
-{{#include ./terms_conditions/sub/websites.md}}
+!!wiki.include page:'manual:websites.md'
 
 ### What data do we collect? 
 
@@ -72,7 +72,7 @@ If you make a request, we have one month to respond to you. If you would like to
 * email: dataprivacy@threefold.io
 
 * post address: 
-{{#include ./threefold_fzc_address.md}}
+!!wiki.include page:'manual:threefold_fzc_address.md'
 
 
 ### What are cookies? 
@@ -117,4 +117,4 @@ If you have any questions about our privacy policy, the data we hold on you, or
 
 Email us at: dataprivacy@threefold.io
 
-{{#include ./terms_conditions/sub/the_single_source_truth.md}}
\ No newline at end of file
+!!wiki.include page:'manual:the_single_source_truth.md'
\ No newline at end of file
diff --git a/collections/manual/values/CU_MTFT_HOUR.md b/collections/manual/values/cu_mtft_hour.md
similarity index 100%
rename from collections/manual/values/CU_MTFT_HOUR.md
rename to collections/manual/values/cu_mtft_hour.md
diff --git a/collections/manual/values/CU_MUSD_HOUR.md b/collections/manual/values/cu_musd_hour.md
similarity index 100%
rename from collections/manual/values/CU_MUSD_HOUR.md
rename to collections/manual/values/cu_musd_hour.md
diff --git a/collections/manual/values/CU_TFT_HOUR.md b/collections/manual/values/cu_tft_hour.md
similarity index 100%
rename from collections/manual/values/CU_TFT_HOUR.md
rename to collections/manual/values/cu_tft_hour.md
diff --git a/collections/manual/values/DNAME_MTFT_HOUR.md b/collections/manual/values/dname_mtft_hour.md
similarity index 100%
rename from collections/manual/values/DNAME_MTFT_HOUR.md
rename to collections/manual/values/dname_mtft_hour.md
diff --git a/collections/manual/values/DNAME_MUSD_HOUR.md b/collections/manual/values/dname_musd_hour.md
similarity index 100%
rename from collections/manual/values/DNAME_MUSD_HOUR.md
rename to collections/manual/values/dname_musd_hour.md
diff --git a/collections/manual/values/IP_MTFT_HOUR.md b/collections/manual/values/ip_mtft_hour.md
similarity index 100%
rename from collections/manual/values/IP_MTFT_HOUR.md
rename to collections/manual/values/ip_mtft_hour.md
diff --git a/collections/manual/values/IP_MUSD_HOUR.md b/collections/manual/values/ip_musd_hour.md
similarity index 100%
rename from collections/manual/values/IP_MUSD_HOUR.md
rename to collections/manual/values/ip_musd_hour.md
diff --git a/collections/manual/values/NAME_MTFT_HOUR.md b/collections/manual/values/name_mtft_hour.md
similarity index 100%
rename from collections/manual/values/NAME_MTFT_HOUR.md
rename to collections/manual/values/name_mtft_hour.md
diff --git a/collections/manual/values/NAME_MUSD_HOUR.md b/collections/manual/values/name_musd_hour.md
similarity index 100%
rename from collections/manual/values/NAME_MUSD_HOUR.md
rename to collections/manual/values/name_musd_hour.md
diff --git a/collections/manual/values/NU_MTFT_HOUR.md b/collections/manual/values/nu_mtft_hour.md
similarity index 100%
rename from collections/manual/values/NU_MTFT_HOUR.md
rename to collections/manual/values/nu_mtft_hour.md
diff --git a/collections/manual/values/NU_MUSD_HOUR.md b/collections/manual/values/nu_musd_hour.md
similarity index 100%
rename from collections/manual/values/NU_MUSD_HOUR.md
rename to collections/manual/values/nu_musd_hour.md
diff --git a/collections/manual/values/SU_MTFT_HOUR.md b/collections/manual/values/su_mtft_hour.md
similarity index 100%
rename from collections/manual/values/SU_MTFT_HOUR.md
rename to collections/manual/values/su_mtft_hour.md
diff --git a/collections/manual/values/SU_MUSD_HOUR.md b/collections/manual/values/su_musd_hour.md
similarity index 100%
rename from collections/manual/values/SU_MUSD_HOUR.md
rename to collections/manual/values/su_musd_hour.md