feat: trek is back

99 files changed, 1615 insertions, 414 deletions

diff --git a/assets/star-trek/logo_gen.png b/assets/star-trek/logo_gen.png
new file mode 100644
index 0000000..7864f48
--- /dev/null
+++ b/assets/star-trek/logo_gen.png
diff --git a/assets/star-trek/logo_voy.png b/assets/star-trek/logo_voy.png
new file mode 100644
index 0000000..e61631d
--- /dev/null
+++ b/assets/star-trek/logo_voy.png
diff --git a/assets/star-trek/star-trek-bliss.jpg b/assets/star-trek/star-trek-bliss.jpg
new file mode 100644
index 0000000..1089793
--- /dev/null
+++ b/assets/star-trek/star-trek-bliss.jpg
diff --git a/assets/star-trek/star-trek-voyager-11-59.jpg b/assets/star-trek/star-trek-voyager-11-59.jpg
new file mode 100644
index 0000000..fca0283
--- /dev/null
+++ b/assets/star-trek/star-trek-voyager-11-59.jpg
diff --git a/assets/star-trek/star-trek-voyager-bride-of-chaotica.jpg b/assets/star-trek/star-trek-voyager-bride-of-chaotica.jpg
new file mode 100644
index 0000000..d853d89
--- /dev/null
+++ b/assets/star-trek/star-trek-voyager-bride-of-chaotica.jpg
diff --git a/assets/star-trek/star-trek-voyager-course-oblivion-1.jpg b/assets/star-trek/star-trek-voyager-course-oblivion-1.jpg
new file mode 100644
index 0000000..0edd15a
--- /dev/null
+++ b/assets/star-trek/star-trek-voyager-course-oblivion-1.jpg
diff --git a/assets/star-trek/star-trek-voyager-course-oblivion-2.jpg b/assets/star-trek/star-trek-voyager-course-oblivion-2.jpg
new file mode 100644
index 0000000..1dbe091
--- /dev/null
+++ b/assets/star-trek/star-trek-voyager-course-oblivion-2.jpg
diff --git a/assets/star-trek/star-trek-voyager-dark-frontier-01.jpg b/assets/star-trek/star-trek-voyager-dark-frontier-01.jpg
new file mode 100644
index 0000000..7fc008e
--- /dev/null
+++ b/assets/star-trek/star-trek-voyager-dark-frontier-01.jpg
diff --git a/assets/star-trek/star-trek-voyager-dark-frontier-02.jpg b/assets/star-trek/star-trek-voyager-dark-frontier-02.jpg
new file mode 100644
index 0000000..f12d2a0
--- /dev/null
+++ b/assets/star-trek/star-trek-voyager-dark-frontier-02.jpg
diff --git a/assets/star-trek/star-trek-voyager-dark-frontier-03.jpg b/assets/star-trek/star-trek-voyager-dark-frontier-03.jpg
new file mode 100644
index 0000000..aec0820
--- /dev/null
+++ b/assets/star-trek/star-trek-voyager-dark-frontier-03.jpg
diff --git a/assets/star-trek/star-trek-voyager-dark-frontier-04.jpg b/assets/star-trek/star-trek-voyager-dark-frontier-04.jpg
new file mode 100644
index 0000000..978c589
--- /dev/null
+++ b/assets/star-trek/star-trek-voyager-dark-frontier-04.jpg
diff --git a/assets/star-trek/star-trek-voyager-dark-frontier-05.jpg b/assets/star-trek/star-trek-voyager-dark-frontier-05.jpg
new file mode 100644
index 0000000..612aec0
--- /dev/null
+++ b/assets/star-trek/star-trek-voyager-dark-frontier-05.jpg
diff --git a/assets/star-trek/star-trek-voyager-dark-frontier-06.jpg b/assets/star-trek/star-trek-voyager-dark-frontier-06.jpg
new file mode 100644
index 0000000..70accfe
--- /dev/null
+++ b/assets/star-trek/star-trek-voyager-dark-frontier-06.jpg
diff --git a/assets/star-trek/star-trek-voyager-equinox.jpg b/assets/star-trek/star-trek-voyager-equinox.jpg
new file mode 100644
index 0000000..7ff93bd
--- /dev/null
+++ b/assets/star-trek/star-trek-voyager-equinox.jpg
diff --git a/assets/star-trek/star-trek-voyager-gravity.jpg b/assets/star-trek/star-trek-voyager-gravity.jpg
new file mode 100644
index 0000000..1c625e4
--- /dev/null
+++ b/assets/star-trek/star-trek-voyager-gravity.jpg
diff --git a/assets/star-trek/star-trek-voyager-infinite-regress-1.jpg b/assets/star-trek/star-trek-voyager-infinite-regress-1.jpg
new file mode 100644
index 0000000..3e315ac
--- /dev/null
+++ b/assets/star-trek/star-trek-voyager-infinite-regress-1.jpg
diff --git a/assets/star-trek/star-trek-voyager-infinite-regress-2.jpg b/assets/star-trek/star-trek-voyager-infinite-regress-2.jpg
new file mode 100644
index 0000000..5493c40
--- /dev/null
+++ b/assets/star-trek/star-trek-voyager-infinite-regress-2.jpg
diff --git a/assets/star-trek/star-trek-voyager-infinite-regress-3.jpg b/assets/star-trek/star-trek-voyager-infinite-regress-3.jpg
new file mode 100644
index 0000000..3276182
--- /dev/null
+++ b/assets/star-trek/star-trek-voyager-infinite-regress-3.jpg
diff --git a/assets/star-trek/star-trek-voyager-infinite-regress-4.jpg b/assets/star-trek/star-trek-voyager-infinite-regress-4.jpg
new file mode 100644
index 0000000..199a93b
--- /dev/null
+++ b/assets/star-trek/star-trek-voyager-infinite-regress-4.jpg
diff --git a/assets/star-trek/star-trek-voyager-jaggernaut-001.jpg b/assets/star-trek/star-trek-voyager-jaggernaut-001.jpg
new file mode 100644
index 0000000..cffcd44
--- /dev/null
+++ b/assets/star-trek/star-trek-voyager-jaggernaut-001.jpg
diff --git a/assets/star-trek/star-trek-voyager-latent-image-1.jpg b/assets/star-trek/star-trek-voyager-latent-image-1.jpg
new file mode 100644
index 0000000..8f7c409
--- /dev/null
+++ b/assets/star-trek/star-trek-voyager-latent-image-1.jpg
diff --git a/assets/star-trek/star-trek-voyager-nothing-human-1.jpg b/assets/star-trek/star-trek-voyager-nothing-human-1.jpg
new file mode 100644
index 0000000..767decc
--- /dev/null
+++ b/assets/star-trek/star-trek-voyager-nothing-human-1.jpg
diff --git a/assets/star-trek/star-trek-voyager-nothing-human-1.webp b/assets/star-trek/star-trek-voyager-nothing-human-1.webp
new file mode 100644
index 0000000..42b20dd
--- /dev/null
+++ b/assets/star-trek/star-trek-voyager-nothing-human-1.webp
diff --git a/assets/star-trek/star-trek-voyager-nothing-human-2.jpg b/assets/star-trek/star-trek-voyager-nothing-human-2.jpg
new file mode 100644
index 0000000..6e829c4
--- /dev/null
+++ b/assets/star-trek/star-trek-voyager-nothing-human-2.jpg
diff --git a/assets/star-trek/star-trek-voyager-nothing-human-3.jpg b/assets/star-trek/star-trek-voyager-nothing-human-3.jpg
new file mode 100644
index 0000000..7a54e38
--- /dev/null
+++ b/assets/star-trek/star-trek-voyager-nothing-human-3.jpg
diff --git a/assets/star-trek/star-trek-voyager-relativity.jpg b/assets/star-trek/star-trek-voyager-relativity.jpg
new file mode 100644
index 0000000..a3f9f34
--- /dev/null
+++ b/assets/star-trek/star-trek-voyager-relativity.jpg
diff --git a/assets/star-trek/star-trek-voyager-someone-to-watch-over-me.jpg b/assets/star-trek/star-trek-voyager-someone-to-watch-over-me.jpg
new file mode 100644
index 0000000..8b51c7f
--- /dev/null
+++ b/assets/star-trek/star-trek-voyager-someone-to-watch-over-me.jpg
diff --git a/assets/star-trek/star-trek-voyager-the-disese.webp b/assets/star-trek/star-trek-voyager-the-disese.webp
new file mode 100644
index 0000000..56e029c
--- /dev/null
+++ b/assets/star-trek/star-trek-voyager-the-disese.webp
diff --git a/assets/star-trek/star-trek-voyager-think-tank-1.jpg b/assets/star-trek/star-trek-voyager-think-tank-1.jpg
new file mode 100644
index 0000000..7386510
--- /dev/null
+++ b/assets/star-trek/star-trek-voyager-think-tank-1.jpg
diff --git a/assets/star-trek/star-trek-voyager-think-tank-2.jpg b/assets/star-trek/star-trek-voyager-think-tank-2.jpg
new file mode 100644
index 0000000..46c80be
--- /dev/null
+++ b/assets/star-trek/star-trek-voyager-think-tank-2.jpg
diff --git a/assets/star-trek/star-trek-voyager-thirty-days-1.jpg b/assets/star-trek/star-trek-voyager-thirty-days-1.jpg
new file mode 100644
index 0000000..d96b63c
--- /dev/null
+++ b/assets/star-trek/star-trek-voyager-thirty-days-1.jpg
diff --git a/assets/star-trek/star-trek-voyager-thirty-days-2.jpg b/assets/star-trek/star-trek-voyager-thirty-days-2.jpg
new file mode 100644
index 0000000..a74824f
--- /dev/null
+++ b/assets/star-trek/star-trek-voyager-thirty-days-2.jpg
diff --git a/assets/star-trek/star-trek-voyager-transparent.png b/assets/star-trek/star-trek-voyager-transparent.png
new file mode 100644
index 0000000..aa9d7c9
--- /dev/null
+++ b/assets/star-trek/star-trek-voyager-transparent.png
diff --git a/assets/star-trek/star-trek-voyager-warhead.jpg b/assets/star-trek/star-trek-voyager-warhead.jpg
new file mode 100644
index 0000000..79ef335
--- /dev/null
+++ b/assets/star-trek/star-trek-voyager-warhead.jpg
diff --git a/assets/star-trek/voy-s1.csv b/assets/star-trek/voy-s1.csv
new file mode 100644
index 0000000..6cb979c
--- /dev/null
+++ b/assets/star-trek/voy-s1.csv
@@ -0,0 +1,16 @@
+Title,Episode,Production number,Stardate,US release date
+"""Caretaker""",1x01/02,40841-721,48315.6–48317,1995-01-16
+"""Parallax""",1x03,40841-103,48439.7,1995-01-23
+"""Time and Again""",1x04,40841-104,Unknown,1995-01-30
+"""Phage""",1x05,40841-105,48532.4,1995-02-06
+"""The Cloud""",1x06,40841-106,48546.2,1995-02-13
+"""Eye of the Needle""",1x07,40841-107,48579.4,1995-02-20
+"""Ex Post Facto""",1x08,108,Unknown,1995-02-27
+"""Emanations""",1x09,40840-109,48623.5,1995-03-13
+"""Prime Factors""",1x10,40840-110,48642.5,1995-03-20
+"""State of Flux""",1x11,40840-111,48658.2,1995-04-10
+"""Heroes and Demons""",1x12,40840-112,48693.2,1995-04-24
+"""Cathexis""",1x13,40840-113,48734.2,1995-05-01
+"""Faces""",1x14,40840-114,48784.2,1995-05-08
+"""Jetrel""",1x15,40840-115,48832.1,1995-05-15
+"""Learning Curve""",1x16,40840-116,48846.5,1995-05-22
diff --git a/assets/star-trek/voy-s1.yaml b/assets/star-trek/voy-s1.yaml
new file mode 100644
index 0000000..e85e946
--- /dev/null
+++ b/assets/star-trek/voy-s1.yaml
@@ -0,0 +1,92 @@
+---
+episodes:
+-
+    Title: "Caretaker"
+    Episode: 1x01/02
+    ProductionNo: 40841-721
+    Stardate: 48315.6–48317
+    USRelDate: 1995-01-16
+-
+    Title: "Parallax"
+    Episode: 1x03
+    ProductionNo: 40841-103
+    Stardate: 48439.7
+    USRelDate: 1995-01-23
+-
+    Title: "Time and Again"
+    Episode: 1x04
+    ProductionNo: 40841-104
+    Stardate: Unknown
+    USRelDate: 1995-01-30
+-
+    Title: "Phage"
+    Episode: 1x05
+    ProductionNo: 40841-105
+    Stardate: 48532.4
+    USRelDate: 1995-02-06
+-
+    Title: "The Cloud"
+    Episode: 1x06
+    ProductionNo: 40841-106
+    Stardate: 48546.2
+    USRelDate: 1995-02-13
+-
+    Title: "Eye of the Needle"
+    Episode: 1x07
+    ProductionNo: 40841-107
+    Stardate: 48579.4
+    USRelDate: 1995-02-20
+-
+    Title: "Ex Post Facto"
+    Episode: 1x08
+    ProductionNo: 108
+    Stardate: Unknown
+    USRelDate: 1995-02-27
+-
+    Title: "Emanations"
+    Episode: 1x09
+    ProductionNo: 40840-109
+    Stardate: 48623.5
+    USRelDate: 1995-03-13
+-
+    Title: "Prime Factors"
+    Episode: 1x10
+    ProductionNo: 40840-110
+    Stardate: 48642.5
+    USRelDate: 1995-03-20
+-
+    Title: "State of Flux"
+    Episode: 1x11
+    ProductionNo: 40840-111
+    Stardate: 48658.2
+    USRelDate: 1995-04-10
+-
+    Title: "Heroes and Demons"
+    Episode: 1x12
+    ProductionNo: 40840-112
+    Stardate: 48693.2
+    USRelDate: 1995-04-24
+-
+    Title: "Cathexis"
+    Episode: 1x13
+    ProductionNo: 40840-113
+    Stardate: 48734.2
+    USRelDate: 1995-05-01
+-
+    Title: "Faces"
+    Episode: 1x14
+    ProductionNo: 40840-114
+    Stardate: 48784.2
+    USRelDate: 1995-05-08
+-
+    Title: "Jetrel"
+    Episode: 1x15
+    ProductionNo: 40840-115
+    Stardate: 48832.1
+    USRelDate: 1995-05-15
+-
+    Title: "Learning Curve"
+    Episode: 1x16
+    ProductionNo: 40840-116
+    Stardate: 48846.5
+    USRelDate: 1995-05-22
diff --git a/assets/star-trek/voy-s2.csv b/assets/star-trek/voy-s2.csv
new file mode 100644
index 0000000..5404283
--- /dev/null
+++ b/assets/star-trek/voy-s2.csv
@@ -0,0 +1,27 @@
+Title,Episode,Production number,Stardate,US release date
+"""The 37's""",2x01,40840-120,48975.1,1995-08-28
+"""Initiations""",2x02,40840-121,49005.3,1995-09-04
+"""Projections""",2x03,40840-117,48892.1,1995-09-11
+"""Elogium""",2x04,40840-118,48921.3,1995-09-18
+"""Non Sequitur""",2x05,40840-122,49011.0,1995-09-25
+"""Twisted""",2x06,40840-119,Unknown,1995-10-02
+"""Parturition""",2x07,40840-123,Unknown,1995-10-09
+"""Persistence of Vision""",2x08,40840-124,Unknown,1995-10-30
+"""Tattoo""",2x09,40840-125,Unknown,1995-11-06
+"""Cold Fire""",2x10,40840-126,49164.8,1995-11-13
+"""Maneuvers""",2x11,40840-127,49208.5,1995-11-20
+"""Resistance""",2x12,40840-128,Unknown,1995-11-27
+"""Prototype""",2x13,40840-129,Unknown,1996-01-15
+"""Alliances""",2x14,40840-131,49337.4,1996-01-22
+"""Threshold""",2x15,40840-132,49373.4,1996-01-29
+"""Meld""",2x16,40840-133,Unknown,1996-02-05
+"""Dreadnought""",2x17,40840-134,49447.0,1996-02-12
+"""Death Wish""",2x18,40840-130,49301.2,1996-02-19
+"""Lifesigns""",2x19,40840-136,49504.3,1996-02-26
+"""Investigations""",2x20,40840-135,49485.2,1996-03-13
+"""Deadlock""",2x21,40840-137,49548.7,1996-03-18
+"""Innocence""",2x22,40840-138,49578.2,1996-04-08
+"""The Thaw""",2x23,40840-139,Unknown,1996-04-29
+"""Tuvix""",2x24,40840-140,49655.2,1996-05-06
+"""Resolutions""",2x25,40840-141,49690.1,1996-05-13
+"""Basics, Part I""",2x26,40840-142,Unknown,1996-05-20
diff --git a/assets/star-trek/voy-s2.yaml b/assets/star-trek/voy-s2.yaml
new file mode 100644
index 0000000..23aa266
--- /dev/null
+++ b/assets/star-trek/voy-s2.yaml
@@ -0,0 +1,158 @@
+---
+episodes:
+-
+    Title: '"The 37''s"'
+    Episode: 2x01
+    ProductionNo: 40840-120a
+    Stardate: 48975.1
+    USRelDate: 1995-08-28
+-
+    Title: "Initiations"
+    Episode: 2x02
+    ProductionNo: 40840-121
+    Stardate: 49005.3
+    USRelDate: 1995-09-04
+-
+    Title: "Projections"
+    Episode: 2x03
+    ProductionNo: 40840-117
+    Stardate: 48892.1
+    USRelDate: 1995-09-11
+-
+    Title: "Elogium"
+    Episode: 2x04
+    ProductionNo: 40840-118
+    Stardate: 48921.3
+    USRelDate: 1995-09-18
+-
+    Title: "Non Sequitur"
+    Episode: 2x05
+    ProductionNo: 40840-122
+    Stardate: 49011.0
+    USRelDate: 1995-09-25
+-
+    Title: "Twisted"
+    Episode: 2x06
+    ProductionNo: 40840-119
+    Stardate: Unknown
+    USRelDate: 1995-10-02
+-
+    Title: "Parturition"
+    Episode: 2x07
+    ProductionNo: 40840-123
+    Stardate: Unknown
+    USRelDate: 1995-10-09
+-
+    Title: "Persistence of Vision"
+    Episode: 2x08
+    ProductionNo: 40840-124
+    Stardate: Unknown
+    USRelDate: 1995-10-30
+-
+    Title: "Tattoo"
+    Episode: 2x09
+    ProductionNo: 40840-125
+    Stardate: Unknown
+    USRelDate: 1995-11-06
+-
+    Title: "Cold Fire"
+    Episode: 2x10
+    ProductionNo: 40840-126
+    Stardate: 49164.8
+    USRelDate: 1995-11-13
+-
+    Title: "Maneuvers"
+    Episode: 2x11
+    ProductionNo: 40840-127
+    Stardate: 49208.5
+    USRelDate: 1995-11-20
+-
+    Title: "Resistance"
+    Episode: 2x12
+    ProductionNo: 40840-128
+    Stardate: Unknown
+    USRelDate: 1995-11-27
+-
+    Title: "Prototype"
+    Episode: 2x13
+    ProductionNo: 40840-129
+    Stardate: Unknown
+    USRelDate: 1996-01-15
+-
+    Title: "Alliances"
+    Episode: 2x14
+    ProductionNo: 40840-131
+    Stardate: 49337.4
+    USRelDate: 1996-01-22
+-
+    Title: "Threshold"
+    Episode: 2x15
+    ProductionNo: 40840-132
+    Stardate: 49373.4
+    USRelDate: 1996-01-29
+-
+    Title: "Meld"
+    Episode: 2x16
+    ProductionNo: 40840-133
+    Stardate: Unknown
+    USRelDate: 1996-02-05
+-
+    Title: "Dreadnought"
+    Episode: 2x17
+    ProductionNo: 40840-134
+    Stardate: 49447.0
+    USRelDate: 1996-02-12
+-
+    Title: "Death Wish"
+    Episode: 2x18
+    ProductionNo: 40840-130
+    Stardate: 49301.2
+    USRelDate: 1996-02-19
+-
+    Title: "Lifesigns"
+    Episode: 2x19
+    ProductionNo: 40840-136
+    Stardate: 49504.3
+    USRelDate: 1996-02-26
+-
+    Title: "Investigations"
+    Episode: 2x20
+    ProductionNo: 40840-135
+    Stardate: 49485.2
+    USRelDate: 1996-03-13
+-
+    Title: "Deadlock"
+    Episode: 2x21
+    ProductionNo: 40840-137
+    Stardate: 49548.7
+    USRelDate: 1996-03-18
+-
+    Title: "Innocence"
+    Episode: 2x22
+    ProductionNo: 40840-138
+    Stardate: 49578.2
+    USRelDate: 1996-04-08
+-
+    Title: "The Thaw"
+    Episode: 2x23
+    ProductionNo: 40840-139
+    Stardate: Unknown
+    USRelDate: 1996-04-29
+-
+    Title: "Tuvix"
+    Episode: 2x24
+    ProductionNo: 40840-140
+    Stardate: 49655.2
+    USRelDate: 1996-05-06
+-
+    Title: "Resolutions"
+    Episode: 2x25
+    ProductionNo: 40840-141
+    Stardate: 49690.1
+    USRelDate: 1996-05-13
+-
+    Title: "Basics, Part I"
+    Episode: 2x26
+    ProductionNo: 40840-142
+    Stardate: Unknown
+    USRelDate: 1996-05-20
diff --git a/assets/star-trek/voy-s3.csv b/assets/star-trek/voy-s3.csv
new file mode 100644
index 0000000..5b543bb
--- /dev/null
+++ b/assets/star-trek/voy-s3.csv
@@ -0,0 +1,27 @@
+Title,Episode,Production number,Stardate,US release date
+"""Basics, Part II""",3x01,40840-146,50032.7,1996-09-04
+"""Flashback""",3x02,40840-145,50126.4,1996-09-11
+"""The Chute""",3x03,40840-147,50156.2,1996-09-18
+"""The Swarm""",3x04,40840-149,50252.3,1996-09-25
+"""False Profits""",3x05,40840-144,50074.3,1996-10-02
+"""Remember""",3x06,40840-148,50203.1,1996-10-09
+"""Sacred Ground""",3x07,40840-143,50063.2,1996-10-30
+"""Future's End""",3x08,40840-150,50312.5,1996-11-06
+"""Future's End, Part II""",3x09,40840-151,50312.5,1996-11-13
+"""Warlord""",3x10,40840-152,50348.1,1996-11-20
+"""The Q and the Grey""",3x11,40840-153,50384.2,1996-11-27
+"""Macrocosm""",3x12,40840-154,50425.1,1996-12-11
+"""Fair Trade""",3x13,40840-156,Unknown,1997-01-08
+"""Alter Ego""",3x14,40840-155,50460.3,1997-01-15
+"""Coda""",3x15,40840-158,50518.6,1997-01-29
+"""Blood Fever""",3x16,40840-157,50537.2,1997-02-05
+"""Unity""",3x17,40840-159,50614.2,1997-02-12
+"""Darkling""",3x18,40840-161,50693.2,1997-02-19
+"""Rise""",3x19,40840-160,Unknown,1997-02-26
+"""Favorite Son""",3x20,40840-162,50732.4,1997-03-19
+"""Before and After""",3x21,40840-163,Unknown,1997-04-09
+"""Real Life""",3x22,40840-164,50836.2,1997-04-23
+"""Distant Origin""",3x23,40840-165,Unknown,1997-04-30
+"""Displaced""",3x24,40840-166,50912.4,1997-05-07
+"""Worst Case Scenario""",3x25,40840-167,50953.4,1997-05-14
+"""Scorpion""",3x26,40840-168,50984.3,1997-05-21
diff --git a/assets/star-trek/voy-s3.yaml b/assets/star-trek/voy-s3.yaml
new file mode 100644
index 0000000..d652f65
--- /dev/null
+++ b/assets/star-trek/voy-s3.yaml
@@ -0,0 +1,157 @@
+---
+-
+    Title: "Basics, Part II"
+    Episode: 3x01
+    ProductionNo: 40840-146
+    Stardate: 50032.7
+    USRelDate: 1996-09-04
+-
+    Title: "Flashback"
+    Episode: 3x02
+    ProductionNo: 40840-145
+    Stardate: 50126.4
+    USRelDate: 1996-09-11
+-
+    Title: "The Chute"
+    Episode: 3x03
+    ProductionNo: 40840-147
+    Stardate: 50156.2
+    USRelDate: 1996-09-18
+-
+    Title: "The Swarm"
+    Episode: 3x04
+    ProductionNo: 40840-149
+    Stardate: 50252.3
+    USRelDate: 1996-09-25
+-
+    Title: "False Profits"
+    Episode: 3x05
+    ProductionNo: 40840-144
+    Stardate: 50074.3
+    USRelDate: 1996-10-02
+-
+    Title: "Remember"
+    Episode: 3x06
+    ProductionNo: 40840-148
+    Stardate: 50203.1
+    USRelDate: 1996-10-09
+-
+    Title: "Sacred Ground"
+    Episode: 3x07
+    ProductionNo: 40840-143
+    Stardate: 50063.2
+    USRelDate: 1996-10-30
+-
+    Title: '"Future''s End"'
+    Episode: 3x08
+    ProductionNo: 40840-150
+    Stardate: 50312.5
+    USRelDate: 1996-11-06
+-
+    Title: '"Future''s End, Part II"'
+    Episode: 3x09
+    ProductionNo: 40840-151
+    Stardate: 50312.5
+    USRelDate: 1996-11-13
+-
+    Title: "Warlord"
+    Episode: 3x10
+    ProductionNo: 40840-152
+    Stardate: 50348.1
+    USRelDate: 1996-11-20
+-
+    Title: "The Q and the Grey"
+    Episode: 3x11
+    ProductionNo: 40840-153
+    Stardate: 50384.2
+    USRelDate: 1996-11-27
+-
+    Title: "Macrocosm"
+    Episode: 3x12
+    ProductionNo: 40840-154
+    Stardate: 50425.1
+    USRelDate: 1996-12-11
+-
+    Title: "Fair Trade"
+    Episode: 3x13
+    ProductionNo: 40840-156
+    Stardate: Unknown
+    USRelDate: 1997-01-08
+-
+    Title: "Alter Ego"
+    Episode: 3x14
+    ProductionNo: 40840-155
+    Stardate: 50460.3
+    USRelDate: 1997-01-15
+-
+    Title: "Coda"
+    Episode: 3x15
+    ProductionNo: 40840-158
+    Stardate: 50518.6
+    USRelDate: 1997-01-29
+-
+    Title: "Blood Fever"
+    Episode: 3x16
+    ProductionNo: 40840-157
+    Stardate: 50537.2
+    USRelDate: 1997-02-05
+-
+    Title: "Unity"
+    Episode: 3x17
+    ProductionNo: 40840-159
+    Stardate: 50614.2
+    USRelDate: 1997-02-12
+-
+    Title: "Darkling"
+    Episode: 3x18
+    ProductionNo: 40840-161
+    Stardate: 50693.2
+    USRelDate: 1997-02-19
+-
+    Title: "Rise"
+    Episode: 3x19
+    ProductionNo: 40840-160
+    Stardate: Unknown
+    USRelDate: 1997-02-26
+-
+    Title: "Favorite Son"
+    Episode: 3x20
+    ProductionNo: 40840-162
+    Stardate: 50732.4
+    USRelDate: 1997-03-19
+-
+    Title: "Before and After"
+    Episode: 3x21
+    ProductionNo: 40840-163
+    Stardate: Unknown
+    USRelDate: 1997-04-09
+-
+    Title: "Real Life"
+    Episode: 3x22
+    ProductionNo: 40840-164
+    Stardate: 50836.2
+    USRelDate: 1997-04-23
+-
+    Title: "Distant Origin"
+    Episode: 3x23
+    ProductionNo: 40840-165
+    Stardate: Unknown
+    USRelDate: 1997-04-30
+-
+    Title: "Displaced"
+    Episode: 3x24
+    ProductionNo: 40840-166
+    Stardate: 50912.4
+    USRelDate: 1997-05-07
+-
+    Title: "Worst Case Scenario"
+    Episode: 3x25
+    ProductionNo: 40840-167
+    Stardate: 50953.4
+    USRelDate: 1997-05-14
+-
+    Title: "Scorpion"
+    Episode: 3x26
+    ProductionNo: 40840-168
+    Stardate: 50984.3
+    USRelDate: 1997-05-21
diff --git a/assets/star-trek/voy-s4.csv b/assets/star-trek/voy-s4.csv
new file mode 100644
index 0000000..9e0d7df
--- /dev/null
+++ b/assets/star-trek/voy-s4.csv
@@ -0,0 +1,27 @@
+Title,Episode,Production number,Stardate,US release date
+"""Scorpion, Part II""",4x01,40840-169,51003.7,1997-09-03
+"""The Gift""",4x02,40840-170,51008,1997-09-10
+"""Day of Honor""",4x03,40840-172,Unknown,1997-09-17
+"""Nemesis""",4x04,40840-171,51082.4,1997-09-24
+"""Revulsion""",4x05,40840-173,51186.2,1997-10-01
+"""The Raven""",4x06,40840-174,Unknown,1997-10-08
+"""Scientific Method""",4x07,40840-175,51244.3,1997-10-29
+"""Year of Hell""",4x08,40840-176,51268.4,1997-11-05
+"""Year of Hell, Part II""",4x09,40840-177,51425.4,1997-11-12
+"""Random Thoughts""",4x10,40840-178,51367.2,1997-11-19
+"""Concerning Flight""",4x11,40840-179,51386.4,1997-11-26
+"""Mortal Coil""",4x12,40840-180,51449.2,1997-12-17
+"""Waking Moments""",4x13,40840-182,51471.3,1998-01-14
+"""Message in a Bottle""",4x14,40840-181,51462,1998-01-21
+"""Hunters""",4x15,40840-183,51501.4,1998-02-11
+"""Prey""",4x16,40840-184,51652.3,1998-02-18
+"""Retrospect""",4x17,40840-185,51658.2,1998-02-25
+"""The Killing Game""",4x18,40840-186,Unknown,1998-03-04
+"""The Killing Game, Part II""",4x19,40840-187,51715.2,1998-03-04
+"""Vis à Vis""",4x20,40840-188,51762.4,1998-04-08
+"""The Omega Directive""",4x21,40840-189,51781.2,1998-04-15
+"""Unforgettable""",4x22,40840-190,51813.4,1998-04-22
+"""Living Witness""",4x23,40840-191,Unknown,1998-04-29
+"""Demon""",4x24,40840-192,Unknown,1998-05-06
+"""One""",4x25,40840-193,51929.3,1998-05-13
+"""Hope and Fear""",4x26,40840-194,51978.2,1998-05-20
diff --git a/assets/star-trek/voy-s4.yaml b/assets/star-trek/voy-s4.yaml
new file mode 100644
index 0000000..04bd1cf
--- /dev/null
+++ b/assets/star-trek/voy-s4.yaml
@@ -0,0 +1,158 @@
+---
+episodes:
+-
+    Title: "Scorpion, Part II"
+    Episode: 4x01
+    ProductionNo: 40840-169
+    Stardate: 51003.7
+    USRelDate: 1997-09-03
+-
+    Title: "The Gift"
+    Episode: 4x02
+    ProductionNo: 40840-170
+    Stardate: 51008
+    USRelDate: 1997-09-10
+-
+    Title: "Day of Honor"
+    Episode: 4x03
+    ProductionNo: 40840-172
+    Stardate: Unknown
+    USRelDate: 1997-09-17
+-
+    Title: "Nemesis"
+    Episode: 4x04
+    ProductionNo: 40840-171
+    Stardate: 51082.4
+    USRelDate: 1997-09-24
+-
+    Title: "Revulsion"
+    Episode: 4x05
+    ProductionNo: 40840-173
+    Stardate: 51186.2
+    USRelDate: 1997-10-01
+-
+    Title: "The Raven"
+    Episode: 4x06
+    ProductionNo: 40840-174
+    Stardate: Unknown
+    USRelDate: 1997-10-08
+-
+    Title: "Scientific Method"
+    Episode: 4x07
+    ProductionNo: 40840-175
+    Stardate: 51244.3
+    USRelDate: 1997-10-29
+-
+    Title: "Year of Hell"
+    Episode: 4x08
+    ProductionNo: 40840-176
+    Stardate: 51268.4
+    USRelDate: 1997-11-05
+-
+    Title: "Year of Hell, Part II"
+    Episode: 4x09
+    ProductionNo: 40840-177
+    Stardate: 51425.4
+    USRelDate: 1997-11-12
+-
+    Title: "Random Thoughts"
+    Episode: 4x10
+    ProductionNo: 40840-178
+    Stardate: 51367.2
+    USRelDate: 1997-11-19
+-
+    Title: "Concerning Flight"
+    Episode: 4x11
+    ProductionNo: 40840-179
+    Stardate: 51386.4
+    USRelDate: 1997-11-26
+-
+    Title: "Mortal Coil"
+    Episode: 4x12
+    ProductionNo: 40840-180
+    Stardate: 51449.2
+    USRelDate: 1997-12-17
+-
+    Title: "Waking Moments"
+    Episode: 4x13
+    ProductionNo: 40840-182
+    Stardate: 51471.3
+    USRelDate: 1998-01-14
+-
+    Title: "Message in a Bottle"
+    Episode: 4x14
+    ProductionNo: 40840-181
+    Stardate: 51462
+    USRelDate: 1998-01-21
+-
+    Title: "Hunters"
+    Episode: 4x15
+    ProductionNo: 40840-183
+    Stardate: 51501.4
+    USRelDate: 1998-02-11
+-
+    Title: "Prey"
+    Episode: 4x16
+    ProductionNo: 40840-184
+    Stardate: 51652.3
+    USRelDate: 1998-02-18
+-
+    Title: "Retrospect"
+    Episode: 4x17
+    ProductionNo: 40840-185
+    Stardate: 51658.2
+    USRelDate: 1998-02-25
+-
+    Title: "The Killing Game"
+    Episode: 4x18
+    ProductionNo: 40840-186
+    Stardate: Unknown
+    USRelDate: 1998-03-04
+-
+    Title: "The Killing Game, Part II"
+    Episode: 4x19
+    ProductionNo: 40840-187
+    Stardate: 51715.2
+    USRelDate: 1998-03-04
+-
+    Title: "Vis à Vis"
+    Episode: 4x20
+    ProductionNo: 40840-188
+    Stardate: 51762.4
+    USRelDate: 1998-04-08
+-
+    Title: "The Omega Directive"
+    Episode: 4x21
+    ProductionNo: 40840-189
+    Stardate: 51781.2
+    USRelDate: 1998-04-15
+-
+    Title: "Unforgettable"
+    Episode: 4x22
+    ProductionNo: 40840-190
+    Stardate: 51813.4
+    USRelDate: 1998-04-22
+-
+    Title: "Living Witness"
+    Episode: 4x23
+    ProductionNo: 40840-191
+    Stardate: Unknown
+    USRelDate: 1998-04-29
+-
+    Title: "Demon"
+    Episode: 4x24
+    ProductionNo: 40840-192
+    Stardate: Unknown
+    USRelDate: 1998-05-06
+-
+    Title: "One"
+    Episode: 4x25
+    ProductionNo: 40840-193
+    Stardate: 51929.3
+    USRelDate: 1998-05-13
+-
+    Title: "Hope and Fear"
+    Episode: 4x26
+    ProductionNo: 40840-194
+    Stardate: 51978.2
+    USRelDate: 1998-05-20
diff --git a/assets/star-trek/voy-s5.csv b/assets/star-trek/voy-s5.csv
new file mode 100644
index 0000000..ec8d7e7
--- /dev/null
+++ b/assets/star-trek/voy-s5.csv
@@ -0,0 +1,26 @@
+Title,Episode,Production number,Stardate,US release date
+"""Night""",5x01,40840-195,52081.2,1998-10-14
+"""Drone""",5x02,40840-196,Unknown,1998-10-21
+"""Extreme Risk""",5x03,40840-197,Unknown,1998-10-28
+"""In the Flesh""",5x04,40840-198,52136.4,1998-11-04
+"""Once Upon a Time""",5x05,40840-199,Unknown,1998-11-11
+"""Timeless""",5x06,40840-201,52164.3,1998-11-18
+"""Infinite Regress""",5x07,40840-203,52356.2,1998-11-25
+"""Nothing Human""",5x08,40840-200,Unknown,1998-12-02
+"""Thirty Days""",5x09,40840-202,52179.4,1998-12-09
+"""Counterpoint""",5x10,40840-204,Unknown,1998-12-16
+"""Latent Image""",5x11,40840-206,Unknown,1999-01-20
+"""Bride of Chaotica!""",5x12,40840-207,Unknown,1999-01-27
+"""Gravity""",5x13,40840-205,52438.9,1999-02-03
+"""Bliss""",5x14,40840-209,52542.3,1999-02-10
+"""Dark Frontier""",5x15/16,40840-211/40840-212,52619.2,1999-02-17
+"""The Disease""",5x17,40840-210,Unknown,1999-02-24
+"""Course: Oblivion""",5x18,40840-213,52586.3,1999-03-03
+"""The Fight""",5x19,40840-208,Unknown,1999-03-24
+"""Think Tank""",5x20,40840-214,Unknown,1999-03-31
+"""Juggernaut""",5x21,40840-215,Unknown,1999-04-26
+"""Someone to Watch Over Me""",5x22,40840-216,52648.0,1999-04-28
+"""11:59""",5x23,40840-217,52840,1999-05-05
+"""Relativity""",5x24,40840-218,52861.274,1999-05-12
+"""Warhead""",5x25,40840-219,Unknown,1999-05-19
+"""Equinox""",5x26,40840-220,Unknown,1999-05-26
diff --git a/assets/star-trek/voy-s5.yaml b/assets/star-trek/voy-s5.yaml
new file mode 100644
index 0000000..c87ece6
--- /dev/null
+++ b/assets/star-trek/voy-s5.yaml
@@ -0,0 +1,152 @@
+---
+episodes:
+-
+    Title: "Night"
+    Episode: 5x01
+    ProductionNo: 40840-195
+    Stardate: 52081.2
+    USRelDate: 1998-10-14
+-
+    Title: "Drone"
+    Episode: 5x02
+    ProductionNo: 40840-196
+    Stardate: Unknown
+    USRelDate: 1998-10-21
+-
+    Title: "Extreme Risk"
+    Episode: 5x03
+    ProductionNo: 40840-197
+    Stardate: Unknown
+    USRelDate: 1998-10-28
+-
+    Title: "In the Flesh"
+    Episode: 5x04
+    ProductionNo: 40840-198
+    Stardate: 52136.4
+    USRelDate: 1998-11-04
+-
+    Title: "Once Upon a Time"
+    Episode: 5x05
+    ProductionNo: 40840-199
+    Stardate: Unknown
+    USRelDate: 1998-11-11
+-
+    Title: "Timeless"
+    Episode: 5x06
+    ProductionNo: 40840-201
+    Stardate: 52164.3
+    USRelDate: 1998-11-18
+-
+    Title: "Infinite Regress"
+    Episode: 5x07
+    ProductionNo: 40840-203
+    Stardate: 52356.2
+    USRelDate: 1998-11-25
+-
+    Title: "Nothing Human"
+    Episode: 5x08
+    ProductionNo: 40840-200
+    Stardate: Unknown
+    USRelDate: 1998-12-02
+-
+    Title: "Thirty Days"
+    Episode: 5x09
+    ProductionNo: 40840-202
+    Stardate: 52179.4
+    USRelDate: 1998-12-09
+-
+    Title: "Counterpoint"
+    Episode: 5x10
+    ProductionNo: 40840-204
+    Stardate: Unknown
+    USRelDate: 1998-12-16
+-
+    Title: "Latent Image"
+    Episode: 5x11
+    ProductionNo: 40840-206
+    Stardate: Unknown
+    USRelDate: 1999-01-20
+-
+    Title: "Bride of Chaotica!"
+    Episode: 5x12
+    ProductionNo: 40840-207
+    Stardate: Unknown
+    USRelDate: 1999-01-27
+-
+    Title: "Gravity"
+    Episode: 5x13
+    ProductionNo: 40840-205
+    Stardate: 52438.9
+    USRelDate: 1999-02-03
+-
+    Title: "Bliss"
+    Episode: 5x14
+    ProductionNo: 40840-209
+    Stardate: 52542.3
+    USRelDate: 1999-02-10
+-
+    Title: "Dark Frontier"
+    Episode: 5x15/16
+    ProductionNo: 40840-211/40840-212
+    Stardate: 52619.2
+    USRelDate: 1999-02-17
+-
+    Title: "The Disease"
+    Episode: 5x17
+    ProductionNo: 40840-210
+    Stardate: Unknown
+    USRelDate: 1999-02-24
+-
+    Title: "Course: Oblivion"
+    Episode: 5x18
+    ProductionNo: 40840-213
+    Stardate: 52586.3
+    USRelDate: 1999-03-03
+-
+    Title: "The Fight"
+    Episode: 5x19
+    ProductionNo: 40840-208
+    Stardate: Unknown
+    USRelDate: 1999-03-24
+-
+    Title: "Think Tank"
+    Episode: 5x20
+    ProductionNo: 40840-214
+    Stardate: Unknown
+    USRelDate: 1999-03-31
+-
+    Title: "Juggernaut"
+    Episode: 5x21
+    ProductionNo: 40840-215
+    Stardate: Unknown
+    USRelDate: 1999-04-26
+-
+    Title: "Someone to Watch Over Me"
+    Episode: 5x22
+    ProductionNo: 40840-216
+    Stardate: 52648.0
+    USRelDate: 1999-04-28
+-
+    Title: "11:59"
+    Episode: 5x23
+    ProductionNo: 40840-217
+    Stardate: 52840
+    USRelDate: 1999-05-05
+-
+    Title: "Relativity"
+    Episode: 5x24
+    ProductionNo: 40840-218
+    Stardate: 52861.274
+    USRelDate: 1999-05-12
+-
+    Title: "Warhead"
+    Episode: 5x25
+    ProductionNo: 40840-219
+    Stardate: Unknown
+    USRelDate: 1999-05-19
+-
+    Title: "Equinox"
+    Episode: 5x26
+    ProductionNo: 40840-220
+    Stardate: Unknown
+    USRelDate: 1999-05-26
diff --git a/assets/star-trek/voy-s6.csv b/assets/star-trek/voy-s6.csv
new file mode 100644
index 0000000..49a0c04
--- /dev/null
+++ b/assets/star-trek/voy-s6.csv
@@ -0,0 +1,27 @@
+Title,Episode,Production number,Stardate,US release date
+"""Equinox, Part II""",6x01,40840-221,Unknown,1999-09-22
+"""Survival Instinct""",6x02,40840-222,53049.2,1999-09-29
+"""Barge of the Dead""",6x03,40840-223,Unknown,1999-10-06
+"""Tinker Tenor Doctor Spy""",6x04,40840-224,Unknown,1999-10-13
+"""Alice""",6x05,40840-226,Unknown,1999-10-20
+"""Riddles""",6x06,40840-227,53263.2,1999-11-03
+"""Dragon's Teeth""",6x07,40840-225,53167.9,1999-11-10
+"""One Small Step""",6x08,40840-228,53292.7,1999-11-17
+"""The Voyager Conspiracy""",6x09,40840-229,53329,1999-11-24
+"""Pathfinder""",6x10,40840-230,Unknown,1999-12-01
+"""Fair Haven""",6x11,40840-231,Unknown,2000-01-12
+"""Blink of an Eye""",6x12,40840-233,Unknown,2000-01-19
+"""Virtuoso""",6x13,40840-234,53556.4,2000-01-26
+"""Memorial""",6x14,40840-236,Unknown,2000-02-02
+"""Tsunkatse""",6x15,40840-232,53447.2,2000-02-09
+"""Collective""",6x16,40840-235,Unknown,2000-02-16
+"""Spirit Folk""",6x17,40840-237,Unknown,2000-02-23
+"""Ashes to Ashes""",6x18,40840-238,53679.4,2000-03-01
+"""Child's Play""",6x19,40840-239,Unknown,2000-03-08
+"""Good Shepherd""",6x20,40840-240,53753.2,2000-03-15
+"""Live Fast and Prosper""",6x21,40840-242,53849.2,2000-04-19
+"""Muse""",6x22,40840-244,53918.0,2000-04-26
+"""Fury""",6x23,40840-241,Unknown,2000-05-03
+"""Life Line""",6x24,40840-243,Unknown,2000-05-10
+"""The Haunting of Deck Twelve""",6x25,40840-245,Unknown,2000-05-17
+"""Unimatrix Zero""",6x26,40840-246,Unknown,2000-05-24
diff --git a/assets/star-trek/voy-s6.yaml b/assets/star-trek/voy-s6.yaml
new file mode 100644
index 0000000..4cbab8e
--- /dev/null
+++ b/assets/star-trek/voy-s6.yaml
@@ -0,0 +1,158 @@
+---
+episodes:
+-
+    Title: "Equinox, Part II"
+    Episode: 6x01
+    ProductionNo: 40840-221
+    Stardate: Unknown
+    USRelDate: 1999-09-22
+-
+    Title: "Survival Instinct"
+    Episode: 6x02
+    ProductionNo: 40840-222
+    Stardate: 53049.2
+    USRelDate: 1999-09-29
+-
+    Title: "Barge of the Dead"
+    Episode: 6x03
+    ProductionNo: 40840-223
+    Stardate: Unknown
+    USRelDate: 1999-10-06
+-
+    Title: "Tinker Tenor Doctor Spy"
+    Episode: 6x04
+    ProductionNo: 40840-224
+    Stardate: Unknown
+    USRelDate: 1999-10-13
+-
+    Title: "Alice"
+    Episode: 6x05
+    ProductionNo: 40840-226
+    Stardate: Unknown
+    USRelDate: 1999-10-20
+-
+    Title: "Riddles"
+    Episode: 6x06
+    ProductionNo: 40840-227
+    Stardate: 53263.2
+    USRelDate: 1999-11-03
+-
+    Title: '"Dragon''s Teeth"'
+    Episode: 6x07
+    ProductionNo: 40840-225
+    Stardate: 53167.9
+    USRelDate: 1999-11-10
+-
+    Title: "One Small Step"
+    Episode: 6x08
+    ProductionNo: 40840-228
+    Stardate: 53292.7
+    USRelDate: 1999-11-17
+-
+    Title: "The Voyager Conspiracy"
+    Episode: 6x09
+    ProductionNo: 40840-229
+    Stardate: 53329
+    USRelDate: 1999-11-24
+-
+    Title: "Pathfinder"
+    Episode: 6x10
+    ProductionNo: 40840-230
+    Stardate: Unknown
+    USRelDate: 1999-12-01
+-
+    Title: "Fair Haven"
+    Episode: 6x11
+    ProductionNo: 40840-231
+    Stardate: Unknown
+    USRelDate: 2000-01-12
+-
+    Title: "Blink of an Eye"
+    Episode: 6x12
+    ProductionNo: 40840-233
+    Stardate: Unknown
+    USRelDate: 2000-01-19
+-
+    Title: "Virtuoso"
+    Episode: 6x13
+    ProductionNo: 40840-234
+    Stardate: 53556.4
+    USRelDate: 2000-01-26
+-
+    Title: "Memorial"
+    Episode: 6x14
+    ProductionNo: 40840-236
+    Stardate: Unknown
+    USRelDate: 2000-02-02
+-
+    Title: "Tsunkatse"
+    Episode: 6x15
+    ProductionNo: 40840-232
+    Stardate: 53447.2
+    USRelDate: 2000-02-09
+-
+    Title: "Collective"
+    Episode: 6x16
+    ProductionNo: 40840-235
+    Stardate: Unknown
+    USRelDate: 2000-02-16
+-
+    Title: "Spirit Folk"
+    Episode: 6x17
+    ProductionNo: 40840-237
+    Stardate: Unknown
+    USRelDate: 2000-02-23
+-
+    Title: "Ashes to Ashes"
+    Episode: 6x18
+    ProductionNo: 40840-238
+    Stardate: 53679.4
+    USRelDate: 2000-03-01
+-
+    Title: '"Child''s Play"'
+    Episode: 6x19
+    ProductionNo: 40840-239
+    Stardate: Unknown
+    USRelDate: 2000-03-08
+-
+    Title: "Good Shepherd"
+    Episode: 6x20
+    ProductionNo: 40840-240
+    Stardate: 53753.2
+    USRelDate: 2000-03-15
+-
+    Title: "Live Fast and Prosper"
+    Episode: 6x21
+    ProductionNo: 40840-242
+    Stardate: 53849.2
+    USRelDate: 2000-04-19
+-
+    Title: "Muse"
+    Episode: 6x22
+    ProductionNo: 40840-244
+    Stardate: 53918.0
+    USRelDate: 2000-04-26
+-
+    Title: "Fury"
+    Episode: 6x23
+    ProductionNo: 40840-241
+    Stardate: Unknown
+    USRelDate: 2000-05-03
+-
+    Title: "Life Line"
+    Episode: 6x24
+    ProductionNo: 40840-243
+    Stardate: Unknown
+    USRelDate: 2000-05-10
+-
+    Title: "The Haunting of Deck Twelve"
+    Episode: 6x25
+    ProductionNo: 40840-245
+    Stardate: Unknown
+    USRelDate: 2000-05-17
+-
+    Title: "Unimatrix Zero"
+    Episode: 6x26
+    ProductionNo: 40840-246
+    Stardate: Unknown
+    USRelDate: 2000-05-24
diff --git a/assets/star-trek/voy-s7.csv b/assets/star-trek/voy-s7.csv
new file mode 100644
index 0000000..33e9872
--- /dev/null
+++ b/assets/star-trek/voy-s7.csv
@@ -0,0 +1,25 @@
+Title,Episode,Production number,Stardate,US release date
+"""Unimatrix Zero, Part II""",7x01,40840-247,54014.4,2000-10-04
+"""Imperfection""",7x02,40840-248,54129.4,2000-10-11
+"""Drive""",7x03,40840-249,54058.6,2000-10-18
+"""Repression""",7x04,40840-251,54090.4,2000-10-25
+"""Critical Care""",7x05,40840-250,Unknown,2000-11-01
+"""Inside Man""",7x06,40840-252,54208.3,2000-11-08
+"""Body and Soul""",7x07,40840-255,54238.3,2000-11-15
+"""Nightingale""",7x08,40840-256,54274.7,2000-11-22
+"""Flesh and Blood""",7x09/10,40841-253/40841-254,54315.3–54337.5,2000-11-29
+"""Shattered""",7x11,40840-257,Unknown,2001-01-17
+"""Lineage""",7x12,40840-258,54452.6,2001-01-24
+"""Repentance""",7x13,40840-259,54474.6,2001-01-31
+"""Prophecy""",7x14,40840-260,54518.2–54529.8,2001-02-07
+"""The Void""",7x15,40840-261,54553.4–54562.7,2001-02-14
+"""Workforce""",7x16,40840-262,54584.3–54608.6,2001-02-21
+"""Workforce, Part II""",7x17,40840-263,54622.4,2001-02-28
+"""Human Error""",7x18,40840-264,Unknown,2001-03-07
+"""Q2""",7x19,40840-265,54704.5,2001-04-11
+"""Author, Author""",7x20,40840-266,54732.3,2001-04-18
+"""Friendship One""",7x21,40840-267,54775.4,2001-04-25
+"""Natural Law""",7x22,40840-268,54827.7,2001-05-02
+"""Homestead""",7x23,40840-269,54868.6,2001-05-09
+"""Renaissance Man""",7x24,40840-270,54890.7,2001-05-16
+"""Endgame""",7x25/26,40840-748 (40840-271/40840-272),54973.4,2001-05-23
diff --git a/assets/star-trek/voy5x01a.jpg b/assets/star-trek/voy5x01a.jpg
new file mode 100644
index 0000000..3b9ec1e
--- /dev/null
+++ b/assets/star-trek/voy5x01a.jpg
diff --git a/assets/star-trek/voy5x02a.jpg b/assets/star-trek/voy5x02a.jpg
new file mode 100644
index 0000000..d02c7fa
--- /dev/null
+++ b/assets/star-trek/voy5x02a.jpg
diff --git a/assets/star-trek/voy5x03.webp b/assets/star-trek/voy5x03.webp
new file mode 100644
index 0000000..9054c71
--- /dev/null
+++ b/assets/star-trek/voy5x03.webp
diff --git a/assets/star-trek/voy5x03b.webp b/assets/star-trek/voy5x03b.webp
new file mode 100644
index 0000000..e6dcb89
--- /dev/null
+++ b/assets/star-trek/voy5x03b.webp
diff --git a/assets/star-trek/voy5x03c.jpg b/assets/star-trek/voy5x03c.jpg
new file mode 100644
index 0000000..f7d5c88
--- /dev/null
+++ b/assets/star-trek/voy5x03c.jpg
diff --git a/assets/star-trek/voy5x03d.jpg b/assets/star-trek/voy5x03d.jpg
new file mode 100644
index 0000000..1f8f3cb
--- /dev/null
+++ b/assets/star-trek/voy5x03d.jpg
diff --git a/assets/star-trek/voy5x03e.jpg b/assets/star-trek/voy5x03e.jpg
new file mode 100644
index 0000000..101ec2b
--- /dev/null
+++ b/assets/star-trek/voy5x03e.jpg
diff --git a/assets/star-trek/voy5x03f.jpg b/assets/star-trek/voy5x03f.jpg
new file mode 100644
index 0000000..b6651ac
--- /dev/null
+++ b/assets/star-trek/voy5x03f.jpg
diff --git a/assets/star-trek/voy5x04a.webp b/assets/star-trek/voy5x04a.webp
new file mode 100644
index 0000000..5b6a9fb
--- /dev/null
+++ b/assets/star-trek/voy5x04a.webp
diff --git a/assets/star-trek/voy5x06a.webp b/assets/star-trek/voy5x06a.webp
new file mode 100644
index 0000000..e16a29b
--- /dev/null
+++ b/assets/star-trek/voy5x06a.webp
diff --git a/assets/star-trek/voy5x06b.jpg b/assets/star-trek/voy5x06b.jpg
new file mode 100644
index 0000000..07534f6
--- /dev/null
+++ b/assets/star-trek/voy5x06b.jpg
diff --git a/assets/star-trek/voy6x01a.jpg b/assets/star-trek/voy6x01a.jpg
new file mode 100644
index 0000000..e21056f
--- /dev/null
+++ b/assets/star-trek/voy6x01a.jpg
diff --git a/assets/star-trek/voy6x02a.jpg b/assets/star-trek/voy6x02a.jpg
new file mode 100644
index 0000000..4ae0f35
--- /dev/null
+++ b/assets/star-trek/voy6x02a.jpg
diff --git a/config/_default/menus.en.toml b/config/_default/menus.en.toml
index 03a4106..bef775d 100644
--- a/config/_default/menus.en.toml
+++ b/config/_default/menus.en.toml
@@ -100,6 +100,22 @@
   weight = 10000
   pageRef = "/emacs"
 
+
+[[sections]]                    
+  name = "Star Trek"
+  pageRef = "/star-trek"
+  weight = 1200
+  [[sections.params]]
+    section="star-trek"
+    submenu = "sections-star-trek"
+
+    
+[[sections-star-trek]]
+  name = "Voyager"
+  weight = 100
+  pageRef = "/star-trek/voy"
+
+    
   
 [[sections]]                    
   name = "More"
diff --git a/content-org/.#unix-history.org b/content-org/.#unix-history.org
new file mode 120000
index 0000000..05810a7
--- /dev/null
+++ b/content-org/.#unix-history.org
@@ -0,0 +1 @@
+mms@voyager.local.62643:1729838336
\ No newline at end of file
diff --git a/content-org/star-trek.org b/content-org/star-trek.org
index 86eea6c..819cb17 100644
--- a/content-org/star-trek.org
+++ b/content-org/star-trek.org
@@ -3,9 +3,10 @@
 #+URL: https://michal.sapka.me/star-trek
 #+STARTUP: show2levels indent logdone
 
-#+HUGO_BASE_DIR: ~/sites/site-crys-startrek/
+#+HUGO_BASE_DIR: ~/ghq/michal.sapka.me/mms/site
 #+HUGO_WEIGHT: auto
-#+HUGO_SECTION:
+#+HUGO_SECTION: star-trek
+
 
 * Main
 :PROPERTIES:
@@ -55,10 +56,9 @@ So yeah. "Star Trek" is my number one, and nothing else comes close. In western
 #+END_QUOTE
 
 
-* Voyager                                         
+* Voyager                                                        :@star_trek:
 :PROPERTIES:
-:EXPORT_HUGO_SECTION: voy
-:EXPORT_HUGO_PAIRED_SHORTCODES: img-c
+:EXPORT_HUGO_SECTION: star-trek/voy
 :EXPORT_HUGO_MENU: :menu star-trek :parent voy 
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER: :primary_menu star-trek
 :END:
@@ -67,19 +67,18 @@ So yeah. "Star Trek" is my number one, and nothing else comes close. In western
 CLOSED: [2023-11-16 Wed 23:00]
 :PROPERTIES:
 :EXPORT_FILE_NAME: _index
-:EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :abstract Homeapage of my small Star Trek fansite :type special :hardback true
+:EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :abstract Homepage of my small Star Trek fansite :type special :hardback true
+:EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :aliases '(/star-trek)
 :EXPORT_HUGO_PAIRED_SHORTCODES+: ep-table
 :END:
 
 Alas, I started writing about Trek only when reaching Season 5.
 For now, nothing before that will be present.
 
+*** Currently watching
+**** Season Six
 
-*** Episodes
-**** Currently watching
-***** Season Six
-
-#+attr_shortcode: "voy-s6.yaml"
+#+attr_shortcode: "star-trek/voy-s6.yaml"
 #+begin_ep-table
 Jenway, challenged
 #+end_ep-table
@@ -89,17 +88,17 @@ Jenway, challenged
 **** Older Episodes
 ***** Season Five
 
-#+attr_shortcode: "voy-s5.yaml"
+#+attr_shortcode: "star-trek/voy-s5.yaml"
 #+begin_ep-table
 Jenway, challenged
 #+end_ep-table
 
 
-* Voyager reviews                                        
+* TODO Voyager reviews                                  :@star_trek:@voyager:
 :PROPERTIES:
-:EXPORT_HUGO_SECTION: voy
-:EXPORT_HUGO_PAIRED_SHORTCODES: img-c image
-:EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :image_dir "images" :image_max_width 575
+:EXPORT_HUGO_SECTION: star-trek/voy
+:EXPORT_HUGO_PAIRED_SHORTCODES: image
+:EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :image_dir "star-trek" :image_max_width 575
 :END:
 
 ** Season 5
@@ -115,15 +114,17 @@ CLOSED: [2023-02-12 wed 23:00]
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :episode_id 5x01
 :END:
 
-
 **** Synopsis
 
 The crew enters a void in the Delta Quadrant, an area without any stars of 2 light-years radius. The crew morale is very low as the vast emptiness gets to them. The episode starts in the Holodeck, and I was afraid this would be another Holodeck malfunctions story. However, when the ship loses power, the plot goes in a completely different direction - it turns out someone is living in the emptiness—a hostile creature. Soon after, the ship encounters another living form - a ship emitting large doses of radiation piloted by Emck, a Malon. The strange ship offers help with quick passing of the void on one condition - Jenway is to transport the creature to their ship.
 
-#+attr_shortcode: "star-trek-voyager-night.jpg" "http://www.myyearofstartrek.com/2015/10/voyager-re-watch-demon-one-hope-and.html"
-#+begin_img-c
+#+attr_shortcode: :file voy5x01a.jpg
+#+attr_shortcode: :class centered
+#+attr_shortcode: :source http://www.myyearofstartrek.com/2015/10/voyager-re-watch-demon-one-hope-and.html
+#+begin_image
 Jenway, challenged
-#+end_img-c
+#+end_image
+
 
 Jenway being Jenway, declines and decides to first talk with the now-imprisoned alien. It informs her that they are a dying breed due to the poisoning of space by Emck. It is soon revealed that Emck's job is to drop toxic waste, a by-product of Malon industries. Jenway tries to give Voyager's technology to Emck, but he refuses, as clean energy would ruin his business. Jenwey then orders her crew to go into a vortex leading out of the void while she stays behind and destroys it so Malons can no longer dump their waste. The staff, however, goes to mutiny. Jenway agrees, and Voyager fires torpedoes as it enters the vortex. The episode ends with the crew seeing stars again.
 
@@ -139,6 +140,7 @@ There's a lot more to her that she allows the crew (and the viewer) to see. She
 
 Not satisfactory. He was there, but not enough.
 
+
 *** DONE Star Trek: Voyager 05x02 - Drone
 CLOSED: [2023-02-22 Wed 23:00]
 :PROPERTIES:
@@ -152,10 +154,12 @@ A small team, including Seven of Nine and Doctor, is returning from a mission. D
 
 The crew discovers a borg maturation chamber with a rapidly growing Borg drone. This is the first time Seven sees something like this, as the Borg assimilate living beings and don't reproduce. Jenway has yet another moral dilemma - as Doctor's emitter is based on 29th-century tech, it would doom the galaxy if it fell in Borg's hands. But, on the other hand, the drone has not connected with the collective and may learn human customs and ways. She goes with the latter, and Seven is tasked with teaching the new drone. It all goes well until the drone accidentally connects with the collective.
 
-#+attr_shortcode: "star-trek-voyager-drone.jpg" "https://the-avocado.org/2021/05/27/you-talking-trek-to-me-best-of-voyager-drone/"
-#+begin_img-c
+#+attr_shortcode: :file voy5x02a.jpg
+#+attr_shortcode: :class centered
+#+attr_shortcode: :source https://the-avocado.org/2021/05/27/you-talking-trek-to-me-best-of-voyager-drone/
+#+begin_image
 Borg round thingy
-#+end_img-c
+#+end_image
 
 Voyager faces the Borg. Drone decides to help mankind. It transports to the Borg ship, takes over control, and flies into a nearby nebula. The Borg ship is destroyed. 
 
@@ -173,10 +177,10 @@ As for the episode, it was ok. We've already seen a Borg drone emancipated ([I,
 
 It's a shame, as One was cool.
 
-
- **** Doctor factor
+**** Doctor factor
 
 Oh yeah, a lot better than last time. We have Doctor interacting with B'Elanna, which is always a treat. Very much a huge plus here!
+
 *** DONE Star Trek: Voyager 05x03 - Extreme Risk
 CLOSED: [2023-02-28 Wed 23:00]
 :PROPERTIES:
@@ -185,13 +189,17 @@ CLOSED: [2023-02-28 Wed 23:00]
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :menu_item_override 3
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :episode_id 5x03
 :END:
+
 **** Synopsis
 Voyager's probe is launched at a gas giant, but Malons spot it and attempt to capture it. To prevent it, the crew sends the probe into the gas planet's atmosphere. Malon's ship follows the probe and is subsequently crashed. Paris presents a design for Delta Flyaer, a specialized shuttlecraft based on Starfleet's and Borg's technology. Malons want the probe as the resources it collected are too valuable, and, as Jenway puts it, we've got a space race.
 
-#+attr_shortcode: "star-trek-voyager-extreme-risk.webp" "https://memory-alpha.fandom.com/wiki/Extreme_Risk_(episode)"
-#+begin_img-c
+
+#+attr_shortcode: :file voy5x03.webp
+#+attr_shortcode: :class centered
+#+attr_shortcode: :source https://voy.trekcore.com/gallery/thumbnails.php?album=13
+#+begin_image
 Contemplating suicde?
-#+end_img-c
+#+end_image
 
 In second story arch, we've got B'Elanna putting herself at risk by going into extremely dangerous Holodeck simulations with safety protocols off. Doctor learns about multiple injuries and diagnoses her with clinical depression. Jenway puts her off the Delta Flyer project, and subsequently, Chakotay approaches her. She reveals she stopped feeling anything - not about her job, future, Paris, or the massacre of Maquis by Cardassians and Dominion. Only putting herself at risk of death allows her to have any feelings.
 
@@ -201,30 +209,40 @@ Meanwhile, Delta Flyer is completed, and Torrens volunteers to join its crew. Th
 
 Look at how much FX this bad boy can handle! Every few scenes, we get some new CGI. Either the technology caught up to the writer's ambitions, or someone threw a lot more money at them.
 
-#+attr_shortcode: "star-trek-voyager-extreme-risk-2.webp" "https://www.tor.com/2021/01/25/star-trek-voyager-rewatch-extreme-risk/"
-#+begin_img-c
+#+attr_shortcode: :file voy5x03b.webp
+#+attr_shortcode: :class centered
+#+attr_shortcode: :source https://www.tor.com/2021/01/25/star-trek-voyager-rewatch-extreme-risk/
+#+begin_image
 Look at that scan!
-#+end_img-c
+#+end_image
 
-#+attr_shortcode: "star-trek-voyager-extreme-risk-3.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=133"
-#+begin_img-c
+#+attr_shortcode: :file voy5x03c.jpg
+#+attr_shortcode: :class centered
+#+attr_shortcode: :source https://voy.trekcore.com/gallery/thumbnails.php?album=133
+#+begin_image
 Look at this vessel!
-#+end_img-c
+#+end_image
 
-#+attr_shortcode: "star-trek-voyager-extreme-risk-4.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=133"
-#+begin_img-c
+#+attr_shortcode: :file voy5x03d.jpg
+#+attr_shortcode: :class centered
+#+attr_shortcode: :source https://voy.trekcore.com/gallery/thumbnails.php?album=133
+#+begin_image
 Look!
-#+end_img-c
+#+end_image
 
-#+attr_shortcode: "star-trek-voyager-extreme-risk-5.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=133"
-#+begin_img-c
+#+attr_shortcode: :file voy5x03d.jpg
+#+attr_shortcode: :class centered
+#+attr_shortcode: :source https://voy.trekcore.com/gallery/thumbnails.php?album=133
+#+begin_image
 Just look at this. Stunning!
-#+end_img-c
+#+end_image
 
-#+attr_shortcode: "star-trek-voyager-extreme-risk-6.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=133"
-#+begin_img-c
+#+attr_shortcode: :file voy5x03e.jpg
+#+attr_shortcode: :class centered
+#+attr_shortcode: :source https://voy.trekcore.com/gallery/thumbnails.php?album=133
+#+begin_image
 Kara Thrace, is that you?
-#+end_img-c
+#+end_image
 
 I'd say it's just a step below what Marvel movies look like these days.
 
@@ -250,10 +268,12 @@ CLOSED: [2023-05-23 Wed 23:00]
 The crew encounters what appears to be Earth's Starfleet Acadamy. It's inhabited by people who should be present, including the groundskeeper Boothby[^boothby]. After an investigation (and seduction) conducted by Chakotay, it is revealed that it's a training replica of the site - one of many training grounds for Species 8472.
 [^boothby]: Played again by excellent Ray Walston.
 
-#+attr_shortcode: "star-trek-voyager-in-the-flesh.webp" "https://www.tor.com/2021/01/28/star-trek-voyager-rewatch-in-the-flesh/"
-#+begin_img-c
+#+attr_shortcode: :file voy5x04a.webp
+#+attr_shortcode: :class centered
+#+attr_shortcode: :source https://www.tor.com/2021/01/28/star-trek-voyager-rewatch-in-the-flesh/ 
+#+begin_image
 Familiar face.
-#+end_img-c
+#+end_image
 
 Both sides agree on a truce and negotiations. Its conclusion is a trade of information - Voyager gives their knowledge about Borg nanoprobes and, in exchange, receives information about  Species 8472 genetic modifications.
 
@@ -303,7 +323,6 @@ CLOSED: [2023-05-31 Wed 23:00]
 :PROPERTIES:
 :EXPORT_FILE_NAME: 05x06-timeless
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :abstract my opinion on Star Trek Voyager 05x06. A good time travel episode.
-:EXPORT_HUGO_CUSTOM_FRONT_MATTER+:  :menu_item_override  6
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :episode_id 5x06
 :END:
 
@@ -315,10 +334,12 @@ Fifteen years later, they manage to return to Delta Quadrant and find a way to c
 
 Woohoo, episode 100! And what an episode it was! It's clear that the creators were saving money for this episode. The first scene is probably the best CGI in Star Trek on TV up to this moment.
 
-#+attr_shortcode: "star-trek-voyager-timeless.webp" "https://the-avocado.org/2021/06/03/you-talking-trek-to-me-very-best-of-voyager-timeless/"
-#+begin_img-c
+#+attr_shortcode: :file voy5x06a.webp
+#+attr_shortcode: :class centered
+#+attr_shortcode: :source https://the-avocado.org/2021/06/03/you-talking-trek-to-me-very-best-of-voyager-timeless/
+#+begin_image
 Voyager down
-#+end_img-c
+#+end_image
 
 The story is straightforward. We've got a mission to save Voyager - but this time, we bypass the most significant problems of this series. We know that no matter how great the plan is, it will fail. The crew won't return to Earth before the last episodes of the final season. If the story focused on the test, it would not work as well as it does. Yes, we know that Chakotay and Kim will succeed, but with the twist that we see a different version of the characters we are used to know. They are scared and angry, which is especially shocking when it comes to Kim, who is often the nice guy in the room. Unfortunately, the most emotional moment is downplayed by soap opera-level overacting and screaming at each other.
 
@@ -328,10 +349,12 @@ One episode I was reminded of was "The Visitor" from Deep Space 9. Unfortunately
 
 Still, we see a druken Seven, which was unexpected. Also we see removal of her eye, but in a better taste than whatver happened in Picard.
 
-#+attr_shortcode: "star-trek-voyager-timeless-2.jpg" "https://the-avocado.org/2021/06/03/you-talking-trek-to-me-very-best-of-voyager-timeless/"
-#+begin_img-c
+#+attr_shortcode: :file voy5x06b.jpg
+#+attr_shortcode: :class centered
+#+attr_shortcode: :source https://the-avocado.org/2021/06/03/you-talking-trek-to-me-very-best-of-voyager-timeless/
+#+begin_image
 It's also much more mechanical than in Picard
-#+end_img-c
+#+end_image
 
 **** Doctor's factor
 
@@ -361,25 +384,34 @@ The ship is much darker than Enterprise was, but it's still not pitch black.
 It's atmospheric, without being overly grim.
 Season 5 had to receive a significant funding upgrade.
 
-#+attr_shortcode: "star-trek-voyager-infinite-regress-1.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=140"
-#+begin_img-c
+
+#+attr_shortcode: :file star-trek-voyager-infinite-regress-1.jpg
+#+attr_shortcode: :class centered
+#+attr_shortcode: :source https://voy.trekcore.com/gallery/thumbnails.php?album=140
+#+begin_image
 Look at this corridor!
-#+end_img-c
+#+end_image
 
-#+attr_shortcode: "star-trek-voyager-infinite-regress-2.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=140&page=3"
-#+begin_img-c
+#+attr_shortcode: :file star-trek-voyager-infinite-regress-2.jpg
+#+attr_shortcode: :class centered
+#+attr_shortcode: :source https://voy.trekcore.com/gallery/thumbnails.php?album=140&page=3
+#+begin_image
 And this corridor!
-#+end_img-c
+#+end_image
 
-#+attr_shortcode: "star-trek-voyager-infinite-regress-3.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=140&page=5"
-#+begin_img-c
+#+attr_shortcode: :file star-trek-voyager-infinite-regress-3.jpg
+#+attr_shortcode: :class centered
+#+attr_shortcode: :source https://voy.trekcore.com/gallery/thumbnails.php?album=140&page=5
+#+begin_image
 And this engineering room!
-#+end_img-c
+#+end_image
 
-#+attr_shortcode: "star-trek-voyager-infinite-regress-4.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=140&page=5"
-#+begin_img-c
+#+attr_shortcode: :file star-trek-voyager-infinite-regress-4.jpg
+#+attr_shortcode: :class centered
+#+attr_shortcode: :source https://voy.trekcore.com/gallery/thumbnails.php?album=140&page=5
+#+begin_image
 And this corridor in this artsy-fartsy angle
-#+end_img-c
+#+end_image
 
 I've also noticed how consistent the design of aliens is.
 They mostly limit the FX to adding something on the face, but they do it an away that makes it believable.
@@ -453,24 +485,35 @@ The team created a nice animatronic alien and a CGI version.
 We've all seen Babylon 5 and know that the tech was not ready for computer graphics.
 They tried and did what they could.
 
-#+attr_shortcode: "star-trek-voyager-nothing-human-2.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=142&page=3"
-#+begin_img-c
+#+attr_shortcode: :file star-trek-voyager-nothing-human-1.jpg
+#+attr_shortcode: :class centered
+#+attr_shortcode: :source https://voy.trekcore.com/gallery/thumbnails.php?album=142&page=3
+#+begin_image
 Animatronic greatness
-#+end_img-c
+#+end_image
 
-#+attr_shortcode: "star-trek-voyager-nothing-human-3.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=142&page=3"
-#+begin_img-c
+#+attr_shortcode: :file star-trek-voyager-nothing-human-3.jpg
+#+attr_shortcode: :class centered
+#+attr_shortcode: :source https://voy.trekcore.com/gallery/thumbnails.php?album=142&page=3
+#+begin_image
 CGI definitely not greatness
-#+end_img-c
+#+end_image
+
 
 **** Doctor Factor
 Wooohoooo! 
 Finally, a rare Doctor-focused episode, and they nailed it.
 
-#+attr_shortcode: "star-trek-voyager-nothing-human-1.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=142"
-#+begin_img-c
+
+#+attr_shortcode: :file star-trek-voyager-nothing-human-1.jpg
+#+attr_shortcode: :alt ""
+#+attr_shortcode: :class centered
+#+attr_shortcode: :source https://voy.trekcore.com/gallery/thumbnails.php?album=142
+#+begin_image
 The in-between-names doctor in full glory
-#+end_img-c
+#+end_image
+
+
 *** DONE Star Trek: Voyager 05x09 - Thirty Days        :@update:@st_update:
 CLOSED: [2023-12-22 Fri 23:19]
 :PROPERTIES:
@@ -485,7 +528,7 @@ The entire episode is a retelling of the story of how he got there.
 
 In a series of flashbacks we learn about on ocean planet on the brink of doom and of Paris, who yet again disobeys orders to follow his call of ethics.
 
-**** Impressions
+**** COMMENT Impressions
 
 Paris should have been a much more interesting character.
 He is to be the cool guy in the crew[^kim].
@@ -503,10 +546,12 @@ There has to be some nostalgia (even misplaced) to like this sort of things.
 And yes, I am watching a 30-year-old show, thank you for noticing.
 [^twilight]: except for few episodes of Twilight Zone. I will *need* to return here, as they were amazing
 
-#+attr_shortcode: "star-trek-voyager-thirty-days-1.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=177&page=3"
-#+begin_img-c
+#+attr_shortcode: :file star-trek-voyager-thirty-days-1.jpg
+#+attr_shortcode: :class centered
+#+attr_shortcode: :source https://voy.trekcore.com/gallery/thumbnails.php?album=177&page=3
+#+begin_image
 Complete with black and white filter
-#+end_img-c
+#+end_image
 
 I also found Paris dressed up as a sea captain a but goofy.
 
@@ -528,10 +573,13 @@ This is not a must-see episode, but what is, is one of those where you start val
 Paris is cool, end of story.
 
 And, once again, the CGI is breathtaking.
-#+attr_shortcode: "star-trek-voyager-thirty-days-2.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=177&page=3"
-#+begin_img-c
+
+#+attr_shortcode: :file star-trek-voyager-thirty-days-2.jpg
+#+attr_shortcode: :class centered
+#+attr_shortcode: :source https://voy.trekcore.com/gallery/thumbnails.php?album=177&page=3
+#+begin_image
 We deserve more underwater SciFi shows.
-#+end_img-c
+#+end_image
 
 **** Doctor factor
 
@@ -542,7 +590,6 @@ CLOSED: [2024-03-08 Fri 22:07]
 :PROPERTIES:
 :EXPORT_FILE_NAME: 05x11-latent-image
 :EXP+: :abstract A great Doctor episode!
-:EXPORT_HUGO_PAIRED_SHORTCODES: img-c
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+:  :menu_item_override  11
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :episode_id 5x11
 :END:
@@ -578,11 +625,15 @@ And Mulligan's performance is perfect.
 We have a scene where Doctor confronts her. In a span of few seconds, se moves from goofy and having fun with the crew to martial tribunal level of seriousness.
 This is not the first time she does it, but everyone I am floored.
 
-#+attr_shortcode: "star-trek-voyager-latent-image-1.jpg" "https://www.paramountplus.com/shows/video/A_IC0KJPUnyl6XGYILsz17io5kee4P2H/"
-#+begin_img-c
+#+attr_shortcode: :file star-trek-voyager-latent-image-1.jpg
+#+attr_shortcode: :class centered
+#+attr_shortcode: :source https://www.paramountplus.com/shows/video/A_IC0KJPUnyl6XGYILsz17io5kee4P2H/
+#+begin_image
 There's more and more of Naomi.
 I can't wait to see what the show has planned for her!
-#+end_img-c
+#+end_image
+
+
 **** Doctor factor
 
 Happiness of the highest order.
@@ -601,7 +652,6 @@ CLOSED: [2024-03-13 Wed 16:06]
 :PROPERTIES:
 :EXPORT_FILE_NAME: 05x12-bride-of-chaotica
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :abstract A fun Capitan Proton episode
-:EXPORT_HUGO_PAIRED_SHORTCODES: img-c
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+:  :menu_item_override  12
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :episode_id 5x12
 :END:
@@ -624,11 +674,14 @@ I'd have much more fun if I was invested in Proton.
 
 Now, if it was Star Trek that was referenced with such respect in some modern show, I'd be all over it.
 
-#+attr_shortcode: "star-trek-voyager-bride-of-chaotica.jpg" "https://www.imdb.com/title/tt0708860/"
-#+begin_img-c
+#+attr_shortcode: :file star-trek-voyager-bride-of-chaotica.jpg
+#+attr_shortcode: :class centered
+#+attr_shortcode: :source https://www.imdb.com/title/tt0708860/
+#+begin_image
 Though those episodes look simply stunning.
 Here: Jenway in the best aspect format (4:3).
-#+end_img-c
+
+#+end_image
 
 **** Doctor Factor
 Yeah, he was here.
@@ -639,7 +692,6 @@ CLOSED: [2024-03-16 Sat 10:06]
 :PROPERTIES:
 :EXPORT_FILE_NAME: 05x13-gravity
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :abstract A *great* Tuvok episode
-:EXPORT_HUGO_PAIRED_SHORTCODES: img-c
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+:  :menu_item_override  13
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :episode_id 5x13
 :END:
@@ -679,10 +731,12 @@ It also allowed us to learn about her as a person - it's only one episode, but w
 
 All in all: highly recommended!
 
-#+attr_shortcode: "star-trek-voyager-gravity.jpg" "https://www.amazon.com/Petty-Voyager-Original-Autographed-Photo/dp/B00TLA0596"
-#+begin_img-c
+#+attr_shortcode: :file star-trek-voyager-gravity.jpg
+#+attr_shortcode: :class centered
+#+attr_shortcode: :source https://www.amazon.com/Petty-Voyager-Original-Autographed-Photo/dp/B00TLA0596
+#+begin_image
 Tasty space spider!
-#+end_img-c
+#+end_image
 
 [fn:spock] I haven't seen too much of TOS, so I can't compare him to mr. Spock.
 [fn:only] I fully accept the ban on mind-melt that is sure to follow this sentence
@@ -692,7 +746,6 @@ CLOSED: [2024-03-17 Sun 21:36]
 :PROPERTIES:
 :EXPORT_FILE_NAME: 05x14-bliss
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :abstract A monster a week type of trek
-:EXPORT_HUGO_PAIRED_SHORTCODES: img-c
 :export_hugo_custom_front_matter+: :menu_item_override 14
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :episode_id 5x14
 :END:
@@ -709,10 +762,12 @@ Nothing out of the ordinary - just a problem in outer space.
 This is very much ok.
 The basic premise - great; crew on happy pills - perfect; Seven out to get to the bottom of it - ideal; Naomi - still cool.
 
-#+attr_shortcode: "star-trek-bliss.jpg" "https://www.youtube.com/watch?v=YJ2DRFP44K4"
-#+begin_img-c
+#+attr_shortcode: :file star-trek-bliss.jpg
+#+attr_shortcode: :class centered
+#+attr_shortcode: :source https://www.youtube.com/watch?v=YJ2DRFP44K4
+#+begin_image
 The creature in all of its glory
-#+end_img-c
+#+end_image
 
 The most memorable part of this episode was the reaction of Quatai upon meeting Voyager.
 After countless lies and deceptions by the creature, he can no longer accept that a good thing can happen.
@@ -736,7 +791,6 @@ CLOSED: [2024-03-22 Fri 22:45]
 :PROPERTIES:
 :EXPORT_FILE_NAME: 05x15-15-dark-frontier
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :abstract A Borg themed two-parter
-:EXPORT_HUGO_PAIRED_SHORTCODES: img-c
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+:  :menu_item_override 15&16
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :episode_id 5x15/16
 :END:
@@ -746,7 +800,7 @@ During the heist, Seven meets the new Borg Queen who has huge interest in her.
 
 We're also witness of Sevens memories from just before being assimilated by the Collective.
 
-**** Impressions
+**** COMMENT Impressions
 
 Oh, a two-parter!
 Of course, it's about the Borg.
@@ -787,36 +841,49 @@ I always wondered how they store all this private info without prying eyes.
 The answer: protocol.
 Oh! you crazy space-commies!
 
-#+attr_shortcode: "star-trek-voyager-dark-frontier-01.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=96"
-#+begin_img-c
+
+#+attr_shortcode: :file star-trek-voyager-dark-frontier-01.jpg
+#+attr_shortcode: :class centered
+#+attr_shortcode: :source https://voy.trekcore.com/gallery/thumbnails.php?album=96
+#+begin_image
 Borg ships always gives me a sense of claustrophobia.
 Games with Borg ignored how small the living space is there.
-#+end_img-c
+#+end_image
 
-#+attr_shortcode: "star-trek-voyager-dark-frontier-02.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=96"
-#+begin_img-c
+#+attr_shortcode: :file star-trek-voyager-dark-frontier-02.jpg
+#+attr_shortcode: :class centered
+#+attr_shortcode: :source https://voy.trekcore.com/gallery/thumbnails.php?album=96
+#+begin_image
 The Death Star makes a guest appearance
-#+end_img-c
+#+end_image
 
-#+attr_shortcode: "star-trek-voyager-dark-frontier-03.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=96"
-#+begin_img-c
+#+attr_shortcode: :file star-trek-voyager-dark-frontier-03.jpg
+#+attr_shortcode: :class centered
+#+attr_shortcode: :source https://voy.trekcore.com/gallery/thumbnails.php?album=96
+#+begin_image
 Chibi-Seven
-#+end_img-c
+#+end_image
 
-#+attr_shortcode: "star-trek-voyager-dark-frontier-04.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=96"
-#+begin_img-c
+#+attr_shortcode: :file star-trek-voyager-dark-frontier-04.jpg
+#+attr_shortcode: :class centered
+#+attr_shortcode: :source https://voy.trekcore.com/gallery/thumbnails.php?album=96
+#+begin_image
 I am often amazed by the quality of special effects on display here.
-#+end_img-c
+#+end_image
 
-#+attr_shortcode: "star-trek-voyager-dark-frontier-05.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=96"
-#+begin_img-c
+#+attr_shortcode: :file star-trek-voyager-dark-frontier-05.jpg
+#+attr_shortcode: :class centered
+#+attr_shortcode: :source https://voy.trekcore.com/gallery/thumbnails.php?album=96
+#+begin_image
 Borg Queen doing her best Alex Murphy impression.
-#+end_img-c
+#+end_image
 
-#+attr_shortcode: "star-trek-voyager-dark-frontier-06.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=96"
-#+begin_img-c
+#+attr_shortcode: :file star-trek-voyager-dark-frontier-06.jpg
+#+attr_shortcode: :class centered
+#+attr_shortcode: :source https://voy.trekcore.com/gallery/thumbnails.php?album=96
+#+begin_image
 Say what you will, Queen looks better here than she looked like in Picard.
-#+end_img-c
+#+end_image
 
 #+begin_quote
 Seven: I will resist
@@ -824,7 +891,7 @@ Seven: I will resist
 Queen: I know
 #+end_quote
 
- Factor
+**** Doctor  Factor
 
 The episode is so good, that I don't care that we deserve more of The Doctor.
 
@@ -833,7 +900,6 @@ CLOSED: [2024-03-22 Fri 23:27]
 :PROPERTIES:
 :EXPORT_FILE_NAME: 05x16-the-disease
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :abstract Space STD and rebelion?
-:EXPORT_HUGO_PAIRED_SHORTCODES: img-c
 :export_hugo_custom_front_matter+: :menu_item_override 17
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :episode_id 5x17
 :END:
@@ -868,10 +934,13 @@ If those were two separate episodes - one completely of the wall, one serious an
 Both stories deserve so much more.
 I left unsatisfied.
 
-#+attr_shortcode: "star-trek-voyager-the-disese.webp" "https://them0vieblog.com/2017/08/30/star-trek-voyager-the-disease-review/"
-#+begin_img-c
+#+attr_shortcode: :file star-trek-voyager-the-disese.webp
+#+attr_shortcode: :class centered
+#+attr_shortcode: :source https://them0vieblog.com/2017/08/30/star-trek-voyager-the-disease-review/
+#+begin_image
 Varro's ship.
-#+end_img-c
+#+end_image
+
 **** Doctor Factor
 
 Present, but just as unsatisfying as the entire episode.
@@ -880,7 +949,6 @@ CLOSED: [2024-04-03 Wed 21:14]
 :PROPERTIES:
 :EXPORT_FILE_NAME: 05x18-course-oblivion
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :abstract One of the  best episodes I've seen
-:EXPORT_HUGO_PAIRED_SHORTCODES: img-c
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :menu_item_override 18
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :episode_id 5x18
 :END:
@@ -896,10 +964,13 @@ The entire crew are clones  born on the Demon planet.
 Soon, rest of the crew comes down with the same illness as B'Ellana.
 
 "Course: Oblivion" is a direct continuation of Demon (04x24[fn:before])
-#+attr_shortcode: "star-trek-voyager-course-oblivion-1.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=96"
-#+begin_img-c
+
+#+attr_shortcode: :file star-trek-voyager-course-oblivion-1.jpg
+#+attr_shortcode: :class centered
+#+attr_shortcode: :source https://voy.trekcore.com/gallery/thumbnails.php?album=96
+#+begin_image
 Look how happy they are. 
-#+end_img-c
+#+end_image
 
 **** Impressions
 
@@ -936,10 +1007,13 @@ It adds nothing to the main story, yet it is /essential/ to appreciate /Voyager/
 
 I think it's time to say it out loud: /Voyager/ is a better series than /The Next Generation/.
 It's more mature, less goofy and overall has amazing episode quality.
-#+attr_shortcode: "star-trek-voyager-course-oblivion-2.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=96"
-#+begin_img-c
+
+#+attr_shortcode: :file star-trek-voyager-course-oblivion-2.jpg
+#+attr_shortcode: :class centered
+#+attr_shortcode: :source https://voy.trekcore.com/gallery/thumbnails.php?album=96
+#+begin_image
 Look how sad they are.
-#+end_img-c
+#+end_image
 
 **** Doctor factor
 
@@ -952,7 +1026,6 @@ CLOSED: [2024-04-03 Wed 21:38]
 :PROPERTIES:
 :EXPORT_FILE_NAME: 05x19-fight
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :abstract Voyager, you are not Northern Exposure!
-:EXPORT_HUGO_PAIRED_SHORTCODES: img-c
 :export_hugo_custom_front_matter+: :menu_item_override 19
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :episode_id 5x19
 :END:
@@ -980,7 +1053,6 @@ CLOSED: [2024-04-08 Mon 19:30]
 :PROPERTIES:
 :EXPORT_FILE_NAME: 05x20-think-tank
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :abstract The episode about nothing
-:EXPORT_HUGO_PAIRED_SHORTCODES: img-c
 :export_hugo_custom_front_matter+: :menu_item_override 20
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :episode_id 5x20
 :END:
@@ -1019,15 +1091,19 @@ The way it plays out is, basically, /about nothing/.
 I'm getting a bit annoyed that it's either a doctor-centeric episode, or his involvement is unsatisfactory.
 This was not a doctor-centric episode.
 
-#+attr_shortcode: "star-trek-voyager-think-tank-1.jpg" "https://voy.trekcore.com/gallery/albums/screencaps/s5/520-think-tank/thinktank_004.jpg"
-#+begin_img-c
+#+attr_shortcode: :file star-trek-voyager-think-tank-1.jpg
+#+attr_shortcode: :class centered
+#+attr_shortcode: :source https://voy.trekcore.com/gallery/albums/screencaps/s5/520-think-tank/thinktank_004.jpg
+#+begin_image
 Disregarding obvious joke (Da Ba Dee), this looks phenomenal
-#+end_img-c
+#+end_image
 
-#+attr_shortcode: "star-trek-voyager-think-tank-2.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=96"
-#+begin_img-c
+#+attr_shortcode: :file star-trek-voyager-think-tank-2.jpg
+#+attr_shortcode: :class centered
+#+attr_shortcode: :source https://voy.trekcore.com/gallery/thumbnails.php?album=96
+#+begin_image
 He lives in a society!
-#+end_img-c
+#+end_image
 
 *** DONE Star Trek: Voyager 05x21 - Juggnaut	
 CLOSED: [2024-04-20 Sat 18:51]
@@ -1035,7 +1111,6 @@ CLOSED: [2024-04-20 Sat 18:51]
 :EXPORT_FILE_NAME: 05x21-juggernaut
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :abstract My mini review
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :aliases '(//star-trek/stv/05x21-juggernut/)
-:EXPORT_HUGO_PAIRED_SHORTCODES: img-c
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :menu_item_override "21"
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :episode_id 5x21
 :END:
@@ -1082,17 +1157,18 @@ It's there and it's enjoyable.
 
 Unsatisfactory, like most of the time.
 
-#+attr_shortcode: "star-trek-voyager-jaggernaut-001.jpg" "https://voy.trekcore.com/gallery/albums/screencaps/s5/521-juggernaut/juggernaut_134.jpg"
-#+begin_img-c
+#+attr_shortcode: :file star-trek-voyager-jaggernaut-001.jpg
+#+attr_shortcode: :class centered
+#+attr_shortcode: :source https://voy.trekcore.com/gallery/albums/screencaps/s5/521-juggernaut/juggernaut_134.jpg
+#+begin_image
 Most definitely not a Ferengi.
-#+end_img-c
+#+end_image
 
 *** DONE Star Trek: Voyager 05x22 - Someone to Watch Over Me	
 CLOSED: [2024-05-05 Sun 00:10]
 :PROPERTIES:
 :EXPORT_FILE_NAME: 05x22-someone-to-watch-over-me
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :abstract My mini review
-:EXPORT_HUGO_PAIRED_SHORTCODES: img-c
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :menu_item_override "22"
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :episode_id 5x22
 :END:
@@ -1134,18 +1210,18 @@ This may have been the best Doctor episode, even though he was not the primary f
 Not only is he hilarious, but this may be his biggest growth yet.
 My disappointment will be immeasurable if authors won't develop his love toward Seven deeper.
 
-#+attr_shortcode: "star-trek-voyager-someone-to-watch-over-me.jpg" "https://imdb.com"
-#+begin_img-c
+#+attr_shortcode: :file star-trek-voyager-someone-to-watch-over-me.jpg
+#+attr_shortcode: :class centered
+#+attr_shortcode: :source https://imdb.com
+#+begin_image
 Yes, Doctor and Seven dancing.
-#+end_img-c
-
+#+end_image
 
 *** DONE Star Trek: Voyager 05x23  - 11:59
 CLOSED: [2024-05-09 Thu 23:17]
 :PROPERTIES:
 :EXPORT_FILE_NAME: 05x23-11-59
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :abstract My mini review
-:EXPORT_HUGO_PAIRED_SHORTCODES: img-c
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :menu_item_override "23"
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :episode_id 5x23
 :END:
@@ -1181,10 +1257,12 @@ All glory to then!
 11:59 is a cute little episode.
 I enjoyed it immensely, even though in 3 years I'll have no memory of ever seeing it.
 
-#+attr_shortcode: "star-trek-voyager-11-59.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=151&page=4"
-#+begin_img-c
+#+attr_shortcode: :file star-trek-voyager-11-59.jpg
+#+attr_shortcode: :class centered
+#+attr_shortcode: :source https://voy.trekcore.com/gallery/thumbnails.php?album=151&page=4
+#+begin_image
 Books and books and books and books
-#+end_img-c
+#+end_image
 
 [fn:usmovies] I've been raised in the 90s, so I was subjected to USA's cultural propaganda and I still love it.
 Movies were simply better back then.
@@ -1195,7 +1273,6 @@ CLOSED: [2024-05-14 Tue 22:51]
 :PROPERTIES:
 :EXPORT_FILE_NAME: 05x24-relativity
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :abstract My mini review
-:EXPORT_HUGO_PAIRED_SHORTCODES: img-c
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :menu_item_override "24"
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :episode_id 5x24
 :END:
@@ -1234,17 +1311,18 @@ They can make darker ship that is not /black/, like they are in the new ST!
 
 Nope, I left unsatisfied.
 
-#+attr_shortcode: "star-trek-voyager-relativity.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=134&page=5"
-#+begin_img-c
+#+attr_shortcode: :file star-trek-voyager-relativity.jpg
+#+attr_shortcode: :class centered
+#+attr_shortcode: :source https://voy.trekcore.com/gallery/thumbnails.php?album=134&page=5
+#+begin_image
 Dark, but not modern-trek Dark.
-#+end_img-c
+#+end_image
 
 *** DONE Star Trek: Voyager 05x25 - Warhead
 CLOSED: [2024-05-14 Tue 23:02]
 :PROPERTIES:
 :EXPORT_FILE_NAME: 05x25-warhead
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :abstract My mini review
-:EXPORT_HUGO_PAIRED_SHORTCODES: img-c
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :menu_item_override "25"
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :episode_id 5x25
 :END:
@@ -1278,10 +1356,13 @@ It also asks similar questions: who we are? Why are we here? Can we change it?
 Great episode.
 I'd love more of such brilliant little stories.
 
-#+attr_shortcode: "star-trek-voyager-warhead.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=152&page=4"
-#+begin_img-c
+#+attr_shortcode: :file star-trek-voyager-warhead.jpg
+#+attr_shortcode: :class centered
+#+attr_shortcode: :source https://voy.trekcore.com/gallery/thumbnails.php?album=152&page=4
+#+begin_image
 Starts as a love story
-#+end_img-c
+#+end_image
+
 
 **** Picardo factor
 
@@ -1296,7 +1377,6 @@ CLOSED: [2024-05-19 Sun 18:10]
 :PROPERTIES:
 :EXPORT_FILE_NAME: 05x26-equinox-part-1
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :abstract My mini review
-:EXPORT_HUGO_PAIRED_SHORTCODES: img-c
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :menu_item_override "26"
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :episode_id 5x26
 :END:
@@ -1341,10 +1421,12 @@ The Trek is about what mankind /can/ be, not what it is.
 
 Meh.
 
-#+attr_shortcode: "star-trek-voyager-equinox.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=153"
-#+begin_img-c
+#+attr_shortcode: :file star-trek-voyager-equinox.jpg
+#+attr_shortcode: :class centered
+#+attr_shortcode: :source https://voy.trekcore.com/gallery/thumbnails.php?album=153
+#+begin_image
 Looks like Alien, plays like Man Behind The Sun.
-#+end_img-c
+#+end_image
 
 ** Season 6
 :PROPERTIES:
@@ -1357,6 +1439,7 @@ CLOSED: [2024-10-04 Fri 20:17]
 :EXPORT_FILE_NAME: 06x01-equinox-part-1
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :abstract My mini review
 :EXPORT_HUGO_CUSTOM_FRONT_MATTER+: :episode_id 6x01
+# 
 :END:
 
 The conclusion to [[/voy/05x26-equinox-part-1/][last season's cliffhanger.]]
diff --git a/content-org/unix-history.org b/content-org/unix-history.org
index 581ddbb..1625fbf 100644
--- a/content-org/unix-history.org
+++ b/content-org/unix-history.org
@@ -4,7 +4,7 @@
 
 #+HUGO_BASE_DIR: ~/ghq/michal.sapka.me/mms/site
 #+HUGO_WEIGHT: auto
-#+HUGO_SECTION: unix-history
+#+HUGO_SECTION: star-trek
 
 * UH                                                          :@unix_history:
 :PROPERTIES:
diff --git a/content/1 b/content/1
new file mode 100644
index 0000000..0721a0e
--- /dev/null
+++ b/content/1
@@ -0,0 +1,48 @@
++++
+title = "Cool Emacs"
+author = ["Michał Sapka"]
+date = 2024-06-15T21:52:00+02:00
+categories = ["emacs"]
+draft = false
+weight = 2001
+image_dir = "emacs"
+image_max_width = 480
+primary_menu = "emacs"
+shortname = "Cool usages of Emacs"
+[menu]
+  [menu.emacs]
+    weight = 2001
+    identifier = "cool-emacs"
+    post = "Emacs usage that is not text editing"
++++
+
+{{< image forced_width="350" class="right no-border" alt="An Emacs logo in cool glassess doing a skateboard flip" file="cool-macs.png" >}}
+noop
+{{< /image >}}
+
+> _Let me tell you: Emacs is not a text editor._
+>
+> -- Emerald McS., PhD
+
+Even though most of what Emacs is known for is _editing text_, it can do so much more.
+It's the most flexible application out there, so when you start to adjust the basics for yourself, you want to use it everywhere.
+Here, I will present _Emacs_ as a general purpose interface.
+
+
+## Cool ways to use Emacs {#cool-ways-to-use-emacs}
+
+{{< menu "cool-emacs-ways" >}}
+Dune
+{{< /menu >}}
+
+
+## Appendix {#appendix}
+
+{{< menu "cool-emacs-appendix" >}}
+Dune
+{{< /menu >}}
+
+
+## Coolmacs {#coolmacs}
+
+The mascot, Coolmacs, was drawn by [Drew](https://drewsh.com/).
diff --git a/content/star-trek/voy/05x01-night.md b/content/star-trek/voy/05x01-night.md
index f5fac72..a55b328 100644
--- a/content/star-trek/voy/05x01-night.md
+++ b/content/star-trek/voy/05x01-night.md
@@ -2,8 +2,11 @@
 title = "Star Trek: Voyager 05x01 - Night"
 author = ["Michał Sapka"]
 date = 2023-02-12T23:00:00+01:00
+categories = ["star-trek", "voyager"]
 draft = false
 weight = 3001
+image_dir = "star-trek"
+image_max_width = 575
 hasNavSection = "st-voy-episodes"
 abstract = "my opinion on star trek voyager 05x01 - night"
 episode_id = "5x01"
@@ -11,16 +14,16 @@ episode_id = "5x01"
   [menu.star-trek]
     weight = 3001
     identifier = "star-trek-voyager-05x01-night"
-    parent = "voy-r-s5"
+    parent = "voyA"
 +++
 
 ## Synopsis {#synopsis}
 
 The crew enters a void in the Delta Quadrant, an area without any stars of 2 light-years radius. The crew morale is very low as the vast emptiness gets to them. The episode starts in the Holodeck, and I was afraid this would be another Holodeck malfunctions story. However, when the ship loses power, the plot goes in a completely different direction - it turns out someone is living in the emptiness—a hostile creature. Soon after, the ship encounters another living form - a ship emitting large doses of radiation piloted by Emck, a Malon. The strange ship offers help with quick passing of the void on one condition - Jenway is to transport the creature to their ship.
 
-{{< img-c "star-trek-voyager-night.jpg" "http://www.myyearofstartrek.com/2015/10/voyager-re-watch-demon-one-hope-and.html" >}}
+{{< image source="http://www.myyearofstartrek.com/2015/10/voyager-re-watch-demon-one-hope-and.html" class="centered" file="voy5x01a.jpg" >}}
 Jenway, challenged
-{{< /img-c >}}
+{{< /image >}}
 
 Jenway being Jenway, declines and decides to first talk with the now-imprisoned alien. It informs her that they are a dying breed due to the poisoning of space by Emck. It is soon revealed that Emck's job is to drop toxic waste, a by-product of Malon industries. Jenway tries to give Voyager's technology to Emck, but he refuses, as clean energy would ruin his business. Jenwey then orders her crew to go into a vortex leading out of the void while she stays behind and destroys it so Malons can no longer dump their waste. The staff, however, goes to mutiny. Jenway agrees, and Voyager fires torpedoes as it enters the vortex. The episode ends with the crew seeing stars again.
 
diff --git a/content/star-trek/voy/05x02-drone.md b/content/star-trek/voy/05x02-drone.md
index 54f0d86..a64b35c 100644
--- a/content/star-trek/voy/05x02-drone.md
+++ b/content/star-trek/voy/05x02-drone.md
@@ -2,8 +2,11 @@
 title = "Star Trek: Voyager 05x02 - Drone"
 author = ["Michał Sapka"]
 date = 2023-02-22T23:00:00+01:00
+categories = ["star-trek", "voyager"]
 draft = false
 weight = 3002
+image_dir = "star-trek"
+image_max_width = 575
 hasNavSection = "st-voy-episodes"
 abstract = "my opinion on Star Trek Voyager 05x02 - Drone"
 menu_item_override = 2
@@ -12,16 +15,16 @@ episode_id = "5x02"
   [menu.star-trek]
     weight = 3002
     identifier = "star-trek-voyager-05x02-drone"
-    parent = "voy-r-s5"
+    parent = "voyA"
 +++
 
 A small team, including Seven of Nine and Doctor, is returning from a mission. Due to a transporter malfunction, Doctor's emitter starts failing. B'Elanna takes the emitter to the science lab for repairs. Soon it is revealed that during the malfunction, Seven of Nine and Doctor's patterns briefly merged. The emitter has gained some of her Borg nanoprobes and starts assimilating the ship's equipment.
 
 The crew discovers a borg maturation chamber with a rapidly growing Borg drone. This is the first time Seven sees something like this, as the Borg assimilate living beings and don't reproduce. Jenway has yet another moral dilemma - as Doctor's emitter is based on 29th-century tech, it would doom the galaxy if it fell in Borg's hands. But, on the other hand, the drone has not connected with the collective and may learn human customs and ways. She goes with the latter, and Seven is tasked with teaching the new drone. It all goes well until the drone accidentally connects with the collective.
 
-{{< img-c "star-trek-voyager-drone.jpg" "https://the-avocado.org/2021/05/27/you-talking-trek-to-me-best-of-voyager-drone/" >}}
+{{< image source="https://the-avocado.org/2021/05/27/you-talking-trek-to-me-best-of-voyager-drone/" class="centered" file="voy5x02a.jpg" >}}
 Borg round thingy
-{{< /img-c >}}
+{{< /image >}}
 
 Voyager faces the Borg. Drone decides to help mankind. It transports to the Borg ship, takes over control, and flies into a nearby nebula. The Borg ship is destroyed.
 
diff --git a/content/star-trek/voy/05x03-extreme-risk.md b/content/star-trek/voy/05x03-extreme-risk.md
index 147a379..7ef9d02 100644
--- a/content/star-trek/voy/05x03-extreme-risk.md
+++ b/content/star-trek/voy/05x03-extreme-risk.md
@@ -2,8 +2,11 @@
 title = "Star Trek: Voyager 05x03 - Extreme Risk"
 author = ["Michał Sapka"]
 date = 2023-02-28T23:00:00+01:00
+categories = ["star-trek", "voyager"]
 draft = false
 weight = 3003
+image_dir = "star-trek"
+image_max_width = 575
 hasNavSection = "st-voy-episodes"
 abstract = "my opinion on Star Trek Voyager 05x03 - Extreme Risk"
 menu_item_override = 3
@@ -12,16 +15,16 @@ episode_id = "5x03"
   [menu.star-trek]
     weight = 3003
     identifier = "star-trek-voyager-05x03-extreme-risk"
-    parent = "voy-r-s5"
+    parent = "voyA"
 +++
 
 ## Synopsis {#synopsis}
 
 Voyager's probe is launched at a gas giant, but Malons spot it and attempt to capture it. To prevent it, the crew sends the probe into the gas planet's atmosphere. Malon's ship follows the probe and is subsequently crashed. Paris presents a design for Delta Flyaer, a specialized shuttlecraft based on Starfleet's and Borg's technology. Malons want the probe as the resources it collected are too valuable, and, as Jenway puts it, we've got a space race.
 
-{{< img-c "star-trek-voyager-extreme-risk.webp" "https://memory-alpha.fandom.com/wiki/Extreme_Risk_(episode)" >}}
+{{< image source="https://voy.trekcore.com/gallery/thumbnails.php?album=13" class="centered" file="voy5x03.webp" >}}
 Contemplating suicde?
-{{< /img-c >}}
+{{< /image >}}
 
 In second story arch, we've got B'Elanna putting herself at risk by going into extremely dangerous Holodeck simulations with safety protocols off. Doctor learns about multiple injuries and diagnoses her with clinical depression. Jenway puts her off the Delta Flyer project, and subsequently, Chakotay approaches her. She reveals she stopped feeling anything - not about her job, future, Paris, or the massacre of Maquis by Cardassians and Dominion. Only putting herself at risk of death allows her to have any feelings.
 
@@ -32,25 +35,25 @@ Meanwhile, Delta Flyer is completed, and Torrens volunteers to join its crew. Th
 
 Look at how much FX this bad boy can handle! Every few scenes, we get some new CGI. Either the technology caught up to the writer's ambitions, or someone threw a lot more money at them.
 
-{{< img-c "star-trek-voyager-extreme-risk-2.webp" "https://www.tor.com/2021/01/25/star-trek-voyager-rewatch-extreme-risk/" >}}
+{{< image source="https://www.tor.com/2021/01/25/star-trek-voyager-rewatch-extreme-risk/" class="centered" file="voy5x03b.webp" >}}
 Look at that scan!
-{{< /img-c >}}
+{{< /image >}}
 
-{{< img-c "star-trek-voyager-extreme-risk-3.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=133" >}}
+{{< image source="https://voy.trekcore.com/gallery/thumbnails.php?album=133" class="centered" file="voy5x03c.jpg" >}}
 Look at this vessel!
-{{< /img-c >}}
+{{< /image >}}
 
-{{< img-c "star-trek-voyager-extreme-risk-4.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=133" >}}
+{{< image source="https://voy.trekcore.com/gallery/thumbnails.php?album=133" class="centered" file="voy5x03d.jpg" >}}
 Look!
-{{< /img-c >}}
+{{< /image >}}
 
-{{< img-c "star-trek-voyager-extreme-risk-5.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=133" >}}
+{{< image source="https://voy.trekcore.com/gallery/thumbnails.php?album=133" class="centered" file="voy5x03d.jpg" >}}
 Just look at this. Stunning!
-{{< /img-c >}}
+{{< /image >}}
 
-{{< img-c "star-trek-voyager-extreme-risk-6.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=133" >}}
+{{< image source="https://voy.trekcore.com/gallery/thumbnails.php?album=133" class="centered" file="voy5x03e.jpg" >}}
 Kara Thrace, is that you?
-{{< /img-c >}}
+{{< /image >}}
 
 I'd say it's just a step below what Marvel movies look like these days.
 
diff --git a/content/star-trek/voy/05x04-in-the-flesh.md b/content/star-trek/voy/05x04-in-the-flesh.md
index 2a69322..af7e3cb 100644
--- a/content/star-trek/voy/05x04-in-the-flesh.md
+++ b/content/star-trek/voy/05x04-in-the-flesh.md
@@ -2,8 +2,11 @@
 title = "Star Trek: Voyager 05x04 - In the Flesh"
 author = ["Michał Sapka"]
 date = 2023-05-23T23:00:00+02:00
+categories = ["star-trek", "voyager"]
 draft = false
 weight = 3004
+image_dir = "star-trek"
+image_max_width = 575
 hasNavSection = "st-voy-episodes"
 abstract = "my opinion on Star Trek Voyager 05x04 - In The Flesh"
 menu_item_override = 4
@@ -12,7 +15,7 @@ episode_id = "5x04"
   [menu.star-trek]
     weight = 3004
     identifier = "star-trek-voyager-05x04-in-the-flesh"
-    parent = "voy-r-s5"
+    parent = "voyA"
 +++
 
 ## Summary {#summary}
@@ -20,9 +23,9 @@ episode_id = "5x04"
 The crew encounters what appears to be Earth's Starfleet Acadamy. It's inhabited by people who should be present, including the groundskeeper Boothby[^boothby]. After an investigation (and seduction) conducted by Chakotay, it is revealed that it's a training replica of the site - one of many training grounds for Species 8472.
 [^boothby]: Played again by excellent Ray Walston.
 
-{{< img-c "star-trek-voyager-in-the-flesh.webp" "https://www.tor.com/2021/01/28/star-trek-voyager-rewatch-in-the-flesh/" >}}
+{{< image source="https://www.tor.com/2021/01/28/star-trek-voyager-rewatch-in-the-flesh/" class="centered" file="voy5x04a.webp" >}}
 Familiar face.
-{{< /img-c >}}
+{{< /image >}}
 
 Both sides agree on a truce and negotiations. Its conclusion is a trade of information - Voyager gives their knowledge about Borg nanoprobes and, in exchange, receives information about  Species 8472 genetic modifications.
 
diff --git a/content/star-trek/voy/05x05-once-upon-a-time.md b/content/star-trek/voy/05x05-once-upon-a-time.md
index 6fd792b..578e1e7 100644
--- a/content/star-trek/voy/05x05-once-upon-a-time.md
+++ b/content/star-trek/voy/05x05-once-upon-a-time.md
@@ -2,8 +2,11 @@
 title = "Star Trek: Voyager 05x05 - Once Upon a Time"
 author = ["Michał Sapka"]
 date = 2023-05-25T23:00:00+02:00
+categories = ["star-trek", "voyager"]
 draft = false
 weight = 3005
+image_dir = "star-trek"
+image_max_width = 575
 hasNavSection = "st-voy-episodes"
 abstract = "my opinion on Star Trek Voyager 05x05 - Once Upon a Time. Worst episode yet?"
 menu_item_override = 5
diff --git a/content/star-trek/voy/05x06-timeless.md b/content/star-trek/voy/05x06-timeless.md
index 285e94c..022b105 100644
--- a/content/star-trek/voy/05x06-timeless.md
+++ b/content/star-trek/voy/05x06-timeless.md
@@ -2,17 +2,19 @@
 title = "Star Trek: Voyager 05x06 - Timeless"
 author = ["Michał Sapka"]
 date = 2023-05-31T23:00:00+02:00
+categories = ["star-trek", "voyager"]
 draft = false
 weight = 3006
+image_dir = "star-trek"
+image_max_width = 575
 hasNavSection = "st-voy-episodes"
 abstract = "my opinion on Star Trek Voyager 05x06. A good time travel episode."
-menu_item_override = 6
 episode_id = "5x06"
 [menu]
   [menu.star-trek]
     weight = 3006
     identifier = "star-trek-voyager-05x06-timeless"
-    parent = "voy-r-s5"
+    parent = "voyA"
 +++
 
 Due to Kim's calculation error, the Voyager crashes on a frozen planet, killing the entire crew. Only Chakotay and Kim, who were not on the ship during the incident, survived. Somehow they manage to reach Earth but are hunted by the memory of being the cause of death of the entire crew.
@@ -24,9 +26,9 @@ Fifteen years later, they manage to return to Delta Quadrant and find a way to c
 
 Woohoo, episode 100! And what an episode it was! It's clear that the creators were saving money for this episode. The first scene is probably the best CGI in Star Trek on TV up to this moment.
 
-{{< img-c "star-trek-voyager-timeless.webp" "https://the-avocado.org/2021/06/03/you-talking-trek-to-me-very-best-of-voyager-timeless/" >}}
+{{< image source="https://the-avocado.org/2021/06/03/you-talking-trek-to-me-very-best-of-voyager-timeless/" class="centered" file="voy5x06a.webp" >}}
 Voyager down
-{{< /img-c >}}
+{{< /image >}}
 
 The story is straightforward. We've got a mission to save Voyager - but this time, we bypass the most significant problems of this series. We know that no matter how great the plan is, it will fail. The crew won't return to Earth before the last episodes of the final season. If the story focused on the test, it would not work as well as it does. Yes, we know that Chakotay and Kim will succeed, but with the twist that we see a different version of the characters we are used to know. They are scared and angry, which is especially shocking when it comes to Kim, who is often the nice guy in the room. Unfortunately, the most emotional moment is downplayed by soap opera-level overacting and screaming at each other.
 
@@ -36,9 +38,9 @@ One episode I was reminded of was "The Visitor" from Deep Space 9. Unfortunately
 
 Still, we see a druken Seven, which was unexpected. Also we see removal of her eye, but in a better taste than whatver happened in Picard.
 
-{{< img-c "star-trek-voyager-timeless-2.jpg" "https://the-avocado.org/2021/06/03/you-talking-trek-to-me-very-best-of-voyager-timeless/" >}}
+{{< image source="https://the-avocado.org/2021/06/03/you-talking-trek-to-me-very-best-of-voyager-timeless/" class="centered" file="voy5x06b.jpg" >}}
 It's also much more mechanical than in Picard
-{{< /img-c >}}
+{{< /image >}}
 
 
 ## Doctor's factor {#doctor-s-factor}
diff --git a/content/star-trek/voy/05x07-infinite-regress.md b/content/star-trek/voy/05x07-infinite-regress.md
index 2b7fd76..8182f17 100644
--- a/content/star-trek/voy/05x07-infinite-regress.md
+++ b/content/star-trek/voy/05x07-infinite-regress.md
@@ -2,9 +2,11 @@
 title = "Star Trek: Voyager 05x07 - Infinite Regress"
 author = ["Michał Sapka"]
 date = 2023-12-02T23:00:00+01:00
-categories = ["update", "st-update"]
+categories = ["star-trek", "voyager", "update", "st-update"]
 draft = false
 weight = 3007
+image_dir = "star-trek"
+image_max_width = 575
 hasNavSection = "st-voy-episodes"
 abstract = "a shining Seven episode"
 menu_item_override = 7
@@ -13,7 +15,7 @@ episode_id = "5x07"
   [menu.star-trek]
     weight = 3007
     identifier = "star-trek-voyager-05x07-infinite-regress"
-    parent = "voy-r-s5"
+    parent = "voyA"
 +++
 
 Another simple episode.
@@ -32,21 +34,21 @@ The ship is much darker than Enterprise was, but it's still not pitch black.
 It's atmospheric, without being overly grim.
 Season 5 had to receive a significant funding upgrade.
 
-{{< img-c "star-trek-voyager-infinite-regress-1.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=140" >}}
+{{< image source="https://voy.trekcore.com/gallery/thumbnails.php?album=140" class="centered" file="star-trek-voyager-infinite-regress-1.jpg" >}}
 Look at this corridor!
-{{< /img-c >}}
+{{< /image >}}
 
-{{< img-c "star-trek-voyager-infinite-regress-2.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=140&page=3" >}}
+{{< image source="https://voy.trekcore.com/gallery/thumbnails.php?album=140&amp;page=3" class="centered" file="star-trek-voyager-infinite-regress-2.jpg" >}}
 And this corridor!
-{{< /img-c >}}
+{{< /image >}}
 
-{{< img-c "star-trek-voyager-infinite-regress-3.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=140&page=5" >}}
+{{< image source="https://voy.trekcore.com/gallery/thumbnails.php?album=140&amp;page=5" class="centered" file="star-trek-voyager-infinite-regress-3.jpg" >}}
 And this engineering room!
-{{< /img-c >}}
+{{< /image >}}
 
-{{< img-c "star-trek-voyager-infinite-regress-4.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=140&page=5" >}}
+{{< image source="https://voy.trekcore.com/gallery/thumbnails.php?album=140&amp;page=5" class="centered" file="star-trek-voyager-infinite-regress-4.jpg" >}}
 And this corridor in this artsy-fartsy angle
-{{< /img-c >}}
+{{< /image >}}
 
 I've also noticed how consistent the design of aliens is.
 They mostly limit the FX to adding something on the face, but they do it an away that makes it believable.
diff --git a/content/star-trek/voy/05x08-nothing-human.md b/content/star-trek/voy/05x08-nothing-human.md
index 29b4656..983b620 100644
--- a/content/star-trek/voy/05x08-nothing-human.md
+++ b/content/star-trek/voy/05x08-nothing-human.md
@@ -2,9 +2,11 @@
 title = "Star Trek: Voyager 05x08 - Nothing Human"
 author = ["Michał Sapka"]
 date = 2023-12-06T23:00:00+01:00
-categories = ["update", "st-update"]
+categories = ["star-trek", "voyager", "update", "st-update"]
 draft = false
 weight = 3008
+image_dir = "star-trek"
+image_max_width = 575
 hasNavSection = "st-voy-episodes"
 abstract = "what an episode!"
 menu_item_override = 8
@@ -13,7 +15,7 @@ episode_id = "5x08"
   [menu.star-trek]
     weight = 3008
     identifier = "star-trek-voyager-05x08-nothing-human"
-    parent = "voy-r-s5"
+    parent = "voyA"
 +++
 
 B'Elanna is attacked by a non-humanoid alien creature and her life is danger.
@@ -53,13 +55,13 @@ The team created a nice animatronic alien and a CGI version.
 We've all seen Babylon 5 and know that the tech was not ready for computer graphics.
 They tried and did what they could.
 
-{{< img-c "star-trek-voyager-nothing-human-2.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=142&page=3" >}}
+{{< image source="https://voy.trekcore.com/gallery/thumbnails.php?album=142&amp;page=3" class="centered" file="star-trek-voyager-nothing-human-1.jpg" >}}
 Animatronic greatness
-{{< /img-c >}}
+{{< /image >}}
 
-{{< img-c "star-trek-voyager-nothing-human-3.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=142&page=3" >}}
+{{< image source="https://voy.trekcore.com/gallery/thumbnails.php?album=142&amp;page=3" class="centered" file="star-trek-voyager-nothing-human-3.jpg" >}}
 CGI definitely not greatness
-{{< /img-c >}}
+{{< /image >}}
 
 
 ## Doctor Factor {#doctor-factor}
@@ -67,6 +69,6 @@ CGI definitely not greatness
 Wooohoooo!
 Finally, a rare Doctor-focused episode, and they nailed it.
 
-{{< img-c "star-trek-voyager-nothing-human-1.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=142" >}}
+{{< image source="https://voy.trekcore.com/gallery/thumbnails.php?album=142" class="centered" alt="" file="star-trek-voyager-nothing-human-1.jpg" >}}
 The in-between-names doctor in full glory
-{{< /img-c >}}
+{{< /image >}}
diff --git a/content/star-trek/voy/05x09-thirty-days.md b/content/star-trek/voy/05x09-thirty-days.md
index 8b7318d..aa947a5 100644
--- a/content/star-trek/voy/05x09-thirty-days.md
+++ b/content/star-trek/voy/05x09-thirty-days.md
@@ -2,9 +2,11 @@
 title = "Star Trek: Voyager 05x09 - Thirty Days"
 author = ["Michał Sapka"]
 date = 2023-12-22T23:19:00+01:00
-categories = ["update", "st-update"]
+categories = ["star-trek", "voyager", "update", "st-update"]
 draft = false
 weight = 3009
+image_dir = "star-trek"
+image_max_width = 575
 hasNavSection = "st-voy-episodes"
 abstract = "A good Paris episode"
 menu_item_override = 9
@@ -13,7 +15,7 @@ episode_id = "5x09"
   [menu.star-trek]
     weight = 3009
     identifier = "star-trek-voyager-05x09-thirty-days"
-    parent = "voy-r-s5"
+    parent = "voyA"
 +++
 
 We start where it ends: Paris is locked in Voyager's brig, locked for 30 days.
@@ -23,54 +25,6 @@ The entire episode is a retelling of the story of how he got there.
 In a series of flashbacks we learn about on ocean planet on the brink of doom and of Paris, who yet again disobeys orders to follow his call of ethics.
 
 
-## Impressions {#impressions}
-
-Paris should have been a much more interesting character.
-He is to be the cool guy in the crew[^kim].
-Handsome, intelligent, rebel.
-But as most of Voyager's crew, the writers somehow fall short of those expectations.
-[^kim]: but, deep inside, we all know that Kim is the coolest.
-
-This is one of the few episodes where they succeed.
-
-Yes, the start is over the top.
-Kim and Paris are on a double date in the holodeck where they pretend to be in a 50s SciFi flick - with superpowers and mad scientists.
-I am fully aware the Star Trek is a direct descendant of those shows.
-But I had never watched them[^twilight], and, at the same time, I am so tired of Marvel, so I didn't enjoy it.
-There has to be some nostalgia (even misplaced) to like this sort of things.
-And yes, I am watching a 30-year-old show, thank you for noticing.
-[^twilight]: except for few episodes of Twilight Zone. I will **need** to return here, as they were amazing
-
-{{< img-c "star-trek-voyager-thirty-days-1.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=177&page=3" >}}
-Complete with black and white filter
-{{< /img-c >}}
-
-I also found Paris dressed up as a sea captain a but goofy.
-
-But they are FINALLY letting the characters have fun.
-Last time it was not Moriarty level of fun, and this time it's still not.
-But finally something nice is happening and are witnessing it.
-Most of goofy scenes up to recently were strictly Neelix centered, but what we needed was exactly this.
-
-I am always happy when we to know the crew outside their duty, as this is (always) my primary issue with the show.
-Bring back the fun!
-
-As for the primary plot, I also enjoyed it.
-Not loved it, but it was very enjoyable.
-Paris refusing orders from Jenway was, at the same, expected, and thrilling.
-What Chakotay fails at, Paris delivers.
-We've got one character on the entire crew who is not afraid to go against his captain's if it means following his instinct.
-
-This is not a must-see episode, but what is, is one of those where you start valuing the show more.
-Paris is cool, end of story.
-
-And, once again, the CGI is breathtaking.
-
-{{< img-c "star-trek-voyager-thirty-days-2.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=177&page=3" >}}
-We deserve more underwater SciFi shows.
-{{< /img-c >}}
-
-
 ## Doctor factor {#doctor-factor}
 
 Unsatisfactory
diff --git a/content/star-trek/voy/05x11-latent-image.md b/content/star-trek/voy/05x11-latent-image.md
index 79b7c67..2e901aa 100644
--- a/content/star-trek/voy/05x11-latent-image.md
+++ b/content/star-trek/voy/05x11-latent-image.md
@@ -2,8 +2,11 @@
 title = "Star Trek: Voyager 05x11 - Latent Image"
 author = ["Michał Sapka"]
 date = 2024-03-08T22:07:00+01:00
+categories = ["star-trek", "voyager"]
 draft = false
 weight = 3010
+image_dir = "star-trek"
+image_max_width = 575
 hasNavSection = "st-voy-episodes"
 menu_item_override = 11
 episode_id = "5x11"
@@ -11,7 +14,7 @@ episode_id = "5x11"
   [menu.star-trek]
     weight = 3010
     identifier = "star-trek-voyager-05x11-latent-image"
-    parent = "voy-r-s5"
+    parent = "voyA"
 +++
 
 After a longer hiatus, I am back watching Voyager.
@@ -47,10 +50,10 @@ And Mulligan's performance is perfect.
 We have a scene where Doctor confronts her. In a span of few seconds, se moves from goofy and having fun with the crew to martial tribunal level of seriousness.
 This is not the first time she does it, but everyone I am floored.
 
-{{< img-c "star-trek-voyager-latent-image-1.jpg" "https://www.paramountplus.com/shows/video/A_IC0KJPUnyl6XGYILsz17io5kee4P2H/" >}}
+{{< image source="https://www.paramountplus.com/shows/video/A_IC0KJPUnyl6XGYILsz17io5kee4P2H/" class="centered" file="star-trek-voyager-latent-image-1.jpg" >}}
 There's more and more of Naomi.
 I can't wait to see what the show has planned for her!
-{{< /img-c >}}
+{{< /image >}}
 
 
 ## Doctor factor {#doctor-factor}
diff --git a/content/star-trek/voy/05x12-bride-of-chaotica.md b/content/star-trek/voy/05x12-bride-of-chaotica.md
index 3f07c6b..1d578f6 100644
--- a/content/star-trek/voy/05x12-bride-of-chaotica.md
+++ b/content/star-trek/voy/05x12-bride-of-chaotica.md
@@ -2,8 +2,11 @@
 title = "Star Trek: Voyager 05x12 - Bride of Chaotica!"
 author = ["Michał Sapka"]
 date = 2024-03-13T16:06:00+01:00
+categories = ["star-trek", "voyager"]
 draft = false
 weight = 3011
+image_dir = "star-trek"
+image_max_width = 575
 hasNavSection = "st-voy-episodes"
 abstract = "A fun Capitan Proton episode"
 menu_item_override = 12
@@ -12,7 +15,7 @@ episode_id = "5x12"
   [menu.star-trek]
     weight = 3011
     identifier = "star-trek-voyager-05x12-bride-of-chaotica"
-    parent = "voy-r-s5"
+    parent = "voyA"
 +++
 
 Paris and Kim are forced to keep a holodeck program of Captain Proton running when they leave the simulation.
@@ -36,10 +39,10 @@ I'd have much more fun if I was invested in Proton.
 
 Now, if it was Star Trek that was referenced with such respect in some modern show, I'd be all over it.
 
-{{< img-c "star-trek-voyager-bride-of-chaotica.jpg" "https://www.imdb.com/title/tt0708860/" >}}
+{{< image source="https://www.imdb.com/title/tt0708860/" class="centered" file="star-trek-voyager-bride-of-chaotica.jpg" >}}
 Though those episodes look simply stunning.
 Here: Jenway in the best aspect format (4:3).
-{{< /img-c >}}
+{{< /image >}}
 
 
 ## Doctor Factor {#doctor-factor}
diff --git a/content/star-trek/voy/05x13-gravity.md b/content/star-trek/voy/05x13-gravity.md
index d42a163..50483a1 100644
--- a/content/star-trek/voy/05x13-gravity.md
+++ b/content/star-trek/voy/05x13-gravity.md
@@ -2,8 +2,11 @@
 title = "Star Trek: Voyager 05x13 - Gravity"
 author = ["Michał Sapka"]
 date = 2024-03-16T10:06:00+01:00
+categories = ["star-trek", "voyager"]
 draft = false
 weight = 3012
+image_dir = "star-trek"
+image_max_width = 575
 hasNavSection = "st-voy-episodes"
 abstract = "A *great* Tuvok episode"
 menu_item_override = 13
@@ -12,7 +15,7 @@ episode_id = "5x13"
   [menu.star-trek]
     weight = 3012
     identifier = "star-trek-voyager-05x13-gravity"
-    parent = "voy-r-s5"
+    parent = "voyA"
 +++
 
 Tuvok, Paris, and Doctor are stranded on an alien planet.
@@ -51,9 +54,9 @@ It also allowed us to learn about her as a person - it's only one episode, but w
 
 All in all: highly recommended!
 
-{{< img-c "star-trek-voyager-gravity.jpg" "https://www.amazon.com/Petty-Voyager-Original-Autographed-Photo/dp/B00TLA0596" >}}
+{{< image source="https://www.amazon.com/Petty-Voyager-Original-Autographed-Photo/dp/B00TLA0596" class="centered" file="star-trek-voyager-gravity.jpg" >}}
 Tasty space spider!
-{{< /img-c >}}
+{{< /image >}}
 
 [^fn:1]: I haven't seen too much of TOS, so I can't compare him to mr. Spock.
 [^fn:2]: I fully accept the ban on mind-melt that is sure to follow this sentence
diff --git a/content/star-trek/voy/05x14-bliss.md b/content/star-trek/voy/05x14-bliss.md
index d6fcbad..437b1d6 100644
--- a/content/star-trek/voy/05x14-bliss.md
+++ b/content/star-trek/voy/05x14-bliss.md
@@ -2,8 +2,11 @@
 title = "Star Trek: Voyager 05x14 - Bliss"
 author = ["Michał Sapka"]
 date = 2024-03-17T21:36:00+01:00
+categories = ["star-trek", "voyager"]
 draft = false
 weight = 3013
+image_dir = "star-trek"
+image_max_width = 575
 hasNavSection = "st-voy-episodes"
 abstract = "A monster a week type of trek"
 menu_item_override = 14
@@ -12,7 +15,7 @@ episode_id = "5x14"
   [menu.star-trek]
     weight = 3013
     identifier = "star-trek-voyager-05x14-bliss"
-    parent = "voy-r-s5"
+    parent = "voyA"
 +++
 
 ## The plot {#the-plot}
@@ -31,9 +34,9 @@ Nothing out of the ordinary - just a problem in outer space.
 This is very much ok.
 The basic premise - great; crew on happy pills - perfect; Seven out to get to the bottom of it - ideal; Naomi - still cool.
 
-{{< img-c "star-trek-bliss.jpg" "https://www.youtube.com/watch?v=YJ2DRFP44K4" >}}
+{{< image source="https://www.youtube.com/watch?v=YJ2DRFP44K4" class="centered" file="star-trek-bliss.jpg" >}}
 The creature in all of its glory
-{{< /img-c >}}
+{{< /image >}}
 
 The most memorable part of this episode was the reaction of Quatai upon meeting Voyager.
 After countless lies and deceptions by the creature, he can no longer accept that a good thing can happen.
diff --git a/content/star-trek/voy/05x15-15-dark-frontier.md b/content/star-trek/voy/05x15-15-dark-frontier.md
index 67d12a7..e29b9b8 100644
--- a/content/star-trek/voy/05x15-15-dark-frontier.md
+++ b/content/star-trek/voy/05x15-15-dark-frontier.md
@@ -2,8 +2,11 @@
 title = "Star Trek: Voyager 05x15/16 - Dark Frontier"
 author = ["Michał Sapka"]
 date = 2024-03-22T22:45:00+01:00
+categories = ["star-trek", "voyager"]
 draft = false
 weight = 3014
+image_dir = "star-trek"
+image_max_width = 575
 hasNavSection = "st-voy-episodes"
 abstract = "A Borg themed two-parter"
 menu_item_override = "15&16"
@@ -12,7 +15,7 @@ episode_id = "5x15/16"
   [menu.star-trek]
     weight = 3014
     identifier = "star-trek-voyager-05x15-16-dark-frontier"
-    parent = "voy-r-s5"
+    parent = "voyA"
 +++
 
 Voyagers crew decide that it's a good time to plan a heist on Borg and steal their transwarp coil.
@@ -21,76 +24,6 @@ During the heist, Seven meets the new Borg Queen who has huge interest in her.
 We're also witness of Sevens memories from just before being assimilated by the Collective.
 
 
-## Impressions {#impressions}
-
-Oh, a two-parter!
-Of course, it's about the Borg.
-
-Say what you will, the basic premise of Borg still scares me.
-The idea of loosing _self_ and to be reduced to a drone?
-Not even corporate America is capable of doing it fully.
-But I started watching Trek years ago.
-When Picard became Locutus, I was some 7-8 year younger.
-It was a scary concept, sure.
-But here I am, in 2024, a father.
-The premise of Borg assimilating children is terrifying.
-A young kid loosing _self_ and becoming part of the collective?
-Yeah, scary stuff became terrifying.
-I get we're dealing with alien-third-reich and _borg-jungen_ make perfect sense.
-But in unnerving at the very least.
-
-Here we learn that Hanses fought for the title of worst parents ever.
-Not only have they risked their own lives, not only have they not thought of the risk making Anika an orphan, but they took her with them.
-They took their little girl to the most dangerous place in known space.
-Star Trek is about "boldly going were no one has gone before", but have some restrains!
-Even the Doctor agreed.
-
-Speaking of children in dangerous areas of universe - Naomi continues to rock.
-When _TNG_ introduced Alexander, they could not throw his character fast enough.
-They had no idea how to write children.
-But here?
-Here she acts like a kid.
-Cute and believable.
-
-On the other hand, we're seeing assimilation.
-I don't remember how graphical the previous ones we witnessed were, but hot damn.
-Strogg... Borg aren't fooling around - arms are cut off, and it's actually scary.
-People complained about the eye-removal scene from _Picard_, but it wasn't so off.
-
-But my biggest takeaway: there are privacy protocols on federation ships!
-I always wondered how they store all this private info without prying eyes.
-The answer: protocol.
-Oh! you crazy space-commies!
-
-{{< img-c "star-trek-voyager-dark-frontier-01.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=96" >}}
-Borg ships always gives me a sense of claustrophobia.
-Games with Borg ignored how small the living space is there.
-{{< /img-c >}}
-
-{{< img-c "star-trek-voyager-dark-frontier-02.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=96" >}}
-The Death Star makes a guest appearance
-{{< /img-c >}}
-
-{{< img-c "star-trek-voyager-dark-frontier-03.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=96" >}}
-Chibi-Seven
-{{< /img-c >}}
-
-{{< img-c "star-trek-voyager-dark-frontier-04.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=96" >}}
-I am often amazed by the quality of special effects on display here.
-{{< /img-c >}}
-
-{{< img-c "star-trek-voyager-dark-frontier-05.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=96" >}}
-Borg Queen doing her best Alex Murphy impression.
-{{< /img-c >}}
-
-{{< img-c "star-trek-voyager-dark-frontier-06.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=96" >}}
-Say what you will, Queen looks better here than she looked like in Picard.
-{{< /img-c >}}
-
-> Seven: I will resist
->
-> Queen: I know
-
-Factor
+## Doctor  Factor {#doctor-factor}
 
 The episode is so good, that I don't care that we deserve more of The Doctor.
diff --git a/content/star-trek/voy/05x16-the-disease.md b/content/star-trek/voy/05x16-the-disease.md
index 6e4a76f..8294611 100644
--- a/content/star-trek/voy/05x16-the-disease.md
+++ b/content/star-trek/voy/05x16-the-disease.md
@@ -2,8 +2,11 @@
 title = "Star Trek: Voyager 05x17 - The Disease"
 author = ["Michał Sapka"]
 date = 2024-03-22T23:27:00+01:00
+categories = ["star-trek", "voyager"]
 draft = false
 weight = 3015
+image_dir = "star-trek"
+image_max_width = 575
 hasNavSection = "st-voy-episodes"
 abstract = "Space STD and rebelion?"
 menu_item_override = 17
@@ -12,7 +15,7 @@ episode_id = "5x17"
   [menu.star-trek]
     weight = 3015
     identifier = "star-trek-voyager-05x17-the-disease"
-    parent = "voy-r-s5"
+    parent = "voyA"
 +++
 
 Voyager assists Varro - an alien species who live in a huge spaceship for the last 400 years.
@@ -45,9 +48,9 @@ If those were two separate episodes - one completely of the wall, one serious an
 Both stories deserve so much more.
 I left unsatisfied.
 
-{{< img-c "star-trek-voyager-the-disese.webp" "https://them0vieblog.com/2017/08/30/star-trek-voyager-the-disease-review/" >}}
+{{< image source="https://them0vieblog.com/2017/08/30/star-trek-voyager-the-disease-review/" class="centered" file="star-trek-voyager-the-disese.webp" >}}
 Varro's ship.
-{{< /img-c >}}
+{{< /image >}}
 
 
 ## Doctor Factor {#doctor-factor}
diff --git a/content/star-trek/voy/05x18-course-oblivion.md b/content/star-trek/voy/05x18-course-oblivion.md
index 61ca912..b3f05ac 100644
--- a/content/star-trek/voy/05x18-course-oblivion.md
+++ b/content/star-trek/voy/05x18-course-oblivion.md
@@ -2,8 +2,11 @@
 title = "Star Trek: Voyager 05x18 Course: Oblivion"
 author = ["Michał Sapka"]
 date = 2024-04-03T21:14:00+02:00
+categories = ["star-trek", "voyager"]
 draft = false
 weight = 3016
+image_dir = "star-trek"
+image_max_width = 575
 hasNavSection = "st-voy-episodes"
 abstract = "One of the  best episodes I've seen"
 menu_item_override = 18
@@ -12,7 +15,7 @@ episode_id = "5x18"
   [menu.star-trek]
     weight = 3016
     identifier = "star-trek-voyager-05x18-course-oblivion"
-    parent = "voy-r-s5"
+    parent = "voyA"
 +++
 
 We start with B'Elllanas and Parises wedding and celebration of successful enhancement of Voyagers drives.
@@ -26,9 +29,9 @@ Soon, rest of the crew comes down with the same illness as B'Ellana.
 
 "Course: Oblivion" is a direct continuation of Demon (04x24[^fn:1])
 
-{{< img-c "star-trek-voyager-course-oblivion-1.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=96" >}}
+{{< image source="https://voy.trekcore.com/gallery/thumbnails.php?album=96" class="centered" file="star-trek-voyager-course-oblivion-1.jpg" >}}
 Look how happy they are.
-{{< /img-c >}}
+{{< /image >}}
 
 
 ## Impressions {#impressions}
@@ -67,9 +70,9 @@ It adds nothing to the main story, yet it is _essential_ to appreciate _Voyager_
 I think it's time to say it out loud: _Voyager_ is a better series than _The Next Generation_.
 It's more mature, less goofy and overall has amazing episode quality.
 
-{{< img-c "star-trek-voyager-course-oblivion-2.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=96" >}}
+{{< image source="https://voy.trekcore.com/gallery/thumbnails.php?album=96" class="centered" file="star-trek-voyager-course-oblivion-2.jpg" >}}
 Look how sad they are.
-{{< /img-c >}}
+{{< /image >}}
 
 
 ## Doctor factor {#doctor-factor}
diff --git a/content/star-trek/voy/05x19-fight.md b/content/star-trek/voy/05x19-fight.md
index 37bd16e..38ad684 100644
--- a/content/star-trek/voy/05x19-fight.md
+++ b/content/star-trek/voy/05x19-fight.md
@@ -2,8 +2,11 @@
 title = "Star Trek: Voyager 05x19 - Fight"
 author = ["Michał Sapka"]
 date = 2024-04-03T21:38:00+02:00
+categories = ["star-trek", "voyager"]
 draft = false
 weight = 3017
+image_dir = "star-trek"
+image_max_width = 575
 hasNavSection = "st-voy-episodes"
 abstract = "Voyager, you are not Northern Exposure!"
 menu_item_override = 19
@@ -12,7 +15,7 @@ episode_id = "5x19"
   [menu.star-trek]
     weight = 3017
     identifier = "star-trek-voyager-05x19-fight"
-    parent = "voy-r-s5"
+    parent = "voyA"
 +++
 
 Checkotay undergoes a vision quest while laying in sickbay.
diff --git a/content/star-trek/voy/05x20-think-tank.md b/content/star-trek/voy/05x20-think-tank.md
index dc2f8c8..adf974b 100644
--- a/content/star-trek/voy/05x20-think-tank.md
+++ b/content/star-trek/voy/05x20-think-tank.md
@@ -2,8 +2,11 @@
 title = "Star Trek: Voyager 05x20 - Think Tank"
 author = ["Michał Sapka"]
 date = 2024-04-08T19:30:00+02:00
+categories = ["star-trek", "voyager"]
 draft = false
 weight = 3018
+image_dir = "star-trek"
+image_max_width = 575
 hasNavSection = "st-voy-episodes"
 abstract = "The episode about nothing"
 menu_item_override = 20
@@ -12,7 +15,7 @@ episode_id = "5x20"
   [menu.star-trek]
     weight = 3018
     identifier = "star-trek-voyager-05x20-think-tank"
-    parent = "voy-r-s5"
+    parent = "voyA"
 +++
 
 Voyager employees help from a suspicious group calling themselves a _Think Tank_.
@@ -52,10 +55,10 @@ The way it plays out is, basically, _about nothing_.
 I'm getting a bit annoyed that it's either a doctor-centeric episode, or his involvement is unsatisfactory.
 This was not a doctor-centric episode.
 
-{{< img-c "star-trek-voyager-think-tank-1.jpg" "https://voy.trekcore.com/gallery/albums/screencaps/s5/520-think-tank/thinktank_004.jpg" >}}
+{{< image source="https://voy.trekcore.com/gallery/albums/screencaps/s5/520-think-tank/thinktank_004.jpg" class="centered" file="star-trek-voyager-think-tank-1.jpg" >}}
 Disregarding obvious joke (Da Ba Dee), this looks phenomenal
-{{< /img-c >}}
+{{< /image >}}
 
-{{< img-c "star-trek-voyager-think-tank-2.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=96" >}}
+{{< image source="https://voy.trekcore.com/gallery/thumbnails.php?album=96" class="centered" file="star-trek-voyager-think-tank-2.jpg" >}}
 He lives in a society!
-{{< /img-c >}}
+{{< /image >}}
diff --git a/content/star-trek/voy/05x21-juggernaut.md b/content/star-trek/voy/05x21-juggernaut.md
index b936cb1..7ea7bf7 100644
--- a/content/star-trek/voy/05x21-juggernaut.md
+++ b/content/star-trek/voy/05x21-juggernaut.md
@@ -2,8 +2,11 @@
 title = "Star Trek: Voyager 05x21 - Juggnaut"
 author = ["Michał Sapka"]
 date = 2024-04-20T18:51:00+02:00
+categories = ["star-trek", "voyager"]
 draft = false
 weight = 3019
+image_dir = "star-trek"
+image_max_width = 575
 hasNavSection = "st-voy-episodes"
 abstract = "My mini review"
 aliases = ["//star-trek/stv/05x21-juggernut/"]
@@ -13,7 +16,7 @@ episode_id = "5x21"
   [menu.star-trek]
     weight = 3019
     identifier = "star-trek-voyager-05x21-juggnaut"
-    parent = "voy-r-s5"
+    parent = "voyA"
 +++
 
 Voyager meets Malons again.
@@ -60,6 +63,6 @@ It's there and it's enjoyable.
 
 Unsatisfactory, like most of the time.
 
-{{< img-c "star-trek-voyager-jaggernaut-001.jpg" "https://voy.trekcore.com/gallery/albums/screencaps/s5/521-juggernaut/juggernaut_134.jpg" >}}
+{{< image source="https://voy.trekcore.com/gallery/albums/screencaps/s5/521-juggernaut/juggernaut_134.jpg" class="centered" file="star-trek-voyager-jaggernaut-001.jpg" >}}
 Most definitely not a Ferengi.
-{{< /img-c >}}
+{{< /image >}}
diff --git a/content/star-trek/voy/05x22-someone-to-watch-over-me.md b/content/star-trek/voy/05x22-someone-to-watch-over-me.md
index 83ae207..249a0ae 100644
--- a/content/star-trek/voy/05x22-someone-to-watch-over-me.md
+++ b/content/star-trek/voy/05x22-someone-to-watch-over-me.md
@@ -2,8 +2,11 @@
 title = "Star Trek: Voyager 05x22 - Someone to Watch Over Me"
 author = ["Michał Sapka"]
 date = 2024-05-05T00:10:00+02:00
+categories = ["star-trek", "voyager"]
 draft = false
 weight = 3020
+image_dir = "star-trek"
+image_max_width = 575
 hasNavSection = "st-voy-episodes"
 abstract = "My mini review"
 menu_item_override = 22
@@ -12,7 +15,7 @@ episode_id = "5x22"
   [menu.star-trek]
     weight = 3020
     identifier = "star-trek-voyager-05x22-someone-to-watch-over-me"
-    parent = "voy-r-s5"
+    parent = "voyA"
 +++
 
 Seven, with a help from the Doctor explores another aspect of being human - intimate relations.
@@ -54,6 +57,6 @@ This may have been the best Doctor episode, even though he was not the primary f
 Not only is he hilarious, but this may be his biggest growth yet.
 My disappointment will be immeasurable if authors won't develop his love toward Seven deeper.
 
-{{< img-c "star-trek-voyager-someone-to-watch-over-me.jpg" "https://imdb.com" >}}
+{{< image source="https://imdb.com" class="centered" file="star-trek-voyager-someone-to-watch-over-me.jpg" >}}
 Yes, Doctor and Seven dancing.
-{{< /img-c >}}
+{{< /image >}}
diff --git a/content/star-trek/voy/05x23-11-59.md b/content/star-trek/voy/05x23-11-59.md
index 48ccaf9..2fbf98b 100644
--- a/content/star-trek/voy/05x23-11-59.md
+++ b/content/star-trek/voy/05x23-11-59.md
@@ -2,8 +2,11 @@
 title = "Star Trek: Voyager 05x23  - 11:59"
 author = ["Michał Sapka"]
 date = 2024-05-09T23:17:00+02:00
+categories = ["star-trek", "voyager"]
 draft = false
 weight = 3021
+image_dir = "star-trek"
+image_max_width = 575
 hasNavSection = "st-voy-episodes"
 abstract = "My mini review"
 menu_item_override = 23
@@ -12,7 +15,7 @@ episode_id = "5x23"
   [menu.star-trek]
     weight = 3021
     identifier = "star-trek-voyager-05x23-11-59"
-    parent = "voy-r-s5"
+    parent = "voyA"
 +++
 
 Jenway reminisces about her distant relative, Shannon O'Donnell, who was one of her biggest inspirations to join the fleet.
@@ -47,9 +50,9 @@ All glory to then!
 11:59 is a cute little episode.
 I enjoyed it immensely, even though in 3 years I'll have no memory of ever seeing it.
 
-{{< img-c "star-trek-voyager-11-59.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=151&page=4" >}}
+{{< image source="https://voy.trekcore.com/gallery/thumbnails.php?album=151&amp;page=4" class="centered" file="star-trek-voyager-11-59.jpg" >}}
 Books and books and books and books
-{{< /img-c >}}
+{{< /image >}}
 
 [^fn:1]: I've been raised in the 90s, so I was subjected to USA's cultural propaganda and I still love it.
     Movies were simply better back then.
diff --git a/content/star-trek/voy/05x24-relativity.md b/content/star-trek/voy/05x24-relativity.md
index bc5fc20..3a8ef62 100644
--- a/content/star-trek/voy/05x24-relativity.md
+++ b/content/star-trek/voy/05x24-relativity.md
@@ -2,8 +2,11 @@
 title = "Star Trek: Voyager 04x24 - Relativity"
 author = ["Michał Sapka"]
 date = 2024-05-14T22:51:00+02:00
+categories = ["star-trek", "voyager"]
 draft = false
 weight = 3022
+image_dir = "star-trek"
+image_max_width = 575
 hasNavSection = "st-voy-episodes"
 abstract = "My mini review"
 menu_item_override = 24
@@ -12,7 +15,7 @@ episode_id = "5x24"
   [menu.star-trek]
     weight = 3022
     identifier = "star-trek-voyager-04x24-relativity"
-    parent = "voy-r-s5"
+    parent = "voyA"
 +++
 
 Seven is recruited by Captain Braxton for a time-traveling mission to save the Voyager
@@ -51,6 +54,6 @@ They can make darker ship that is not _black_, like they are in the new ST!
 
 Nope, I left unsatisfied.
 
-{{< img-c "star-trek-voyager-relativity.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=134&page=5" >}}
+{{< image source="https://voy.trekcore.com/gallery/thumbnails.php?album=134&amp;page=5" class="centered" file="star-trek-voyager-relativity.jpg" >}}
 Dark, but not modern-trek Dark.
-{{< /img-c >}}
+{{< /image >}}
diff --git a/content/star-trek/voy/05x25-warhead.md b/content/star-trek/voy/05x25-warhead.md
index 5f30525..e3417d1 100644
--- a/content/star-trek/voy/05x25-warhead.md
+++ b/content/star-trek/voy/05x25-warhead.md
@@ -2,8 +2,11 @@
 title = "Star Trek: Voyager 05x25 - Warhead"
 author = ["Michał Sapka"]
 date = 2024-05-14T23:02:00+02:00
+categories = ["star-trek", "voyager"]
 draft = false
 weight = 3023
+image_dir = "star-trek"
+image_max_width = 575
 hasNavSection = "st-voy-episodes"
 abstract = "My mini review"
 menu_item_override = 25
@@ -12,7 +15,7 @@ episode_id = "5x25"
   [menu.star-trek]
     weight = 3023
     identifier = "star-trek-voyager-05x25-warhead"
-    parent = "voy-r-s5"
+    parent = "voyA"
 +++
 
 Voyager meets a sentient bomb a tries not to destroy an alien planet in the process.
@@ -45,9 +48,9 @@ It also asks similar questions: who we are? Why are we here? Can we change it?
 Great episode.
 I'd love more of such brilliant little stories.
 
-{{< img-c "star-trek-voyager-warhead.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=152&page=4" >}}
+{{< image source="https://voy.trekcore.com/gallery/thumbnails.php?album=152&amp;page=4" class="centered" file="star-trek-voyager-warhead.jpg" >}}
 Starts as a love story
-{{< /img-c >}}
+{{< /image >}}
 
 
 ## Picardo factor {#picardo-factor}
diff --git a/content/star-trek/voy/05x26-equinox-part-1.md b/content/star-trek/voy/05x26-equinox-part-1.md
index 0c30aa3..196015e 100644
--- a/content/star-trek/voy/05x26-equinox-part-1.md
+++ b/content/star-trek/voy/05x26-equinox-part-1.md
@@ -2,8 +2,11 @@
 title = "Star Trek: Voyager 05x26 - Equinox (part 1)"
 author = ["Michał Sapka"]
 date = 2024-05-19T18:10:00+02:00
+categories = ["star-trek", "voyager"]
 draft = false
 weight = 3024
+image_dir = "star-trek"
+image_max_width = 575
 hasNavSection = "st-voy-episodes"
 abstract = "My mini review"
 menu_item_override = 26
@@ -12,7 +15,7 @@ episode_id = "5x26"
   [menu.star-trek]
     weight = 3024
     identifier = "star-trek-voyager-05x26-equinox-part-1"
-    parent = "voy-r-s5"
+    parent = "voyA"
 +++
 
 Voyager meets a Starfleet Spaceship - Equinox.
@@ -56,6 +59,6 @@ The Trek is about what mankind _can_ be, not what it is.
 
 Meh.
 
-{{< img-c "star-trek-voyager-equinox.jpg" "https://voy.trekcore.com/gallery/thumbnails.php?album=153" >}}
+{{< image source="https://voy.trekcore.com/gallery/thumbnails.php?album=153" class="centered" file="star-trek-voyager-equinox.jpg" >}}
 Looks like Alien, plays like Man Behind The Sun.
-{{< /img-c >}}
+{{< /image >}}
diff --git a/content/star-trek/voy/06x01-equinox-part-1.md b/content/star-trek/voy/06x01-equinox-part-1.md
index d5ae952..0eb46d8 100644
--- a/content/star-trek/voy/06x01-equinox-part-1.md
+++ b/content/star-trek/voy/06x01-equinox-part-1.md
@@ -2,9 +2,10 @@
 title = "Star Trek: Voyager 06x01 - Equinox (part 2)"
 author = ["Michał Sapka"]
 date = 2024-10-04T20:17:00+02:00
+categories = ["star-trek", "voyager"]
 draft = false
 weight = 3001
-image_dir = "images"
+image_dir = "star-trek"
 image_max_width = 575
 hasNavSection = "st-voy-episodes"
 abstract = "My mini review"
diff --git a/content/star-trek/voy/06x02-survival-instinct.md b/content/star-trek/voy/06x02-survival-instinct.md
index 13705de..c5251e5 100644
--- a/content/star-trek/voy/06x02-survival-instinct.md
+++ b/content/star-trek/voy/06x02-survival-instinct.md
@@ -2,9 +2,10 @@
 title = "Star Trek: Voyager 06x02 Survival Instinct"
 author = ["Michał Sapka"]
 date = 2024-10-05T09:27:00+02:00
+categories = ["star-trek", "voyager"]
 draft = false
 weight = 3002
-image_dir = "images"
+image_dir = "star-trek"
 image_max_width = 575
 hasNavSection = "st-voy-episodes"
 abstract = "My mini review"
diff --git a/content/star-trek/voy/_index.md b/content/star-trek/voy/_index.md
index bc01d52..01e75c1 100644
--- a/content/star-trek/voy/_index.md
+++ b/content/star-trek/voy/_index.md
@@ -2,12 +2,14 @@
 title = "Star Trek Voyager"
 author = ["Michał Sapka"]
 date = 2023-11-16T23:00:00+01:00
+categories = ["star-trek"]
 draft = false
 weight = 2001
 primary_menu = "star-trek"
-abstract = "Homeapage of my small Star Trek fansite"
+abstract = "Homepage of my small Star Trek fansite"
 type = "special"
 hardback = true
+aliases = ["/star-trek"]
 [menu]
   [menu.star-trek]
     weight = 2001
@@ -19,15 +21,12 @@ Alas, I started writing about Trek only when reaching Season 5.
 For now, nothing before that will be present.
 
 
-## Episodes {#episodes}
+## Currently watching {#currently-watching}
 
 
-### Currently watching {#currently-watching}
+### Season Six {#season-six}
 
-
-#### Season Six {#season-six}
-
-{{< ep-table "voy-s6.yaml" >}}
+{{< ep-table "star-trek/voy-s6.yaml" >}}
 Jenway, challenged
 {{< /ep-table >}}
 
@@ -39,6 +38,6 @@ Jenway, challenged
 
 #### Season Five {#season-five}
 
-{{< ep-table "voy-s5.yaml" >}}
+{{< ep-table "star-trek/voy-s5.yaml" >}}
 Jenway, challenged
 {{< /ep-table >}}
diff --git a/layouts/shortcodes/ep-table.html b/layouts/shortcodes/ep-table.html
index 59448a1..5614cb3 100644
--- a/layouts/shortcodes/ep-table.html
+++ b/layouts/shortcodes/ep-table.html
@@ -1 +1,37 @@
-{{ .Inner }}
+{{- $caption := .Inner }}
+{{- $page := .Page }}
+{{- $site := .Site }}
+
+{{ with $file := .Get 0 }}
+{{ with resources.Get $file}}
+{{ with . | transform.Unmarshal }}
+<table class="eptab">
+  <tr>
+    <th scope="col">Air date</th>
+    <th scope="col">Ep#</th>
+    <th scope="col">Prod#</th>
+    <th scope="col">Title</th>
+  </tr>
+  {{ range  .episodes }}
+
+  {{ $detailUrl := where site.RegularPages "Params.episode_id" .Episode }}
+
+  <tr>
+    <td>{{ .USRelDate }}</td>
+    <td>{{ .Episode }}</td>
+    <td>{{ .ProductionNo }}</td>
+    <td>
+      {{ if $detailUrl}}
+      <a href="{{ (index $detailUrl 0).Permalink }}">{{ .Title }}</a>
+      {{ else }}
+      {{ .Title }}
+      {{ end }}
+    </td>
+  </tr>
+</tr>
+{{ end }}
+</table>
+{{ end }}
+{{ end }}
+{{ end }}
+
diff --git a/layouts/star-trek/baseof.html b/layouts/star-trek/baseof.html
deleted file mode 100644
index 70884b1..0000000
--- a/layouts/star-trek/baseof.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{{ block "main" . }}
-{{ end }}
-
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>{{ .Title }}</title>
-    <link rel="canonical" href="/unix-history/"/>
-    <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-    <meta http-equiv="refresh" content="0; url=https://startrek.crys.site/{{ replace .RelPermalink "/star-trek/" ""}}"/>
-  </head>
-
-</html>
diff --git a/layouts/star-trek/list.html b/layouts/star-trek/list.html
deleted file mode 100644
index e4e4a83..0000000
--- a/layouts/star-trek/list.html
+++ /dev/null
@@ -1,2 +0,0 @@
-{{ define "main" }}
-{{ end }}
diff --git a/layouts/star-trek/redirect.html b/layouts/star-trek/redirect.html
deleted file mode 100644
index 599d57b..0000000
--- a/layouts/star-trek/redirect.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>{{ .Title }}</title>
-    <link rel="canonical" href="/unix-history/"/>
-    <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-    <meta http-equiv="refresh" content="0; url=/unix-history/#{{ .Page.Params.link }}"/>
-  </head>
-</html>
diff --git a/layouts/star-trek/single.html b/layouts/star-trek/single.html
deleted file mode 100644
index e4e4a83..0000000
--- a/layouts/star-trek/single.html
+++ /dev/null
@@ -1,2 +0,0 @@
-{{ define "main" }}
-{{ end }}
diff --git a/themes/24-unification/layouts/_default/.#baseof.html b/themes/24-unification/layouts/_default/.#baseof.html
new file mode 120000
index 0000000..05810a7
--- /dev/null
+++ b/themes/24-unification/layouts/_default/.#baseof.html
@@ -0,0 +1 @@
+mms@voyager.local.62643:1729838336
\ No newline at end of file
diff --git a/themes/24-unification/layouts/_default/baseof.html b/themes/24-unification/layouts/_default/baseof.html
index c2759dd..394193f 100644
--- a/themes/24-unification/layouts/_default/baseof.html
+++ b/themes/24-unification/layouts/_default/baseof.html
@@ -7,7 +7,6 @@
 
     <meta name="viewport" content="width=device-width, initial-scale=1">
     
-    <meta property="fediverse:creator" content="@mms@emacs.ch">
     <link rel="me" href="https://emacs.ch/@mms">
     
     {{- $header_rect := resources.Get "blog/logo/right.png" }}
@@ -41,6 +40,8 @@
     <link rel="webmention" href="https://webmention.io/d-s.sh/webmention">
     <link rel="pingback" href="https://webmention.io/d-s.sh/xmlrpc">
 
+    <meta name="fediverse:creator" content="@mms@bsd.cafe">
+
     <style>
       :root {
           --bg-color: #738276;
@@ -61,7 +62,7 @@
         font-family: "bryle";
         {{- $font := resources.Get "fonts/Atkinson-Hyperlegible-Regular-102a.woff2"  -}}
         src: url("{{ $font.Permalink }}");
-        font-weight: regular;
+        font-weight: normal;
     }
 
     @font-face {
@@ -358,7 +359,47 @@
                   flex-grow: 1;
               }
           }
+
+          table.eptab { 
+              width: 100%;
+    
+              th {
+                  text-align: center;
+                  padding: 20px;
+              }
+    
+              tr td {
+                  text-align: center;
+              }
+              tr td:last-child {
+                  text-align: left;
+              }
+          }
+         
       }
+
+ @media only screen and (max-width: 650px) {
+     table.eptab { 
+         th, td {
+             display: none;
+         }
+         tr th:nth-child(2) {
+             display: table-cell;
+         }
+         tr th:last-child {
+             display: table-cell;
+         }
+         tr td:last-child {
+             display: table-cell;
+         }
+         tr td:nth-child(2) {
+             display: table-cell;
+         }
+         tr td:last-child {
+             display: table-cell;
+         }
+     }
+ }
       
       img {
           max-width: 100%;