diff --git a/Categories/Board games.md b/Categories/Board games.md
index d17dfff..ece506d 100644
--- a/Categories/Board games.md	
+++ b/Categories/Board games.md	
@@ -3,21 +3,4 @@ tags:
   - categories
 ---
 
-```base
-display:
-  file.name: Game
-  property.rating: Rating
-  property.last: Last
-views:
-  - type: table
-    name: Table
-    filters:
-      and:
-        - contains(categories, concat("[[", this.file.name, "]]"))
-        - not(contains(file.name, "Template"))
-    order:
-      - file.name
-      - rating
-      - last
-
-```
\ No newline at end of file
+![[Board games.base]]
\ No newline at end of file
diff --git a/Categories/Companies.md b/Categories/Companies.md
index 27c11bc..6aa029e 100644
--- a/Categories/Companies.md
+++ b/Categories/Companies.md
@@ -3,19 +3,4 @@ tags:
   - categories
 ---
 
-```base
-display:
-  file.name: Company
-  property.url: Link
-views:
-  - type: table
-    name: Table
-    filters:
-      and:
-        - contains(categories, concat("[[", this.file.name, "]]"))
-        - not(contains(file.name, "Template"))
-    order:
-      - file.name
-      - url
-
-```
+![[Companies.base]]
diff --git a/Categories/Events.md b/Categories/Events.md
index 32eb73d..b5ef5c5 100644
--- a/Categories/Events.md
+++ b/Categories/Events.md
@@ -3,23 +3,4 @@ tags:
   - categories
 ---
 
-```base
-filters:
-  and:
-    - contains(categories, concat("[[", this.file.name, "]]"))
-    - not(contains(file.name, "Template"))
-display:
-  file.name: Event
-  property.type: Type
-  property.start: Start
-  property.loc: Location
-views:
-  - type: table
-    name: Table
-    order:
-      - file.name
-      - loc
-      - type
-      - start
-
-```
\ No newline at end of file
+![[Events.base]]
\ No newline at end of file
diff --git a/Categories/Evergreen.md b/Categories/Evergreen.md
index b357872..d2dc003 100644
--- a/Categories/Evergreen.md
+++ b/Categories/Evergreen.md
@@ -4,18 +4,4 @@ tags:
 ---
 An evergreen note is an idea. It doesn't have to be something that I agree with, but something is [[Composability|composable]]. In a way, every idiom is a kind of evergreen idea.
 
-```base
-display:
-  file.name: Name
-  property.created: Created
-views:
-  - type: table
-    name: Table
-    filters:
-      and:
-        - contains(property.tags, "0🌲")
-        - not(contains(file.name, "Template"))
-    order:
-      - file.name
-      - created
-```
\ No newline at end of file
+![[Evergreen.base]]
\ No newline at end of file
diff --git a/Categories/Journal.md b/Categories/Journal.md
index eeea38f..32de41a 100644
--- a/Categories/Journal.md
+++ b/Categories/Journal.md
@@ -3,19 +3,4 @@ tags:
   - categories
 ---
 
-```base
-filters:
-  and:
-    - contains(property.tags, "journal")
-    - not(contains(file.name, "Template"))
-display:
-  file.name: Entry
-  property.created: Created
-views:
-  - type: table
-    name: Table
-    order:
-      - file.name
-      - created
-
-```
+![[Journal.base]]
diff --git a/Categories/People.md b/Categories/People.md
index 1c00cc3..959f61e 100644
--- a/Categories/People.md
+++ b/Categories/People.md
@@ -3,19 +3,4 @@ tags:
   - categories
 ---
 
-```base
-filters:
-  and:
-    - contains(property.categories, "[[People]]")
-    - not(contains(file.name, "Template"))
-display:
-  file.name: Name
-  property.tags: Tags
-views:
-  - type: table
-    name: Table
-    order:
-      - file.name
-      - tags
-
-```
\ No newline at end of file
+![[People.base]]
\ No newline at end of file
diff --git a/Categories/Podcasts.md b/Categories/Podcasts.md
index be7cffd..e99e618 100644
--- a/Categories/Podcasts.md
+++ b/Categories/Podcasts.md
@@ -2,19 +2,4 @@
 related: "[[Podcast episodes]]"
 ---
 
-```base
-display:
-  file.name: Podcast
-  property.host: Host
-views:
-  - type: table
-    name: Table
-    filters:
-      and:
-        - contains(categories, concat("[[", this.file.name, "]]"))
-        - not(contains(file.name, "Template"))
-    order:
-      - file.name
-      - host
-```
-
+![[Podcasts.base]]
diff --git a/Categories/Posts.md b/Categories/Posts.md
index 04dec8e..994f126 100644
--- a/Categories/Posts.md
+++ b/Categories/Posts.md
@@ -3,21 +3,4 @@ tags:
   - categories
 ---
 
-```base
-display:
-  file.name: Title
-  property.status: Status
-  property.published: Published
-views:
-  - type: table
-    name: Table
-    filters:
-      and:
-        - contains(categories, concat("[[", this.file.name, "]]"))
-        - not(contains(file.name, "Template"))
-    order:
-      - file.name
-      - status
-      - published
-
-```
\ No newline at end of file
+![[Posts.base]]
\ No newline at end of file
diff --git a/Categories/Projects.md b/Categories/Projects.md
index 09dfc82..57c26de 100644
--- a/Categories/Projects.md
+++ b/Categories/Projects.md
@@ -3,25 +3,4 @@ tags:
   - categories
 ---
 
-```base
-filters:
-  and:
-    - contains(categories, concat("[[", this.file.name, "]]"))
-    - not(contains(file.name, "Template"))
-display:
-  property.status: Status
-  property.url: URL
-  file.name: Name
-  property.type: Type
-  property.year: Year
-views:
-  - type: table
-    name: Table
-    order:
-      - file.name
-      - type
-      - year
-      - status
-      - url
-
-```
+![[Projects.base]]
diff --git a/Categories/Shows.md b/Categories/Shows.md
index 5130e69..6a47ed0 100644
--- a/Categories/Shows.md
+++ b/Categories/Shows.md
@@ -2,21 +2,5 @@
 tags:
   - categories
 ---
-```base
-filters:
-  and:
-    - contains(categories, concat("[[", this.file.name, "]]"))
-    - not(contains(file.name, "Template"))
-display:
-  file.name: Name
-  property.rating: Rating
-  property.last: Last
-views:
-  - type: table
-    name: Table
-    order:
-      - file.name
-      - rating
-      - last
 
-```
+![[Shows.base]]
diff --git a/Templates/Bases/Board games.base b/Templates/Bases/Board games.base
new file mode 100644
index 0000000..a0d24f9
--- /dev/null
+++ b/Templates/Bases/Board games.base	
@@ -0,0 +1,15 @@
+filters:
+  and:
+    - contains(property.categories, "[[Board games]]")
+    - not(contains(file.name, "Template"))
+display:
+  file.name: Game
+  property.rating: Rating
+  property.last: Last
+views:
+  - type: table
+    name: Table
+    order:
+      - file.name
+      - rating
+      - last
diff --git a/Templates/Bases/Companies.base b/Templates/Bases/Companies.base
new file mode 100644
index 0000000..63c1be4
--- /dev/null
+++ b/Templates/Bases/Companies.base
@@ -0,0 +1,13 @@
+display:
+  file.name: Company
+  property.url: Link
+views:
+  - type: table
+    name: Table
+    filters:
+      and:
+        - contains(categories, concat("[[", this.file.name, "]]"))
+        - not(contains(file.name, "Template"))
+    order:
+      - file.name
+      - url
\ No newline at end of file
diff --git a/Templates/Bases/Daily.base b/Templates/Bases/Daily.base
index ee4c326..d59a91b 100644
--- a/Templates/Bases/Daily.base
+++ b/Templates/Bases/Daily.base
@@ -6,23 +6,22 @@ filters:
     - contains(property.end, this.file.name)
 display:
   file.name: Entry
-  property.category: Categories
   property.created: Created
+  property.categories: Categories
 views:
   - type: table
     name: Daily notes
     filters:
       and:
-        - not(contains(property.tags, "monthly"))
+        - not(taggedWith(file.file, "daily"))
+        - not(taggedWith(file.file, "monthly"))
     order:
       - file.name
-      - category
+      - categories
       - created
     sort:
       - column: file.name
         direction: ASC
-      - column: property.category
-        direction: ASC
       - column: property.created
         direction: ASC
     columnSize:
diff --git a/Templates/Bases/Events.base b/Templates/Bases/Events.base
new file mode 100644
index 0000000..27bda3f
--- /dev/null
+++ b/Templates/Bases/Events.base
@@ -0,0 +1,29 @@
+filters:
+  and:
+    - contains(property.categories, "[[Events]]")
+    - not(contains(file.name, "Template"))
+display:
+  file.name: Event
+  property.loc: Location
+views:
+  - type: table
+    name: Events
+    order:
+      - file.name
+      - loc
+      - start
+  - type: table
+    name: Type
+    filters:
+      and:
+        - contains(type, concat("[[", this.file.name, "]]"))
+    order:
+      - file.name
+      - loc
+      - start
+    columnSize:
+      file.name: 226
+      property.loc: 199
+    sort:
+      - column: property.start
+        direction: DESC
diff --git a/Templates/Bases/Evergreen.base b/Templates/Bases/Evergreen.base
new file mode 100644
index 0000000..f698b52
--- /dev/null
+++ b/Templates/Bases/Evergreen.base
@@ -0,0 +1,13 @@
+display:
+  file.name: Name
+  property.created: Created
+views:
+  - type: table
+    name: Table
+    filters:
+      and:
+        - contains(property.tags, "0🌲")
+        - not(contains(file.name, "Template"))
+    order:
+      - file.name
+      - created
\ No newline at end of file
diff --git a/Templates/Bases/Journal.base b/Templates/Bases/Journal.base
new file mode 100644
index 0000000..f763345
--- /dev/null
+++ b/Templates/Bases/Journal.base
@@ -0,0 +1,13 @@
+filters:
+  and:
+    - contains(property.tags, "journal")
+    - not(contains(file.name, "Template"))
+display:
+  file.name: Entry
+  property.created: Created
+views:
+  - type: table
+    name: Table
+    order:
+      - file.name
+      - created
diff --git a/Templates/Bases/Movies.base b/Templates/Bases/Movies.base
index 9df871a..42b4529 100644
--- a/Templates/Bases/Movies.base
+++ b/Templates/Bases/Movies.base
@@ -1,7 +1,7 @@
 filters:
   and:
-    - contains
     - not(contains(file.name, "Template"))
+    - contains(property.categories, "[[Movies]]")
 display:
   file.name: Name
   property.last: Last
@@ -32,6 +32,11 @@ views:
       - last
       - director
       - genre
+    sort:
+      - column: file.name
+        direction: ASC
+      - column: property.director
+        direction: ASC
   - type: table
     name: Last seen
     filters:
@@ -46,7 +51,8 @@ views:
       - genre
     sort:
       - column: property.last
-        direction: ASC
+        direction: DESC
+    limit: 20
   - type: table
     name: Actor
     filters:
diff --git a/Templates/Bases/People.base b/Templates/Bases/People.base
new file mode 100644
index 0000000..ff963ec
--- /dev/null
+++ b/Templates/Bases/People.base
@@ -0,0 +1,13 @@
+filters:
+  and:
+    - contains(property.categories, "[[People]]")
+    - not(contains(file.name, "Template"))
+display:
+  file.name: Name
+  property.tags: Tags
+views:
+  - type: table
+    name: Table
+    order:
+      - file.name
+      - tags
\ No newline at end of file
diff --git a/Templates/Bases/Podcasts.base b/Templates/Bases/Podcasts.base
new file mode 100644
index 0000000..728b327
--- /dev/null
+++ b/Templates/Bases/Podcasts.base
@@ -0,0 +1,13 @@
+filters:
+  and:
+    - contains(property.categories, "[[Podcasts]]")
+    - not(contains(file.name, "Template"))
+display:
+  file.name: Podcast
+  property.host: Host
+views:
+  - type: table
+    name: Table
+    order:
+      - file.name
+      - host
diff --git a/Templates/Bases/Posts.base b/Templates/Bases/Posts.base
new file mode 100644
index 0000000..b96b23a
--- /dev/null
+++ b/Templates/Bases/Posts.base
@@ -0,0 +1,15 @@
+display:
+  file.name: Title
+  property.status: Status
+  property.published: Published
+views:
+  - type: table
+    name: Table
+    filters:
+      and:
+        - contains(categories, concat("[[", this.file.name, "]]"))
+        - not(contains(file.name, "Template"))
+    order:
+      - file.name
+      - status
+      - published
\ No newline at end of file
diff --git a/Templates/Bases/Projects.base b/Templates/Bases/Projects.base
new file mode 100644
index 0000000..dc8164b
--- /dev/null
+++ b/Templates/Bases/Projects.base
@@ -0,0 +1,19 @@
+filters:
+  and:
+    - contains(categories, concat("[[", this.file.name, "]]"))
+    - not(contains(file.name, "Template"))
+display:
+  property.status: Status
+  property.url: URL
+  file.name: Name
+  property.type: Type
+  property.year: Year
+views:
+  - type: table
+    name: Table
+    order:
+      - file.name
+      - type
+      - year
+      - status
+      - url
\ No newline at end of file
diff --git a/Templates/Bases/Shows.base b/Templates/Bases/Shows.base
new file mode 100644
index 0000000..93c9c0b
--- /dev/null
+++ b/Templates/Bases/Shows.base
@@ -0,0 +1,85 @@
+filters:
+  and:
+    - not(contains(file.name, "Template"))
+    - contains(property.categories, "[[Shows]]")
+display:
+  file.name: Name
+  property.last: Last
+  property.rating: Rating
+  property.year: Year
+  property.director: Director
+  property.genre: Genre
+  property.cast: Cast
+views:
+  - type: table
+    name: Favorites
+    filters:
+      and:
+        - property.rating > 6
+    order:
+      - file.name
+      - year
+      - rating
+      - last
+      - director
+      - genre
+  - type: table
+    name: All
+    order:
+      - file.name
+      - year
+      - rating
+      - last
+      - director
+      - genre
+    sort:
+      - column: file.name
+        direction: ASC
+      - column: property.director
+        direction: ASC
+  - type: table
+    name: Last seen
+    filters:
+      and:
+        - not(empty(property.last))
+    order:
+      - file.name
+      - year
+      - rating
+      - last
+      - director
+      - genre
+    sort:
+      - column: property.last
+        direction: DESC
+    limit: 20
+  - type: table
+    name: Actor
+    filters:
+      and:
+        - contains(cast, concat("[[", this.file.name, "]]"))
+    order:
+      - file.name
+      - year
+      - director
+      - genre
+  - type: table
+    name: Genre
+    filters:
+      and:
+        - contains(genre, concat("[[", this.file.name, "]]"))
+    order:
+      - file.name
+      - year
+      - director
+      - genre
+  - type: table
+    name: Director
+    filters:
+      and:
+        - contains(director, concat("[[", this.file.name, "]]"))
+    order:
+      - file.name
+      - year
+      - cast
+      - genre