diff --git a/Templates/Bases/Albums.base b/Templates/Bases/Albums.base
index f16c39a..23a4867 100644
--- a/Templates/Bases/Albums.base
+++ b/Templates/Bases/Albums.base
@@ -2,19 +2,13 @@ filters:
   and:
     - note.categories.contains(link("Albums"))
     - '!file.name.contains("Template")'
-properties:
-  file.name:
-    displayName: Album
-  note.year:
-    displayName: Year
-  note.artist:
-    displayName: Artist
-  note.created:
-    displayName: Added
-  note.rating:
-    displayName: Rating
-  note.genre:
-    displayName: Genre
+display:
+  file.name: Album
+  note.year: Year
+  note.artist: Artist
+  note.created: Added
+  note.rating: Rating
+  note.genre: Genre
 views:
   - type: table
     name: Albums
diff --git a/Templates/Bases/Attachments.base b/Templates/Bases/Attachments.base
new file mode 100644
index 0000000..26b023a
--- /dev/null
+++ b/Templates/Bases/Attachments.base
@@ -0,0 +1,32 @@
+formulas:
+  Embeds: if(file.embeds[0].containsAny("jpg","gif","webp","jpeg","avif"), file.embeds[0])
+  Date: if(created,created,if(start,start))
+  links: file.
+views:
+  - type: cards
+    name: Images
+    filters:
+      and:
+        - this.file.hasLink(file)
+        - '!file.ext.containsAny("base", "canvas", "pdf", "md")'
+        - file == ""
+    order: []
+    sort:
+      - property: file.name
+        direction: ASC
+    image: file.file
+    cardSize: 70
+  - type: table
+    name: Images 2
+    filters:
+      and:
+        - '!file.ext.containsAny("base", "canvas", "pdf", "md")'
+    order:
+      - file.name
+      - file.links
+      - formula.links
+    sort:
+      - property: file.name
+        direction: ASC
+    image: file.file
+    cardSize: 90
diff --git a/Templates/Bases/Books.base b/Templates/Bases/Books.base
index 40fbd5c..66d2d88 100644
--- a/Templates/Bases/Books.base
+++ b/Templates/Bases/Books.base
@@ -23,7 +23,7 @@ views:
       - topics
       - last
     sort:
-      - column: file.name
+      - property: file.name
         direction: ASC
   - type: table
     name: Top rated
diff --git a/Templates/Bases/Clippings.base b/Templates/Bases/Clippings.base
index d191253..d7b5155 100644
--- a/Templates/Bases/Clippings.base
+++ b/Templates/Bases/Clippings.base
@@ -20,8 +20,10 @@ views:
       - created
       - published
     sort:
-      - column: clipped
+      - property: created
         direction: DESC
+    columnSize:
+      note.author: 140
   - type: table
     name: Author
     filters:
@@ -33,5 +35,5 @@ views:
       - created
       - published
     sort:
-      - column: clipped
+      - property: clipped
         direction: DESC
diff --git a/Templates/Bases/Daily.base b/Templates/Bases/Daily.base
index 122f83b..abf1b95 100644
--- a/Templates/Bases/Daily.base
+++ b/Templates/Bases/Daily.base
@@ -50,6 +50,8 @@ views:
       - categories
       - created
     sort:
+      - property: file.name
+        direction: ASC
       - property: created
         direction: DESC
   - type: table
diff --git a/Templates/Bases/Events.base b/Templates/Bases/Events.base
index 4abea41..693e682 100644
--- a/Templates/Bases/Events.base
+++ b/Templates/Bases/Events.base
@@ -20,3 +20,27 @@ views:
     sort:
       - property: start
         direction: DESC
+  - type: table
+    name: Type
+    filters:
+      and:
+        - list(type).contains(this)
+    order:
+      - file.name
+      - start
+      - loc
+    sort:
+      - property: start
+        direction: DESC
+  - type: table
+    name: Location
+    filters:
+      and:
+        - list(loc).contains(this)
+    order:
+      - file.name
+      - start
+      - loc
+    sort:
+      - property: start
+        direction: DESC
diff --git a/Templates/Bases/Evergreen.base b/Templates/Bases/Evergreen.base
index e7ecf8f..81f90da 100644
--- a/Templates/Bases/Evergreen.base
+++ b/Templates/Bases/Evergreen.base
@@ -14,5 +14,5 @@ views:
       - file.name
       - created
     sort:
-      - property: created
+      - column: note.created
         direction: DESC
diff --git a/Templates/Bases/Everything.base b/Templates/Bases/Everything.base
index 284fb09..c72a5d4 100644
--- a/Templates/Bases/Everything.base
+++ b/Templates/Bases/Everything.base
@@ -1,17 +1,7 @@
-filters:
-  and:
-    - file.ext.contains("md")
-properties:
-  file.name:
-    displayName: Name
-  note.categories:
-    displayName: Categories
+formulas:
+  Embeds: if(file.embeds[0].containsAny("jpg","gif","webp","jpeg","avif"), file.embeds[0])
+  Date: if(created,created,if(start,start))
 views:
-  - type: table
-    name: Notes
-    order:
-      - file.name
-      - categories
   - type: table
     name: All files
     order:
@@ -19,6 +9,28 @@ views:
       - file.mtime
       - file.path
       - file.ext
+  - type: cards
+    name: Images
+    filters:
+      and:
+        - '!file.ext.containsAny("base", "canvas", "pdf", "md")'
+    order:
+      - file.name
     sort:
-      - column: file.path
+      - property: file.name
         direction: ASC
+    image: file.file
+  - type: cards
+    name: Images in posts
+    filters:
+      and:
+        - "!formula.Embeds.isEmpty()"
+    order:
+      - file.name
+      - formula.Date
+    sort:
+      - property: file.name
+        direction: ASC
+      - property: date
+        direction: DESC
+    image: formula.Embeds
diff --git a/Templates/Bases/Games.base b/Templates/Bases/Games.base
index d47a765..ec51828 100644
--- a/Templates/Bases/Games.base
+++ b/Templates/Bases/Games.base
@@ -2,19 +2,13 @@ filters:
   and:
     - note.categories.contains(link("Games"))
     - '!file.name.contains("Template")'
-properties:
-  file.name:
-    displayName: Games
-  note.year:
-    displayName: Year
-  note.maker:
-    displayName: Maker
-  note.rating:
-    displayName: Rating
-  note.genre:
-    displayName: Genre
-  note.last:
-    displayName: Last played
+display:
+  file.name: Games
+  note.year: Year
+  note.maker: Maker
+  note.rating: Rating
+  note.genre: Genre
+  note.last: Last played
 views:
   - type: table
     name: Games
diff --git a/Templates/Bases/Genre.base b/Templates/Bases/Genre.base
index d22fe22..6560d4a 100644
--- a/Templates/Bases/Genre.base
+++ b/Templates/Bases/Genre.base
@@ -1,15 +1,11 @@
 filters:
   and:
     - list(genre).contains(this)
-properties:
-  note.rating:
-    displayName: Rating
-  note.categories:
-    displayName: Category
-  note.last:
-    displayName: Last
-  file.name:
-    displayName: Name
+display:
+  note.rating: Rating
+  note.categories: Category
+  note.last: Last
+  file.name: Name
 views:
   - type: table
     name: Genre
@@ -19,9 +15,9 @@ views:
       - categories
       - last
     sort:
-      - property: rating
+      - column: note.rating
         direction: DESC
-      - property: last
+      - column: note.last
         direction: DESC
     columnSize:
       file.name: 248
diff --git a/Templates/Bases/Meetings.base b/Templates/Bases/Meetings.base
index b375911..4aca3d6 100644
--- a/Templates/Bases/Meetings.base
+++ b/Templates/Bases/Meetings.base
@@ -1,6 +1,6 @@
 filters:
   and:
-    - note.categories.contains(link("Meetings"))
+    - categories.contains(link("Meetings"))
     - '!file.name.contains("Template")'
 properties:
   note.date:
@@ -11,6 +11,8 @@ properties:
     displayName: Type
   file.name:
     displayName: Meeting
+  note.org:
+    displayName: Org
 views:
   - type: table
     name: Meetings
@@ -43,8 +45,8 @@ views:
     order:
       - file.name
       - date
-      - type
       - people
+      - org
     sort:
       - property: date
         direction: DESC
diff --git a/Templates/Bases/Movies.base b/Templates/Bases/Movies.base
index 3950054..eef8704 100644
--- a/Templates/Bases/Movies.base
+++ b/Templates/Bases/Movies.base
@@ -32,19 +32,19 @@ views:
     order:
       - file.name
       - year
+      - director
       - rating
       - last
       - plot
       - genre
-      - director
     sort:
       - property: director
         direction: ASC
-      - column: formula.test
-        direction: DESC
       - property: plot
         direction: ASC
     columnSize:
+      file.name: 193
+      note.director: 205
       note.plot: 233
       note.genre: 261
   - type: table
@@ -69,7 +69,7 @@ views:
         direction: DESC
       - property: watchlist
         direction: DESC
-      - column: file.name
+      - property: file.name
         direction: ASC
       - property: director
         direction: ASC
@@ -92,7 +92,7 @@ views:
       - ratingImdb
       - last
     sort:
-      - column: file.name
+      - property: file.name
         direction: ASC
       - property: ratingImdb
         direction: DESC
@@ -104,7 +104,7 @@ views:
     name: Last seen
     filters:
       and:
-        - note.last != ""
+        - "!last.isEmpty()"
     order:
       - file.name
       - year
@@ -115,7 +115,9 @@ views:
     sort:
       - property: last
         direction: DESC
-    limit: 15
+      - property: file.name
+        direction: ASC
+    limit: 20
   - type: table
     name: Actor
     filters:
@@ -126,6 +128,10 @@ views:
       - year
       - director
       - genre
+      - ratingImdb
+    sort:
+      - property: ratingImdb
+        direction: DESC
   - type: table
     name: Genre
     filters:
@@ -138,9 +144,6 @@ views:
       - director
       - last
       - genre
-    columnSize:
-      note.director: 166
-      note.last: 115
     sort:
       - property: last
         direction: DESC
@@ -148,6 +151,9 @@ views:
         direction: ASC
       - property: rating
         direction: DESC
+    columnSize:
+      note.director: 166
+      note.last: 115
   - type: table
     name: Director
     filters:
@@ -221,7 +227,7 @@ views:
         direction: DESC
       - property: watchlist
         direction: DESC
-      - column: file.name
+      - property: file.name
         direction: ASC
       - property: director
         direction: ASC
diff --git a/Templates/Bases/People.base b/Templates/Bases/People.base
index 349d943..acc799a 100644
--- a/Templates/Bases/People.base
+++ b/Templates/Bases/People.base
@@ -2,14 +2,32 @@ filters:
   and:
     - '!file.name.contains("Template")'
     - note.tags.contains("people")
+formulas:
+  Age: (now() - birthday).years.floor()
 properties:
   file.name:
     displayName: Name
   note.tags:
     displayName: Tags
+  note.birthday:
+    displayName: Birthday
 views:
   - type: table
-    name: Table
+    name: All people
     order:
       - file.name
       - tags
+      - birthday
+      - formula.Age
+    columnSize:
+      note.tags: 209
+      formula.Age: 99
+    sort:
+      - column: file.name
+        direction: ASC
+      - column: note.tags
+        direction: ASC
+      - column: formula.Age
+        direction: DESC
+      - column: note.birthday
+        direction: DESC
diff --git a/Templates/Bases/Places.base b/Templates/Bases/Places.base
index 13eddad..aab2dd0 100644
--- a/Templates/Bases/Places.base
+++ b/Templates/Bases/Places.base
@@ -74,6 +74,7 @@ views:
     filters:
       and:
         - file.hasLink(this)
+        - '!tags.containsAny("cities", "countries")'
     order:
       - file.name
       - rating
@@ -81,6 +82,8 @@ views:
       - type
       - last
     sort:
+      - property: rating
+        direction: DESC
       - property: last
         direction: DESC
       - property: type
@@ -89,5 +92,24 @@ views:
         direction: ASC
     columnSize:
       file.name: 162
+      note.rating: 65
       note.loc: 145
       note.type: 199
+  - type: table
+    name: Metatype
+    filters:
+      or:
+        - list(type).contains(this)
+        - list(type).containsAny(this.topics)
+    order:
+      - file.name
+      - type
+      - rating
+      - last
+    sort:
+      - property: last
+        direction: DESC
+      - property: loc
+        direction: ASC
+    columnSize:
+      note.type: 153
diff --git a/Templates/Bases/Podcast episodes.base b/Templates/Bases/Podcast episodes.base
index 9f1a06b..b1f2bb3 100644
--- a/Templates/Bases/Podcast episodes.base	
+++ b/Templates/Bases/Podcast episodes.base	
@@ -2,21 +2,14 @@ filters:
   and:
     - note.categories.contains(link("Podcast episodes"))
     - '!file.name.contains("Template")'
-properties:
-  file.name:
-    displayName: Podcast
-  note.show:
-    displayName: Show
-  note.guests:
-    displayName: Guests
-  note.episode:
-    displayName: Episode
-  note.rating:
-    displayName: Rating
-  note.published:
-    displayName: Published
-  note.guest:
-    displayName: Guest
+display:
+  file.name: Podcast
+  note.show: Show
+  note.guests: Guests
+  note.episode: Episode
+  note.rating: Rating
+  note.published: Published
+  note.guest: Guest
 views:
   - type: table
     name: All episodes
@@ -28,7 +21,7 @@ views:
       - rating
       - published
     sort:
-      - property: published
+      - column: note.published
         direction: DESC
   - type: table
     name: Show
diff --git a/Templates/Bases/Posts.base b/Templates/Bases/Posts.base
index 3ea3a58..a545ab5 100644
--- a/Templates/Bases/Posts.base
+++ b/Templates/Bases/Posts.base
@@ -17,5 +17,5 @@ views:
       - status
       - published
     sort:
-      - property: published
+      - column: note.published
         direction: DESC
diff --git a/Templates/Bases/Projects.base b/Templates/Bases/Projects.base
index 041d39d..eef5899 100644
--- a/Templates/Bases/Projects.base
+++ b/Templates/Bases/Projects.base
@@ -23,9 +23,9 @@ views:
       - status
       - url
     sort:
-      - property: status
+      - column: note.status
         direction: ASC
-      - property: year
+      - column: note.year
         direction: DESC
     columnSize:
       file.name: 209
diff --git a/Templates/Bases/Ratings.base b/Templates/Bases/Ratings.base
index 9658a1b..a7497e4 100644
--- a/Templates/Bases/Ratings.base
+++ b/Templates/Bases/Ratings.base
@@ -19,7 +19,7 @@ views:
       - last
       - categories
     sort:
-      - property: last
+      - column: note.last
         direction: DESC
     columnSize:
       file.name: 238
@@ -34,6 +34,6 @@ views:
       - last
       - categories
     sort:
-      - property: last
+      - column: note.last
         direction: DESC
     limit: 100
diff --git a/Templates/Bases/Shows.base b/Templates/Bases/Shows.base
index 7767c73..7e34762 100644
--- a/Templates/Bases/Shows.base
+++ b/Templates/Bases/Shows.base
@@ -28,11 +28,11 @@ views:
       - director
       - genre
     sort:
-      - property: rating
+      - column: note.rating
         direction: DESC
       - column: file.name
         direction: ASC
-      - property: director
+      - column: note.director
         direction: ASC
   - type: table
     name: Favorites
@@ -59,7 +59,7 @@ views:
       - director
       - genre
     sort:
-      - property: last
+      - column: note.last
         direction: DESC
     limit: 20
   - type: table
diff --git a/Templates/Bases/Templates.base b/Templates/Bases/Templates.base
new file mode 100644
index 0000000..cdf9f87
--- /dev/null
+++ b/Templates/Bases/Templates.base
@@ -0,0 +1,12 @@
+filters:
+  and:
+    - file.path.contains("/Templates")
+views:
+  - type: table
+    name: Table
+    order:
+      - file.name
+      - categories
+    sort: []
+    columnSize:
+      file.name: 234
diff --git a/Templates/Bases/Trips.base b/Templates/Bases/Trips.base
index ddb324d..6ff685c 100644
--- a/Templates/Bases/Trips.base
+++ b/Templates/Bases/Trips.base
@@ -23,7 +23,7 @@ views:
       - end
       - loc
     sort:
-      - property: end
+      - column: note.end
         direction: DESC
     columnSize:
       file.name: 255