diff --git a/.obsidian/workspace b/.obsidian/workspace
index db2edd80..b77c57e5 100644
--- a/.obsidian/workspace
+++ b/.obsidian/workspace
@@ -9,7 +9,7 @@
         "state": {
           "type": "markdown",
           "state": {
-            "file": "Reading list/@Reading master.md",
+            "file": "Investments/Crypto Tasks.md",
             "mode": "preview"
           }
         }
@@ -35,7 +35,7 @@
         "state": {
           "type": "search",
           "state": {
-            "query": "tag:#Essay",
+            "query": "tag:#Family",
             "matchingCase": false,
             "explainSearch": false,
             "collapseAll": false,
@@ -68,7 +68,7 @@
         "state": {
           "type": "backlink",
           "state": {
-            "file": "Reading list/@Reading master.md",
+            "file": "Investments/Crypto Tasks.md",
             "collapseAll": false,
             "extraContext": false,
             "sortOrder": "alphabetical",
@@ -100,15 +100,15 @@
   },
   "active": "c1cbd199334b4022",
   "lastOpenFiles": [
-    "Reading list/@Reading master.md",
-    "Internet snippets/Sérotonine.md",
-    "Internet snippets/Pourquoi  Sérotonine  est le plus houellebecquien et le plus triste des romans de Houellebecq.md",
-    "Internet snippets/Soumission (roman).md",
-    "Internet snippets/Under the Volcano.md",
-    "Computer setup/Storage and Syncing.md",
-    "Networks/Postfix config.md",
-    "Networks/Tools Server.md",
-    "Networks/Domains.md",
-    "Internet snippets/Mating.md"
+    "Investments/Crypto Tasks.md",
+    "Investments/@Investment master.md",
+    "Investments/@Investment Task master.md",
+    "Investments/Crypto Investments.md",
+    "Investments/Equity Investments.md",
+    "Investments/VC Investments.md",
+    "Investments/Valneva.md",
+    "Investments/Thalès.md",
+    "Investments/Revolut.md",
+    "Investments/QED Naval.md"
   ]
 }
\ No newline at end of file
diff --git a/Admin/Templates/Template Investment.md b/Admin/Templates/Template Investment.md
index 72e86a3b..58223644 100644
--- a/Admin/Templates/Template Investment.md	
+++ b/Admin/Templates/Template Investment.md	
@@ -6,12 +6,14 @@ Date:
 DocType: "Investment"
 Hierarchy: "NonRoot"
 TimeStamp:
-InvestmentType:
-InvestmentStyle: growth/carry/value
-InvestmentStage: early / scale-up / mature / yield
-PurchaseDate:
-Currency:
-PurchasePrice:
+Investment:
+ Type:
+ Style: growth/carry/value
+ Stage: early / scale-up / mature / yield
+ Ccy:
+Trading:
+ PDate:
+ PPrice:
 
 ---
 
diff --git a/Admin/Templates/Template Server.md b/Admin/Templates/Template Server.md
index 616de6f9..9bd59ab1 100644
--- a/Admin/Templates/Template Server.md	
+++ b/Admin/Templates/Template Server.md	
@@ -5,20 +5,23 @@ Tag: [""]
 Date:
 DocType: "Server"
 Hierarchy: "NonRoot"
-TimeStamp:
-CPU:
-RAM:
-StorageCapa:
-StorageType:
-Bandwidth:
-Speed:
-OS:
-Domiciliation:
-IPv4:
-Hostname:
-Host:
-SubDomain:
-UsedDiskSpace:
+Performance:
+ CPU:
+ RAM:
+ Bandwidth:
+ Speed:
+Characteristics:
+ OS:
+ Domiciliation:
+ IPv4:
+ Hostname:
+ Host:
+ SubDomain:
+Disk:
+ Capa:
+ Type:
+ UsedSpace:
+ TimeStamp:
 
 ---
 
diff --git a/Computer setup/@Computer Set Up.md b/Computer setup/@Computer Set Up.md
index e59b8a24..7afc7fc2 100644
--- a/Computer setup/@Computer Set Up.md	
+++ b/Computer setup/@Computer Set Up.md	
@@ -1,7 +1,7 @@
 ---
 
 Alias: ["ComputerSetup", "Computer Setup"]
-Tag: ["Admin", "Computer", "RootNote"]
+Tag: ["Admin", "Computer", "App", "Cloud"]
 Date: 2021-08-10
 DocType: "Personal"
 Hierarchy: "Root"
diff --git a/Computer setup/Apple processes.md b/Computer setup/Apple processes.md
index 16827fb7..0bcfb075 100644
--- a/Computer setup/Apple processes.md	
+++ b/Computer setup/Apple processes.md	
@@ -1,6 +1,6 @@
 ---
 
-Tag: ["Admin", "Computer", "CommandLine", "Apple", "Root2"]
+Tag: ["Admin", "Computer", "CommandLine", "Apple"]
 Date: 2021-08-10
 DocType: "Personal"
 Hierarchy: "Root2"
diff --git a/Computer setup/Applications.md b/Computer setup/Applications.md
index 51a210da..673b1127 100644
--- a/Computer setup/Applications.md	
+++ b/Computer setup/Applications.md	
@@ -1,7 +1,7 @@
 ---
 
 Alias: ["Apps"]
-Tag: ["Admin", "Computer", "App", "Root2"]
+Tag: ["Admin", "Computer", "App"]
 Date: 2021-08-10
 DocType: "Personal"
 Hierarchy: "Root2"
diff --git a/Computer setup/Internet services.md b/Computer setup/Internet services.md
index d299020e..ff775da0 100644
--- a/Computer setup/Internet services.md	
+++ b/Computer setup/Internet services.md	
@@ -1,6 +1,6 @@
 ---
 
-Tag: ["Admin", "Computer", "Web", "Root2"]
+Tag: ["Admin", "Computer", "Web"]
 Date: 2021-08-10
 DocType: "Personal"
 Hierarchy: "Root2"
diff --git a/Computer setup/Privacy & Security.md b/Computer setup/Privacy & Security.md
index adf2064a..94f1ab1b 100644
--- a/Computer setup/Privacy & Security.md	
+++ b/Computer setup/Privacy & Security.md	
@@ -1,7 +1,7 @@
 ---
 
 Alias: ["Privacy"]
-Tag: ["Admin", "Computer", "Root2", "Security", "Privacy"]
+Tag: ["Admin", "Computer", "Security", "Privacy"]
 Date: 2021-08-10
 DocType: "Personal"
 Hierarchy: "Root2"
diff --git a/Computer setup/Storage and Syncing.md b/Computer setup/Storage and Syncing.md
index d4496cd0..9fc3218d 100644
--- a/Computer setup/Storage and Syncing.md	
+++ b/Computer setup/Storage and Syncing.md	
@@ -1,7 +1,7 @@
 ---
 
 Alias: ["Storage & Sync"]
-Tag: ["Admin", "Computer", "Root2"]
+Tag: ["Admin", "Computer", "Cloud", "Privacy"]
 Date: 2021-08-10
 DocType: "Personal"
 Hierarchy: "Root2"
diff --git a/Internet snippets/Mating.md b/Internet snippets/Mating.md
index c0c520b2..6d6badad 100644
--- a/Internet snippets/Mating.md	
+++ b/Internet snippets/Mating.md	
@@ -1,6 +1,6 @@
 ---
 
-Tag: ["Novel", "Classics", "Reflective", "Relationships", "Africa"]
+Tag: ["Novel", "Classics", "SelfQuest", "Relationships", "Africa"]
 Date: 2021-09-25
 DocType: "Source"
 Hierarchy: "NonRoot"
diff --git a/Internet snippets/Sérotonine.md b/Internet snippets/Sérotonine.md
index d3871cef..c7f7a048 100644
--- a/Internet snippets/Sérotonine.md	
+++ b/Internet snippets/Sérotonine.md	
@@ -1,6 +1,6 @@
 ---
 
-Tag: ["Novel", "Refective", "PersonalQuest", "Suicide"]
+Tag: ["Novel", "SelfQuest", "Social", "Suicide"]
 Date: 2021-09-27
 DocType: "Source"
 Hierarchy: "NonRoot"
diff --git a/Investments/Airbus.md b/Investments/Airbus.md
index f33bc8c8..b7cb27b0 100644
--- a/Investments/Airbus.md
+++ b/Investments/Airbus.md
@@ -7,12 +7,14 @@ DocType: "Investment"
 Hierarchy: "NonRoot"
 TimeStamp: 2021-08-17
 location: [43.6243743,1.3855358]
-InvestmentType: "Equity"
-InvestmentStyle: "Carry"
-InvestmentStage: "Mature"
-PurchaseDate: 2021-02-26
-Currency: EUR
-PurchasePrice: 96.74
+Investment:
+ Type: "Equity"
+ Style: "Carry"
+ Stage: "Mature"
+ Ccy: EUR
+Trading:
+ PDate: 2021-02-26
+ PPrice: 96.74
 
 ---
 
diff --git a/Investments/Aragon.md b/Investments/Aragon.md
index 91f6bdc3..47e1b44e 100644
--- a/Investments/Aragon.md
+++ b/Investments/Aragon.md
@@ -7,12 +7,14 @@ DocType: "Investment"
 Hierarchy: "NonRoot"
 location: [47.1644093,8.5153325]
 TimeStamp: 2021-08-17
-InvestmentType: "Crypto"
-InvestmentStyle: "Growth"
-InvestmentStage: "Early"
-PurchaseDate: 2021-03-22
-Currency: USD
-PurchasePrice: 8.007
+Investment:
+ Type: "Crypto"
+ Style: "Growth"
+ Stage: "Early"
+ Ccy: USD
+Trading:
+ PDate: 2021-03-22
+ PPrice: 8.007
 
 ---
 
diff --git a/Investments/Chainlink.md b/Investments/Chainlink.md
index 3e735168..9dd70481 100644
--- a/Investments/Chainlink.md
+++ b/Investments/Chainlink.md
@@ -7,12 +7,14 @@ DocType: "Investment"
 Hierarchy: "NonRoot"
 TimeStamp: 2021-08-17
 location: [19.2824849, -81.24453276644255]
-InvestmentType: "Crypto"
-InvestmentStyle: "Growth"
-InvestmentStage: "Scale-up"
-PurchaseDate: 2021-03-06
-Currency: USD
-PurchasePrice: 28.68538
+Investment:
+ Type: "Crypto"
+ Style: "Growth"
+ Stage: "Scale-up"
+ Ccy: USD
+Trading:
+ PDate: 2021-03-06
+ PPrice: 28.68538
 
 ---
 
diff --git a/Investments/Crypto Investments.md b/Investments/Crypto Investments.md
index c971bf9e..35cdee8f 100644
--- a/Investments/Crypto Investments.md	
+++ b/Investments/Crypto Investments.md	
@@ -54,8 +54,8 @@ style: number
  
 
 ```dataview
-	Table Currency, InvestmentStyle as "Style", InvestmentStage as "Stage" from "Investments"
-	Where DocType = "Investment" and InvestmentType = "Crypto"
+	Table Investment.Ccy as "Currency", Investment.Style as "Style", Investment.Stage as "Stage" from "Investments"
+	Where DocType = "Investment" and Investment.Type = "Crypto"
 	Sort file.name ascending
 ```
 
@@ -69,11 +69,9 @@ style: number
 
  
 
-
-
 ```dataview
-	Table Currency, PurchasePrice as "Price at Purchase", PurchaseDate as "Investment Date" from "Investments"
-	Where DocType = "Investment" and InvestmentType = "Crypto"
+	Table Investment.Ccy as "Currency", Trading.PPrice as "Price at Purchase", Trading.PDate as "Investment Date" from "Investments"
+	Where DocType = "Investment" and Investment.Type = "Crypto"
 	Sort file.name ascending
 ```
 
diff --git a/Investments/EOS.md b/Investments/EOS.md
index f93f2cc5..633ab8d7 100644
--- a/Investments/EOS.md
+++ b/Investments/EOS.md
@@ -7,12 +7,14 @@ DocType: "Investment"
 Hierarchy: "NonRoot"
 TimeStamp: 2021-08-17
 location: [19.2953549, -81.3807776]
-InvestmentType: "Crypto"
-InvestmentStyle: "Growth"
-InvestmentStage: "Early"
-PurchaseDate: 2021-03-06
-Currency: USD
-PurchasePrice: 4.57
+Investment:
+ Type: "Crypto"
+ Style: "Growth"
+ Stage: "Early"
+ Ccy: USD
+Trading:
+ PDate: 2021-03-06
+ PPrice: 4.57
 
 ---
 
diff --git a/Investments/Enjin.md b/Investments/Enjin.md
index 9f3fc467..d75fe98b 100644
--- a/Investments/Enjin.md
+++ b/Investments/Enjin.md
@@ -7,12 +7,14 @@ DocType: "Investment"
 Hierarchy: "NonRoot"
 TimeStamp: 2021-08-17
 location: [1.2813384, 103.85091665]
-InvestmentType: "Crypto"
-InvestmentStyle: "Growth"
-InvestmentStage: "Early"
-PurchaseDate: 2021-03-08
-Currency: USD
-PurchasePrice: 1.9
+Investment:
+ Type: "Crypto"
+ Style: "Growth"
+ Stage: "Early"
+ Ccy: USD
+Trading:
+ PDate: 2021-03-08
+ PPrice: 1.9
 
 ---
 
diff --git a/Investments/Equity Investments.md b/Investments/Equity Investments.md
index da16b2b0..d55a2594 100644
--- a/Investments/Equity Investments.md	
+++ b/Investments/Equity Investments.md	
@@ -54,8 +54,8 @@ style: number
  
 
 ```dataview
-	Table Currency, InvestmentStyle as "Style", InvestmentStage as "Stage" from "Investments"
-	Where DocType = "Investment" and InvestmentType = "Equity"
+	Table Investment.Ccy as "Currency", Investment.Style as "Style", Investment.Stage as "Stage" from "Investments"
+	Where DocType = "Investment" and Investment.Type = "Equity"
 	Sort file.name ascending
 ```
 
@@ -69,11 +69,9 @@ style: number
 
  
 
-
-
 ```dataview
-	Table Currency, PurchasePrice as "Price at Purchase", PurchaseDate as "Investment Date" from "Investments"
-	Where DocType = "Investment" and InvestmentType = "Equity"
+	Table Investment.Ccy as "Currency", Trading.PPrice as "Price at Purchase", Trading.PDate as "Investment Date" from "Investments"
+	Where DocType = "Investment" and Investment.Type = "Equity"
 	Sort file.name ascending
 ```
 
diff --git a/Investments/Holochain.md b/Investments/Holochain.md
index 5c3df110..370a95c4 100644
--- a/Investments/Holochain.md
+++ b/Investments/Holochain.md
@@ -7,12 +7,14 @@ DocType: "Investment"
 Hierarchy: "NonRoot"
 TimeStamp: 2021-08-17
 location: [36.14231564218552, -5.352527091457547]
-InvestmentType: "Crypto"
-InvestmentStyle: "Growth"
-InvestmentStage: "Early"
-PurchaseDate: 2021-03-29
-Currency: USD
-PurchasePrice: 0.01283
+Investment:
+ Type: "Crypto"
+ Style: "Growth"
+ Stage: "Early"
+ Ccy: USD
+Trading:
+ PDate: 2021-03-29
+ PPrice: 0.01283
 
 ---
 
diff --git a/Investments/Le Miel de Paris.md b/Investments/Le Miel de Paris.md
index 578a5efb..1e888f09 100644
--- a/Investments/Le Miel de Paris.md	
+++ b/Investments/Le Miel de Paris.md	
@@ -6,12 +6,14 @@ DocType: "Investment"
 Hierarchy: "NonRoot"
 TimeStamp: 2021-08-17
 location: [48.3197389, 1.4599852]
-InvestmentType: "VC"
-InvestmentStyle: "Growth"
-InvestmentStage: "Early"
-PurchaseDate: 2019-08-14
-Currency: EUR
-PurchasePrice: 0.01
+Investment:
+ Type: "VC"
+ Style: "Growth"
+ Stage: "Early"
+ Ccy: EUR
+Trading:
+ PDate: 2019-08-14
+ PPrice: 0.01
 
 ---
 
diff --git a/Investments/Nimbus.md b/Investments/Nimbus.md
index 8f718ae9..3c28fce2 100644
--- a/Investments/Nimbus.md
+++ b/Investments/Nimbus.md
@@ -7,12 +7,14 @@ DocType: "Investment"
 Hierarchy: "NonRoot"
 TimeStamp: 2021-08-17
 location: [35.9080678, 14.4788068]
-InvestmentType: "Crypto"
-InvestmentStyle: "Growth"
-InvestmentStage: "Early"
-PurchaseDate: 2021-03-09
-Currency: USD
-PurchasePrice: 1.23
+Investment:
+ Type: "Crypto"
+ Style: "Growth"
+ Stage: "Early"
+ Ccy: USD
+Trading:
+ PDate: 2021-03-09
+ PPrice: 1.23
 
 ---
 
diff --git a/Investments/Ocean Protocol.md b/Investments/Ocean Protocol.md
index 17553cfa..4a44dc86 100644
--- a/Investments/Ocean Protocol.md	
+++ b/Investments/Ocean Protocol.md	
@@ -7,12 +7,14 @@ DocType: "Investment"
 Hierarchy: "NonRoot"
 TimeStamp: 2021-08-17
 location: [1.336245, 103.8866274]
-InvestmentType: "Crypto"
-InvestmentStyle: "Growth"
-InvestmentStage: "Early"
-PurchaseDate: 2021-03-15
-Currency: USD
-PurchasePrice: 1.47497
+Investment:
+ Type: "Crypto"
+ Style: "Growth"
+ Stage: "Early"
+ Ccy: USD
+Trading:
+ PDate: 2021-03-15
+ PPrice: 1.47497
 
 ---
 
diff --git a/Investments/Polkadot.md b/Investments/Polkadot.md
index d8644a6f..d84b91dc 100644
--- a/Investments/Polkadot.md
+++ b/Investments/Polkadot.md
@@ -7,12 +7,14 @@ DocType: "Investment"
 Hierarchy: "NonRoot"
 TimeStamp: 2021-08-17
 location: [47.1644093,8.5153325]
-InvestmentType: "Crypto"
-InvestmentStyle: "Growth"
-InvestmentStage: "Scale-up"
-PurchaseDate: 2021-03-15
-Currency: USD
-PurchasePrice: 34.52
+Investment:
+ Type: "Crypto"
+ Style: "Growth"
+ Stage: "Scale-up"
+ Ccy: USD
+Trading:
+ PDate: 2021-03-15
+ PPrice: 34.52
 
 ---
 
diff --git a/Investments/QED Naval.md b/Investments/QED Naval.md
index 042cd6ac..9cdb2c1d 100644
--- a/Investments/QED Naval.md	
+++ b/Investments/QED Naval.md	
@@ -7,12 +7,14 @@ DocType: "Investment"
 Hierarchy: "NonRoot"
 TimeStamp: 2021-08-17
 location: [55.951496985714286, -3.202781542857143]
-InvestmentType: "VC"
-InvestmentStyle: "Growth"
-InvestmentStage: "Early"
-PurchaseDate: 2021-04-19
-Currency: GBP
-PurchasePrice: 19.22
+Investment:
+ Type: "VC"
+ Style: "Growth"
+ Stage: "Early"
+ Ccy: GBP
+Trading:
+ PDate: 2021-04-19
+ PPrice: 19.22
 
 ---
 
diff --git a/Investments/Revolut.md b/Investments/Revolut.md
index f5608731..33c9f9f6 100644
--- a/Investments/Revolut.md
+++ b/Investments/Revolut.md
@@ -6,12 +6,14 @@ DocType: "Investment"
 Hierarchy: "NonRoot"
 TimeStamp: 2021-08-17
 location: [51.5060892, -0.0257628]
-InvestmentType: "VC"
-InvestmentStyle: "Growth"
-InvestmentStage: "Scale-up"
-PurchaseDate: 2017-08-21
-Currency: GBP
-PurchasePrice: 8.5
+Investment:
+ Type: "VC"
+ Style: "Growth"
+ Stage: "Scale-up"
+ Ccy: GBP
+Trading:
+ PDate: 2017-08-21
+ PPrice: 8.5
 
 ---
 
diff --git a/Investments/Thalès.md b/Investments/Thalès.md
index 217da441..b2eb22e2 100644
--- a/Investments/Thalès.md
+++ b/Investments/Thalès.md
@@ -1,18 +1,20 @@
 ---
 
 Alias: ["Thales", "Thalès SA", "TCFP.PA"]
-Tag: ["Wealth", "Investment", "Equity", "Industrial", "Manufacturer", "Strategic_Assets"]
+Tag: ["Wealth", "Investment", "Equity", "Industrial", "Manufacturer", "StrategicAssets"]
 Date: 2021-08-17
 DocType: "Investment"
 Hierarchy: "NonRoot"
 TimeStamp: 2021-08-17
 location: [48.8915577,2.2458169]
-InvestmentType: "Equity"
-InvestmentStyle: "Carry"
-InvestmentStage: "Mature"
-PurchaseDate: 2021-05-03
-Currency: EUR
-PurchasePrice: 84.84
+Investment:
+ Type: "Equity"
+ Style: "Carry"
+ Stage: "Mature"
+ Ccy: EUR
+Trading:
+ PDate: 2021-05-03
+ PPrice: 84.84
 
 ---
 
diff --git a/Investments/VC Investments.md b/Investments/VC Investments.md
index 3bd28db5..f7c625ef 100644
--- a/Investments/VC Investments.md	
+++ b/Investments/VC Investments.md	
@@ -54,8 +54,8 @@ style: number
  
 
 ```dataview
-	Table Currency, InvestmentStyle as "Style", InvestmentStage as "Stage" from "Investments"
-	Where DocType = "Investment" and InvestmentType = "VC"
+	Table Investment.Ccy as "Currency", Investment.Style as "Style", Investment.Stage as "Stage" from "Investments"
+	Where DocType = "Investment" and Investment.Type = "VC"
 	Sort file.name ascending
 ```
 
@@ -69,11 +69,9 @@ style: number
 
  
 
-
-
 ```dataview
-	Table Currency, PurchasePrice as "Price at Purchase", PurchaseDate as "Investment Date" from "Investments"
-	Where DocType = "Investment" and InvestmentType = "VC"
+	Table Investment.Ccy as "Currency", Trading.PPrice as "Price at Purchase", Trading.PDate as "Investment Date" from "Investments"
+	Where DocType = "Investment" and Investment.Type = "VC"
 	Sort file.name ascending
 ```
 
diff --git a/Investments/Valneva.md b/Investments/Valneva.md
index cfac154b..a6e82d74 100644
--- a/Investments/Valneva.md
+++ b/Investments/Valneva.md
@@ -7,12 +7,14 @@ DocType: "Investment"
 Hierarchy: "NonRoot"
 TimeStamp: 2021-08-17
 location: [47.2329863,-1.6420352]
-InvestmentType: "Equity"
-InvestmentStyle: "Growth"
-InvestmentStage: "Scale-Up"
-PurchaseDate: 2021-05-03
-Currency: EUR
-PurchasePrice: 13.9
+Investment:
+ Type: "Equity"
+ Style: "Growth"
+ Stage: "Scale-Up"
+ Ccy: EUR
+Trading:
+ PDate: 2021-05-03
+ PPrice: 13.9
 
 ---
 
diff --git a/Life Orga/Finances.md b/Life Orga/Finances.md
index 024fba2f..62cf7dff 100644
--- a/Life Orga/Finances.md	
+++ b/Life Orga/Finances.md	
@@ -1,6 +1,6 @@
 ---
 
-Tag: ["Admin", "Life Hack", "Finance"]
+Tag: ["Admin", "LifeHacks", "Finance"]
 Date: 2021-08-12
 DocType: "Task"
 Hierarchy: "NonRoot"
diff --git a/Life Orga/IT & Computer.md b/Life Orga/IT & Computer.md
index d5853367..45af0e21 100644
--- a/Life Orga/IT & Computer.md	
+++ b/Life Orga/IT & Computer.md	
@@ -1,6 +1,6 @@
 ---
 
-Tag: ["Life Hack", "Admin", "Computer"]
+Tag: ["LifeHacks", "Admin", "Computer"]
 Date: 2021-08-12
 DocType: "Task"
 Hierarchy: "NonRoot"
diff --git a/Life Orga/Life Admin.md b/Life Orga/Life Admin.md
index 12bc4224..f2b2f75e 100644
--- a/Life Orga/Life Admin.md	
+++ b/Life Orga/Life Admin.md	
@@ -1,6 +1,6 @@
 ---
 
-Tag: ["Admin", "Life Hack", "Utilities", "PublicService"]
+Tag: ["Admin", "LifeHacks", "Utilities", "PublicService"]
 Date: 2021-08-12
 DocType: "Task"
 Hierarchy: "NonRoot"
diff --git a/Life Orga/Lifestyle.md b/Life Orga/Lifestyle.md
index 82b0f452..25c4ba17 100644
--- a/Life Orga/Lifestyle.md	
+++ b/Life Orga/Lifestyle.md	
@@ -1,6 +1,6 @@
 ---
 
-Tag: ["Admin", "Life Hack", "Lifestyle"]
+Tag: ["Admin", "LifeHacks", "Lifestyle"]
 Date: 2021-08-12
 DocType: "Task"
 Hierarchy: "NonRoot"
diff --git a/Life Orga/Personal projects.md b/Life Orga/Personal projects.md
index 39498f03..4f0904d8 100644
--- a/Life Orga/Personal projects.md	
+++ b/Life Orga/Personal projects.md	
@@ -1,6 +1,6 @@
 ---
 
-Tag: ["Admin", "Personal", "Life Hack"]
+Tag: ["Admin", "LifeHacks"]
 Date: 2021-08-12
 DocType: "Task"
 Hierarchy: "NonRoot"
diff --git a/Networks/@Networks.md b/Networks/@Networks.md
index 6dbca218..55f184e2 100644
--- a/Networks/@Networks.md
+++ b/Networks/@Networks.md
@@ -185,7 +185,7 @@ _**Total**_ | *€14.5* | *€118.79*
  
 
 ```dataview
-	Table without id file.link as "Server name", Host as "Provider", SubDomain as "Service", Domiciliation, IPv4 as "IP Address" from "Networks"
+	Table without id file.link as "Server name", Characteristics.Host as "Provider", Characteristics.SubDomain as "Service", Characteristics.Domiciliation as "Location", Characteristics.IPv4 as "IP Address" from "Networks"
 	Where DocType = "Server"
 	Sort file.name ascending
 ```
@@ -197,7 +197,7 @@ _**Total**_ | *€14.5* | *€118.79*
  
 
 ```dataview
-	Table without id file.link as "Service", OS, CPU, RAM, StorageCapa as "Storage", StorageType as "Drive type", Bandwidth, Speed from "Networks"
+	Table without id file.link as "Service", Characteristics.OS as "OS", Performance.CPU as "CPU", Performance.RAM as "RAM", Disk.Capa as "Disk Size", Disk.Type as "Disk type", Performance.Bandwidth as "Bandwidth", Performance.Speed as "Speed" from "Networks"
 	Where DocType = "Server"
 	Sort file.name ascending
 ```
@@ -209,7 +209,7 @@ _**Total**_ | *€14.5* | *€118.79*
  
 
 ```dataview
-	Table without id file.link as "Server name", StorageCapa as "Storage", UsedDiskSpace as "Used Space", TimeStamp from "Networks"
+	Table without id file.link as "Server name", Disk.Capa as "Disk Size", Disk.UsedSpace as "Used Space", Disk.TimeStamp as "Date updated" from "Networks"
 	Where DocType = "Server"
 	Sort file.name ascending
 ```
diff --git a/Networks/Alias Server.md b/Networks/Alias Server.md
index 75a40883..482b2292 100644
--- a/Networks/Alias Server.md	
+++ b/Networks/Alias Server.md	
@@ -5,21 +5,24 @@ Tag: ["Server", "App", "Cloud", "Privacy", "Security", "Web"]
 Date: 2021-08-28
 DocType: "Server"
 Hierarchy: "NonRoot"
-TimeStamp: 2021-09-23
 location: [48.8570517, 2.3677354]
-CPU: 1Core
-RAM: 2GB
-StorageCapa: 20GB
-StorageType: SSD
-Bandwidth: 2TB
-Speed: 100MBps
-OS: Ubuntu 20.04
-Domiciliation: NL
-Host: Hostigger
-IPv4: 5.181.166.123
-Hostname: 1630136610
-SubDomain: emailalias
-UsedDiskSpace: 41%
+Performance:
+ CPU: 1Core
+ RAM: 2GB
+ Bandwidth: 2TB
+ Speed: 100MBps
+Characteristics:
+ OS: Ubuntu 20.04
+ Domiciliation: NL
+ Host: Hostigger
+ IPv4: 5.181.166.123
+ Hostname: 1630136610
+ SubDomain: emailalias
+Disk:
+ Capa: 20GB
+ Type: SSD
+ UsedSpace: 45%
+ TimeStamp: 2021-09-27
 
 ---
 
diff --git a/Networks/Cloud Server.md b/Networks/Cloud Server.md
index 71cf444e..ea41c6f2 100644
--- a/Networks/Cloud Server.md	
+++ b/Networks/Cloud Server.md	
@@ -6,20 +6,23 @@ Date: 2021-09-03
 DocType: "Server"
 Hierarchy: "NonRoot"
 location: [48.8570517, 2.3677354]
-TimeStamp: 2021-09-23
-CPU: 1Core
-RAM: 512MB
-StorageCapa: 128GB
-StorageType: HDD
-Bandwidth: 500GB
-Speed: 1Gbps
-OS: Ubuntu 20.04
-Domiciliation: BG
-IPv4: 82.118.235.70
-Hostname: sofstorage14
-Host: AlphaVPS
-SubDomain: cloud
-UsedDiskSpace: 20%
+Performance:
+ CPU: 1Core
+ RAM: 512MB
+ Bandwidth: 500GB
+ Speed: 1Gbps
+Characteristics:
+ OS: Ubuntu 20.04
+ Domiciliation: BG
+ IPv4: 82.118.235.70
+ Hostname: sofstorage14
+ Host: AlphaVPS
+ SubDomain: cloud
+Disk:
+ Capa: 128GB
+ Type: HDD
+ UsedSpace: 21%
+ TimeStamp: 2021-09-27
 
 ---
 
diff --git a/Networks/Postfix config.md b/Networks/Postfix config.md
index 1316c8e2..4005cc30 100644
--- a/Networks/Postfix config.md	
+++ b/Networks/Postfix config.md	
@@ -286,5 +286,28 @@ title: check number of users
 
 Allow for connecting to an external SMTP - not tested.
 
+ 
+
+
+---
+
+ 
+
+### Monitor Postfix
+
+ 
+
+#### Monitor outgoing emails
+
+Unfortunately there is no built-in functionality to monitor specifically outgoing emails. The following command can however be used and grans relevant info from `mail.log`:
+
+`sudo grep "status=sent" /var/log/mail.log | egrep -ve 'postfix/(cleanup|pickup|master|qmgr|smtpd|local|pipe)'`
+
+ 
+
+#### Monitor SMTP connections
+
+`sudo tail -f /var/log/mail.log`
+
  
  
\ No newline at end of file
diff --git a/Networks/Tools Server.md b/Networks/Tools Server.md
index 42f440cf..ba6ff6d3 100644
--- a/Networks/Tools Server.md	
+++ b/Networks/Tools Server.md	
@@ -1,23 +1,26 @@
 ---
 
-Tag: ["Server", "Security", "Privacy", "App", "Web"]
+Tag: ["Server", "Security", "Privacy", "App", "Web", "Tools"]
 Date: 2021-09-19
 DocType: "Server"
 Hierarchy: "NonRoot"
-TimeStamp: 2021-09-24
-CPU: 2Core
-RAM: 4GB
-StorageCapa: 40GB
-StorageType: SSD
-Bandwidth: 4TB
-Speed:
-OS: Ubuntu 20.04
-Domiciliation: NL
-IPv4: 41.216.181.11
-Hostname: vm919620.desivps.com
-Host: DesiVPS
-SubDomain: tools
-UsedDiskSpace: 17%
+Performance:
+ CPU: 2Core
+ RAM: 4GB
+ Bandwidth: 4TB
+ Speed:
+Characteristics:
+ OS: Ubuntu 20.04
+ Domiciliation: NL
+ IPv4: 41.216.181.11
+ Hostname: vm919620.desivps.com
+ Host: DesiVPS
+ SubDomain: tools
+Disk:
+ Capa: 40GB
+ Type: SSD
+ UsedSpace: 19%
+ TimeStamp: 2021-09-27
 
 ---
 
@@ -194,12 +197,19 @@ JavaScript & JS package manager.
 
 | Service | Used value
 |---------|:---------:
-**Internal docker network** | 17.27.37.x
+  |  
+**Network: [[Docker config\|docker]] dedicated** | 17.27.37.x
+**IP: pw-manager** | 17.27.37.3
+**IP: Mininote** | 17.27.37.7
+**IP: Git** | 172.21.0.3
+**IP: Git db** | 172.21.0.4
+  |  
 **Port: SSH** | 2227
 **Port: Git server** | 8087
 **Port: Git SSH** | 2228
 
 
+
  
 
 ---
@@ -217,8 +227,8 @@ JavaScript & JS package manager.
 ```ad-info
 title: service parameters
 **IP**: 17.27.37.3:80
-**Docker ID**: 970b6f4b6150fa03be24287ae29a065c06ff7ed91a3402f8184c8a9aafa5e94d
-**Docker Name**: bitwarden_bitwarden_1
+**DockerID**: 970b6f4b6150fa03be24287ae29a065c06ff7ed91a3402f8184c8a9aafa5e94d
+**DockerName**: bitwarden_bitwarden_1
 ---
 **Address**: https://pw-manager.mfxm.fr
 ```
@@ -251,8 +261,8 @@ The admin panel needs to be set up with an authentication token and is accessed
 ```ad-info
 title: service parameters
 **IP**: 17.27.37.7:3000
-**Docker ID**: 73d91d338b533c05a4ad15968efb0470e924f780d016fab13c98f8f1dc3820af
-**Docker Name**: mininote_mininote_1
+**DockerID**: 73d91d338b533c05a4ad15968efb0470e924f780d016fab13c98f8f1dc3820af
+**DockerName**: mininote_mininote_1
 ---
 **Address**: https://notes.mfxm.fr
 ```
diff --git a/Networks/VPS Console Dialogue.md b/Networks/VPS Console Dialogue.md
index c2142de6..3118d05c 100644
--- a/Networks/VPS Console Dialogue.md	
+++ b/Networks/VPS Console Dialogue.md	
@@ -251,6 +251,25 @@ With a text as set out below:
 > This server is the property of mydomain.example
 
 
+ 
+
+#### Network monitoring
+
+```ad-info
+title: simple port monitoring
+`sudo netstat -an`
+```
+
+```ad-info
+title: acti r port monitoring
+`sudo netstat -anp (IP/TCP/UDP)`
+```
+
+```ad-info
+title: simple port stats
+`sudo netstat -sp (IP/TCP/UDP)`
+```
+
  
 
 ---
diff --git a/Reading list/@Reading master.md b/Reading list/@Reading master.md
index c574edd9..faeb273a 100644
--- a/Reading list/@Reading master.md	
+++ b/Reading list/@Reading master.md	
@@ -1,7 +1,7 @@
 ---
 
 Alias: ["Reading", "Reading list"]
-Tag: ["Book"]
+Tag: ["Lifestyle", "LifeHacks", "Book"]
 Date: 2021-09-25
 DocType: "Personal"
 Hierarchy: "Root"
diff --git a/Reading list/Comprendre l'islam.md b/Reading list/Comprendre l'islam.md
index efdbb1cf..3db6a10f 100644
--- a/Reading list/Comprendre l'islam.md	
+++ b/Reading list/Comprendre l'islam.md	
@@ -7,10 +7,10 @@ Hierarchy: "NonRoot"
 TimeStamp: 2020-09
 location: [51.514678599999996, -0.18378583926867909]
 SourceType: "Book"
+SourceLink: https://www.laprocure.com/comprendre-islam-plutot-pourquoi-comprend-rien-adrien-candiard/9782081386587.html
 Language: FR
 Author: Adrien Candiard
 PublishedDate: 2016
-SourceLink: https://www.laprocure.com/comprendre-islam-plutot-pourquoi-comprend-rien-adrien-candiard/9782081386587.html
 
 ---