diff --git a/.obsidian/app.json b/.obsidian/app.json
index 3fb280f..b7cb061 100644
--- a/.obsidian/app.json
+++ b/.obsidian/app.json
@@ -1,3 +1,4 @@
 {
-  "attachmentFolderPath": "Attachments"
+  "attachmentFolderPath": "Attachments",
+  "alwaysUpdateLinks": true
 }
\ No newline at end of file
diff --git a/.obsidian/core-plugins.json b/.obsidian/core-plugins.json
index 6706cdb..4455376 100644
--- a/.obsidian/core-plugins.json
+++ b/.obsidian/core-plugins.json
@@ -1,22 +1,33 @@
-[
-  "file-explorer",
-  "global-search",
-  "switcher",
-  "graph",
-  "backlink",
-  "canvas",
-  "tag-pane",
-  "page-preview",
-  "daily-notes",
-  "templates",
-  "note-composer",
-  "command-palette",
-  "editor-status",
-  "bookmarks",
-  "markdown-importer",
-  "zk-prefixer",
-  "random-note",
-  "outline",
-  "workspaces",
-  "file-recovery"
-]
\ No newline at end of file
+{
+  "file-explorer": true,
+  "global-search": true,
+  "switcher": true,
+  "graph": true,
+  "backlink": true,
+  "outgoing-link": false,
+  "tag-pane": true,
+  "page-preview": true,
+  "daily-notes": true,
+  "templates": true,
+  "note-composer": true,
+  "command-palette": true,
+  "slash-command": false,
+  "editor-status": true,
+  "markdown-importer": true,
+  "zk-prefixer": true,
+  "random-note": true,
+  "outline": true,
+  "word-count": false,
+  "slides": false,
+  "audio-recorder": false,
+  "workspaces": true,
+  "file-recovery": true,
+  "publish": false,
+  "sync": false,
+  "canvas": true,
+  "properties": false,
+  "bookmarks": true,
+  "footnotes": false,
+  "bases": true,
+  "webviewer": false
+}
\ No newline at end of file
diff --git a/Categories/Albums.md b/Categories/Albums.md
index 40ccb71..f2a36c7 100644
--- a/Categories/Albums.md
+++ b/Categories/Albums.md
@@ -4,15 +4,26 @@ tags:
   - categories
 ---
 
-```dataview
-table without id
-	file.link as Album,
-	artist as Artist,
-	rating as Rating,
-	year as Year,
-	genre as Genre
-where
-	contains(categories,this.file.link) and
-	!contains(file.name, "Template")
-sort rating desc
+```base
+display:
+  file.name: Album
+  property.year: Year
+  property.artist: Artist
+  property.created: Added
+  property.rating: Rating
+  property.genre: Genre
+views:
+  - type: table
+    name: Table
+    filters:
+      and:
+        - contains(categories, concat("[[", this.file.name, "]]"))
+        - not(contains(file.name, "Template"))
+    order:
+      - file.name
+      - artist
+      - rating
+      - year
+      - genre
+
 ```
\ No newline at end of file
diff --git a/Categories/Board games.md b/Categories/Board games.md
index 1693fe7..d17dfff 100644
--- a/Categories/Board games.md	
+++ b/Categories/Board games.md	
@@ -3,12 +3,21 @@ tags:
   - categories
 ---
 
-```dataview
-table without id
-	file.link as Game,
-	rating as Rating,
-	last as Last
-where
-  contains(categories,this.file.link) and
-  !contains(file.name,"Template")
+```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
diff --git a/Categories/Books.md b/Categories/Books.md
index bc2fc82..d873e6f 100644
--- a/Categories/Books.md
+++ b/Categories/Books.md
@@ -3,16 +3,4 @@ tags:
   - categories
 ---
 
-```dataview
-table without id
-	file.link as Book,
-	author as Author,
-	year as Year,
-	rating as Rating,
-	created as Added,
-	genre as Genre
-where
-	contains(categories,this.file.link) and
-	!contains(file.name, "Template")
-sort rating desc, date asc
-```
+![[Books.base]]
\ No newline at end of file
diff --git a/Categories/Clippings.md b/Categories/Clippings.md
index 6ce3fa9..7a18582 100644
--- a/Categories/Clippings.md
+++ b/Categories/Clippings.md
@@ -3,14 +3,25 @@ tags:
   - categories
 ---
 
-```dataview
-table without id
-	file.link as Title,
-	author as Author,
-	created as Clipped,
-	published as Published
-where
-	contains(categories,this.file.link) and
-	!contains(file.name, "Template")
-sort clipped desc
-```
\ No newline at end of file
+```base
+display:
+  file.name: Title
+  property.author: Author
+  property.created: Clipped
+  property.published: Published
+views:
+  - type: table
+    name: Table
+    filters:
+      and:
+        - contains(categories, concat("[[", this.file.name, "]]"))
+        - not(contains(file.name, "Template"))
+    order:
+      - file.name
+      - author
+      - created
+      - published
+    sort:
+      - column: clipped
+        direction: DESC
+```
diff --git a/Categories/Companies.md b/Categories/Companies.md
index d997961..27c11bc 100644
--- a/Categories/Companies.md
+++ b/Categories/Companies.md
@@ -3,12 +3,19 @@ tags:
   - categories
 ---
 
-```dataview
-table without id
-	file.link as Company,
-	url as Link
-where
-	contains(categories,this.file.link)
-	and !contains(file.name, "Template")
-sort file.mtime desc
-```
\ No newline at end of file
+```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
+
+```
diff --git a/Categories/Events.md b/Categories/Events.md
index f35e802..32eb73d 100644
--- a/Categories/Events.md
+++ b/Categories/Events.md
@@ -3,10 +3,23 @@ tags:
   - categories
 ---
 
-```dataview
-table without id
-	file.link as Event
-where
-  contains(categories,this.file.link) and
-  !contains(file.name,"Template")
+```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
diff --git a/Categories/Evergreen.md b/Categories/Evergreen.md
index 3ac0df3..b357872 100644
--- a/Categories/Evergreen.md
+++ b/Categories/Evergreen.md
@@ -4,12 +4,18 @@ 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.
 
-```dataview
-table without id
-	file.link as Name,
-	created as Created
-from #0🌲
-where
-	!contains(file.name,"Template")
-sort created desc
+```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
diff --git a/Categories/Games.md b/Categories/Games.md
index 3c3c387..315ba4d 100644
--- a/Categories/Games.md
+++ b/Categories/Games.md
@@ -3,16 +3,27 @@ tags:
   - categories
 ---
 
-```dataview
-table without id
-	file.link as Game,
-	maker as Maker,
-	genre as Genre,
-	year as Year,
-	rating as Rating,
-	last as "Last played"
-where
-	contains(categories,this.file.link) and
-	!contains(file.name, "Template")
-sort last desc
+
+```base
+display:
+  file.name: Book
+  property.year: Year
+  property.maker: Maker
+  property.rating: Rating
+  property.genre: Genre
+  property.last: Last played
+views:
+  - type: table
+    name: Table
+    filters:
+      and:
+        - contains(property.categories, "[[Games]]")
+        - not(contains(file.name, "Template"))
+    order:
+      - file.name
+      - maker
+      - genre
+      - year
+      - rating
+      - last
 ```
diff --git a/Categories/Journal.md b/Categories/Journal.md
index 281adbc..eeea38f 100644
--- a/Categories/Journal.md
+++ b/Categories/Journal.md
@@ -3,12 +3,19 @@ tags:
   - categories
 ---
 
-```dataview
-table without id
-	file.link as Entry,
-	created as Created
-from #journal
-where
-	!contains(file.name,"Template")
-sort created desc
-```
\ No newline at end of file
+```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
+
+```
diff --git a/Categories/Meetings.md b/Categories/Meetings.md
index 80cd5a9..0db7bab 100644
--- a/Categories/Meetings.md
+++ b/Categories/Meetings.md
@@ -3,15 +3,24 @@ tags:
   - categories
 ---
 
-```dataview
-table without id
-	file.link as Meeting,
-	type as Type,
-	people as People,
-	date as Date
-where 
-	contains(categories,this.file.link) and
-	!contains(file.name,"Template")
-sort date desc
-limit 100
-```
\ No newline at end of file
+
+```base
+filters:
+  and:
+    - contains(categories, concat("[[", this.file.name, "]]"))
+    - not(contains(file.name, "Template"))
+display:
+  file.name: Meeting
+  property.type: Type
+  property.people: People
+  property.date: Date
+views:
+  - type: table
+    name: Table
+    order:
+      - file.name
+      - type
+      - people
+      - date
+
+```
diff --git a/Categories/Movies.md b/Categories/Movies.md
index 881235f..30d71bf 100644
--- a/Categories/Movies.md
+++ b/Categories/Movies.md
@@ -4,31 +4,11 @@ tags:
 ---
 ## Favorites
 
-```dataview
-table without id
-	file.link as Movie,
-	year as Year,
-	rating as Rating,
-	last as "Last seen",
-	director as Director
-where
-	contains(categories,this.file.link)
-	and rating > 6
-sort rating desc
-```
+![[Movies.base#Favorites]]
+
 
 ## Last seen
 
-```dataview
-table without id
-	file.link as Movie,
-	year as Year,
-	rating as Rating,
-	last as "Last seen",
-	director as Director
-where
-	contains(categories,this.file.link) and
-	last != "" and !contains(file.name, "Template")
-sort last desc
-limit 100
-```
\ No newline at end of file
+![[Movies.base#Last seen]]
+
+
diff --git a/Categories/People.md b/Categories/People.md
index f6402d8..1c00cc3 100644
--- a/Categories/People.md
+++ b/Categories/People.md
@@ -3,12 +3,19 @@ tags:
   - categories
 ---
 
-```dataview
-table without id
-	file.link as Person,
-	filter(file.tags, (t) => t !="#people") as Tags 
-where
-  contains(categories,this.file.link) and
-  !contains(file.name,"Template")
-sort file.name asc
+```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
diff --git a/Categories/Places.md b/Categories/Places.md
index e9b6f0e..43904bc 100644
--- a/Categories/Places.md
+++ b/Categories/Places.md
@@ -11,15 +11,26 @@ height:400px
 
 ## Places
 
-```dataview
-table without id
-	file.link as Place,
-	loc as Location,
-	type as Type,
-	rating as Rating
-where
-	contains(categories,this.file.link) and
-	!contains(file.tags,"places/types") and
-	!contains(file.name,"Template")
-sort last desc
-```
\ No newline at end of file
+```base
+filters:
+  and:
+    - contains(property.categories, "[[Places]]")
+    - not(contains(file.name, "Template"))
+display:
+  property.type: Type
+  property.rating: Rating
+  property.loc: Location
+  file.name: Name
+views:
+  - type: table
+    name: Table
+    order:
+      - file.name
+      - loc
+      - type
+      - rating
+    sort:
+      - column: property.loc
+        direction: ASC
+
+```
diff --git a/Categories/Podcast episodes.md b/Categories/Podcast episodes.md
index 88da105..ae92b39 100644
--- a/Categories/Podcast episodes.md	
+++ b/Categories/Podcast episodes.md	
@@ -3,16 +3,26 @@ tags:
   - categories
 ---
 
-```dataview
-table without id
-	link(file.link, "Ep. " + string(episode)) as Episode,
-	show as Show,
-	guests as Guest,
-	episode as Ep,
-	rating as Rating,
-	published as "Published"
-where
-	contains(categories,this.file.link) and
-	!contains(file.name, "Template")
-sort published desc
+```base
+display:
+  file.name: Podcast
+  property.show: Show
+  property.guests: Guests
+  property.episode: Episode
+  property.rating: Rating
+  property.published: Published
+views:
+  - type: table
+    name: Table
+    filters:
+      and:
+        - contains(categories, concat("[[", this.file.name, "]]"))
+        - not(contains(file.name, "Template"))
+    order:
+      - file.name
+      - show
+      - guests
+      - episode
+      - rating
+      - published
 ```
\ No newline at end of file
diff --git a/Categories/Podcasts.md b/Categories/Podcasts.md
index d2a392b..be7cffd 100644
--- a/Categories/Podcasts.md
+++ b/Categories/Podcasts.md
@@ -2,11 +2,19 @@
 related: "[[Podcast episodes]]"
 ---
 
-```dataview
-table without id
-	file.link as Podcast, host as "Host"
-where
-  contains(categories,this.file.link) and
-  !contains(file.name,"Template")
-sort file.name asc
-```
\ No newline at end of file
+```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
+```
+
diff --git a/Categories/Posts.md b/Categories/Posts.md
index 8854271..04dec8e 100644
--- a/Categories/Posts.md
+++ b/Categories/Posts.md
@@ -2,13 +2,22 @@
 tags:
   - categories
 ---
-```dataview
-table without id
-	file.link as Title,
-	status as Status,
-	published as Published
-where
-	contains(categories,this.file.link) and
-	!contains(file.name,"Template")
-sort published desc
+
+```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
diff --git a/Categories/Products.md b/Categories/Products.md
index d66c3c3..e589a7e 100644
--- a/Categories/Products.md
+++ b/Categories/Products.md
@@ -3,19 +3,4 @@ tags:
   - categories
 ---
 
-```dataview
-table without id
-	file.link as Product,
-	rating as Rating,
-	acquired as Acquired,
-	type as Type,
-	maker as Maker
-where
-	!contains(file.name, "Template") and
-	contains(categories, [[Products]])
-sort
-	acquired desc,
-	file.name,
-	rating desc,
-	file.mtime desc
-```
+![[Products.base]]
diff --git a/Categories/Projects.md b/Categories/Projects.md
index 795d860..09dfc82 100644
--- a/Categories/Projects.md
+++ b/Categories/Projects.md
@@ -3,14 +3,25 @@ tags:
   - categories
 ---
 
-```dataview
-table 
-	type as Type,
-	year as Year,
-	status as Status,
-	url as URL
-where
-	contains(categories,this.file.link) and
-	!contains(file.name,"Template")
-sort year desc
+```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
+
 ```
diff --git a/Categories/Recipes.md b/Categories/Recipes.md
index af7828e..067df2d 100644
--- a/Categories/Recipes.md
+++ b/Categories/Recipes.md
@@ -3,11 +3,28 @@ tags:
   - categories
 ---
 
-```dataview
-table without id
-	file.link as Recipe, type as Type, author as Author, ingredients as Ingredients, rating as Rating
-where
-	contains(categories,this.file.link) and
-	!contains(file.name,"Template")
-sort created desc
-```
\ No newline at end of file
+
+```base
+filters:
+  and:
+    - contains(categories, concat("[[", this.file.name, "]]"))
+    - not(contains(file.name, "Template"))
+display:
+  file.name: Name
+  property.author: Author
+  property.type: Type
+  property.ingredients: Ingredients
+  property.cuisine: Cuisine
+  property.rating: Rating
+views:
+  - type: table
+    name: Table
+    order:
+      - file.name
+      - type
+      - author
+      - ingredients
+      - cuisine
+      - rating
+
+```
diff --git a/Categories/Shows.md b/Categories/Shows.md
index ec93eda..5130e69 100644
--- a/Categories/Shows.md
+++ b/Categories/Shows.md
@@ -2,14 +2,21 @@
 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
 
-```dataview
-table without id
-	file.link as Show,
-	rating as Rating, 
-	last as "Last seen"
-where
-	contains(categories, this.file.link) and
-	!contains(file.name, "Template")
-sort last desc
-```
\ No newline at end of file
+```
diff --git a/Categories/Trips.md b/Categories/Trips.md
index afdfa0c..8e8e446 100644
--- a/Categories/Trips.md
+++ b/Categories/Trips.md
@@ -3,15 +3,22 @@ tags:
   - categories
 ---
 
-```dataview
-table without id
-	file.link as Trip,
-	loc as Location,
-	start as Start,
-	end as End
-where
-	contains(categories,this.file.link) and
-	!contains(file.name, "Template") and
-	!contains(file.name, "Planning")
-sort start desc
+```base
+filters:
+  and:
+    - contains(categories, concat("[[", this.file.name, "]]"))
+    - not(contains(file.name, "Template"))
+display:
+  file.name: Name
+  property.loc: Location
+  property.end: End
+  property.start: Start
+views:
+  - type: table
+    name: Table
+    order:
+      - file.name
+      - loc
+      - start
+      - end
 ```
diff --git a/Daily/2023-09-12.md b/Daily/2023-09-12.md
index ff41ba4..f19adaa 100644
--- a/Daily/2023-09-12.md
+++ b/Daily/2023-09-12.md
@@ -4,12 +4,4 @@ tags:
 ---
 ## Notes
 
-```dataview
-list
-where
-	!contains(file.tags, "daily") and
-	contains(file.outlinks, this.file.link) or
-	contains(string(file.frontmatter), string(dateformat(this.file.day,"yyyy-MM-dd")))
-sort file.ctime asc
-limit 50
-```
\ No newline at end of file
+![[Daily.base]]
diff --git a/Notes/Product usage analysis.md b/Notes/Product usage analysis.md
index 60aed84..85c2ce5 100644
--- a/Notes/Product usage analysis.md	
+++ b/Notes/Product usage analysis.md	
@@ -1,19 +1,3 @@
 Analysis of cost per use, see [[Buy wisely]]
 
-```dataview
-table without id
-	file.link as Product,
-	rating as Rating,
-	"$" + round(price/(monthly-uses*((date(today) - acquired).months)),2) as "Per use",
-	monthly-uses as "Uses/month",
-	dateformat(acquired, "yyyy-MM") as Acquired,
-	round((date(today) - acquired).months,1) as "Months",
-	"$" + string(round(price, 2)) as Price,
-	round(monthly-uses*((date(today) - acquired).months),0) as "Total uses",
-	type as Type
-where
-	monthly-uses > 0 and
-	contains(categories, [[Products]])
-sort
-	round(price/(monthly-uses*((date(today) - acquired).months)),2) asc
-```
\ No newline at end of file
+![[Products.base#Cost per use]]
\ No newline at end of file
diff --git a/References/Kevin Kelly.md b/References/Kevin Kelly.md
index 10dffc5..455f092 100644
--- a/References/Kevin Kelly.md	
+++ b/References/Kevin Kelly.md	
@@ -8,16 +8,7 @@ created: 2023-09-12
 ---
 ## Books
 
-```dataview
-table without id
-	file.link as Title,
-	year as Year,
-	rating as Rating
-where
-	contains(categories,[[Books]]) and
-	contains(author,this.file.link)
-sort rating desc
-```
+![[Books.base#Author]]
 
 # Clippings
 
diff --git a/Templates/Actor Template.md b/Templates/Actor Template.md
index 5964127..cf0b642 100644
--- a/Templates/Actor Template.md	
+++ b/Templates/Actor Template.md	
@@ -6,13 +6,4 @@ tags:
 ---
 ## Movies
 
-```dataview
-table without id
-	file.link as Movie,
-	year as Year,
-	rating as Rating
-where
-	contains(categories,[[Movies]]) and
-	contains(cast,this.file.link)
-sort rating desc
-```
\ No newline at end of file
+![[Movies.base#Actor]]
\ No newline at end of file
diff --git a/Templates/Books.base b/Templates/Books.base
new file mode 100644
index 0000000..b17a346
--- /dev/null
+++ b/Templates/Books.base
@@ -0,0 +1,53 @@
+filters:
+  and:
+    - contains(property.categories, "[[Books]]")
+    - not(contains(file.name, "Template"))
+display:
+  file.name: Name
+  property.last: Last
+  property.rating: Rating
+  property.year: Year
+  property.genre: Genre
+  property.author: Author
+  property.created: Added
+views:
+  - type: table
+    name: Favorites
+    order:
+      - author
+      - file.name
+      - rating
+      - year
+      - created
+      - genre
+  - type: table
+    name: All
+    order:
+      - file.name
+      - year
+      - rating
+      - last
+      - genre
+  - type: table
+    name: Last read
+    filters:
+      and:
+        - not(empty(property.last))
+    order:
+      - file.name
+      - year
+      - rating
+      - last
+      - genre
+    sort:
+      - column: property.last
+        direction: ASC
+  - type: table
+    name: Author
+    filters:
+      and:
+        - contains(author, concat("[[", this.file.name, "]]"))
+    order:
+      - file.name
+      - year
+      - genre
diff --git a/Templates/Daily Note Template.md b/Templates/Daily Note Template.md
index ff41ba4..6a92606 100644
--- a/Templates/Daily Note Template.md	
+++ b/Templates/Daily Note Template.md	
@@ -4,12 +4,4 @@ tags:
 ---
 ## Notes
 
-```dataview
-list
-where
-	!contains(file.tags, "daily") and
-	contains(file.outlinks, this.file.link) or
-	contains(string(file.frontmatter), string(dateformat(this.file.day,"yyyy-MM-dd")))
-sort file.ctime asc
-limit 50
-```
\ No newline at end of file
+![[Daily.base]]
\ No newline at end of file
diff --git a/Templates/Daily.base b/Templates/Daily.base
new file mode 100644
index 0000000..dbc7d7d
--- /dev/null
+++ b/Templates/Daily.base
@@ -0,0 +1,20 @@
+filters:
+  or:
+    - linksTo(file.file, this.file.path)
+    - contains(property.created, this.file.name)
+    - contains(property.last, this.file.name)
+views:
+  - type: table
+    name: Day
+    order:
+      - file.name
+    sort:
+      - column: property.created
+        direction: ASC
+  - type: table
+    name: Daily note
+    order:
+      - file.name
+    sort:
+      - column: property.created
+        direction: ASC
diff --git a/Templates/Movies.base b/Templates/Movies.base
new file mode 100644
index 0000000..1b18142
--- /dev/null
+++ b/Templates/Movies.base
@@ -0,0 +1,58 @@
+filters:
+  and:
+    - contains
+    - not(contains(file.name, "Template"))
+display:
+  file.name: Name
+  property.last: Last
+  property.rating: Rating
+  property.year: Year
+  property.director: Director
+  property.genre: Genre
+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
+  - type: table
+    name: Last seen
+    filters:
+      and:
+        - not(empty(property.last))
+    order:
+      - file.name
+      - year
+      - rating
+      - last
+      - director
+      - genre
+    sort:
+      - column: property.last
+        direction: ASC
+  - type: table
+    name: Actor
+    filters:
+      and:
+        - contains(cast, concat("[[", this.file.name, "]]"))
+    order:
+      - file.name
+      - year
+      - director
+      - genre
diff --git a/Templates/Products.base b/Templates/Products.base
new file mode 100644
index 0000000..032e07d
--- /dev/null
+++ b/Templates/Products.base
@@ -0,0 +1,65 @@
+filters:
+  and:
+    - contains(category, "[[Products]]")
+    - not(contains(file.name, "Template"))
+    - property.monthly-uses > 0
+formulas:
+  Usage: formula.Owned * monthly-uses
+  Owned: round(dateDiff(acquired, now()) / -2629746000)
+  Per use: concat("$", price / formula.Usage)
+display:
+  property.monthly-uses: Uses/month
+  formula.Owned: Months
+  formula.Usage: Total uses
+  property.price: Price
+  property.rating: Rating
+  property.acquired: Acquired
+  property.type: Type
+  file.name: Product
+views:
+  - type: table
+    name: Products
+    order:
+      - file.name
+      - rating
+      - price
+      - acquired
+      - type
+    columnSize:
+      file.name: 209
+      property.monthly-uses: 82
+      formula.Usage: 115
+    sort:
+      - column: file.name
+        direction: ASC
+      - column: formula.Usage
+        direction: DESC
+      - column: property.acquired
+        direction: DESC
+      - column: property.monthly-uses
+        direction: DESC
+  - type: table
+    name: Cost per use
+    order:
+      - file.name
+      - rating
+      - formula.Per use
+      - monthly-uses
+      - price
+      - formula.Usage
+      - formula.Owned
+      - acquired
+      - type
+    columnSize:
+      formula.Per use: 77
+      property.monthly-uses: 82
+      formula.Usage: 115
+    sort:
+      - column: file.name
+        direction: ASC
+      - column: formula.Usage
+        direction: DESC
+      - column: property.acquired
+        direction: DESC
+      - column: property.monthly-uses
+        direction: DESC