diff --git a/wiki/jellyfin.md b/wiki/jellyfin.md
index f8814cf..ff8a94f 100644
--- a/wiki/jellyfin.md
+++ b/wiki/jellyfin.md
@@ -21,136 +21,106 @@ scenes`.
 This section describes on how to place them in the directories correctly to get
 jellyfin to recognize them as extras.
 
-### Movies consisting of multiple files
+### Handling movies or episodes consisting of multiple video files
 
 Jellyfin does not have the capability to seamlessly transition between multiple
-files of a movie.
+files of a movie or episode.
 The easiest way to achieve a seamless movie experience is to concatenate the two
 movie files.
-This can be done with [ffmpeg](./linux/ffmpeg.md).
+This can be done with [ffmpeg](./linux/ffmpeg.md#concatenate-multiple-video-files-with-matching-audio-tracks).
 
-### Extras of movies
+### Naming Movies, multiple movie versions and extras
 
 In
 [the jellyfin documentation](https://jellyfin.org/docs/general/server/media/movies.html)
 is a section on how to name the files correctly.
+In the following slight changes are made to ensure better naming schemes.
+Additionally to indicate the encoding and source can be indicated before the
+file extension.
+`brd` for Blu-ray disc, `dvd` for digital versatile disc.
+This is followed by an encoding indicator starting with `u` and followed by
+your own scheme for encodings.
+Different versions of the same movie can be stored in the same folder with
+slightly different names to indicate the specific version.
 Inside the movie folder you can create subfolders with the following names for
 different extras:
 
-- `behind the scenes`
-- `deleted scenes`
+- `behind_the_scenes`
+- `deleted_scenes`
+- `extras` (generic catch all for extras of an unknown type)
+- `featurettes`
 - `interviews`
-- `scenes`
 - `samples`
+- `scenes`
 - `shorts`
-- `featurettes`
-- `extras` (generic catch all for extras of an unknown type)
 - `trailers`
 
+The `movies` folder is a folder containing all movies.
 An example looks like the following:
 
 ```
-Movies
-└── Best_Movie_Ever (2019)
-    ├── Best_Movie_Ever (2019) - 1080P.mp4
-    ├── Best_Movie_Ever (2019) - 720P.mp4
-    ├── Best_Movie_Ever (2019) - Directors Cut.mp4
-    ├── behind the scenes
-    │   ├── Making of the Best Movie Ever.mp4
-    │   └── Finding the right score.mp4
+movies
+└── best_movie_ever_(2019)
+    ├── best_movie_ever_(2019)_-_brd_uu.mp4
+    ├── best_movie_ever_(2019)_-_dvd_u1.mp4
+    ├── best_movie_ever_(2019)_-_brd_un_directors_cut.mp4
+    ├── behind_the_scenes
+    │   ├── best_movie_ever_(2019)_-_brd_uu_making_of.mp4
+    │   └── best_movie_ever_(2019)_-_brd_uu_finding_the_right_score.mp4
     ├── interviews
-    │   └── Interview with the Director.mp4
+    │   └── best_movie_ever_(2019)_-_brd_u1_director_interview.mp4
     └── extras
-        └── Home recreation.mp4
+        └── best_movie_ever_(2019)_-_dvd_un_home_recreation.mp4
 ```
 
-Specific extras can also be stored in the main folder of the movie by naming
-them to the following (adding a suffix for the type):
-
-- `trailer`
-- `sample`
-- `theme`
-
-An example looks like the following:
-
-```
-Movies
-└── Best_Movie_Ever (2019)
-    ├── Best_Movie_Ever (2019) - 1080P.mp4
-    ├── sample.mp4
-    ├── theme.mp3
-    └── trailer.mp4
-```
 
 Another way to keep extras in the main folder of the movie is by adding the
 following suffixes to the files accordingly:
 
-
-- `-trailer`
-- `.trailer`
-- `_trailer`
-- ` trailer` - This is a space followed by the word ` trailer`
-- `-sample`
-- `.sample`
-- `_sample`
-- ` sample` - This is a space followed by the word `sample`
-- `-scene`
-- `-clip`
-- `-interview`
-- `-behindthescenes`
-- `-deleted`
-- `-featurette`
-- `-short`
-
-An example looks like the following:
-
-```
-Movies
-└── Best_Movie_Ever (2019)
-    ├── Best_Movie_Ever (2019) - 1080P.mp4
-    ├── That clip that I want everyone to see-clip.mp4
-    ├── Release Trailer-trailer.mp4
-    ├── Preview Trailer.trailer.avi
-    ├── Release Trailer 2_trailer.avi
-    ├── Teaser.sample.mp4
-    ├── Favorite Scene-scene.mp4
-    ├── The Best Ever-clip.mp4
-    ├── Making of The Best Movie Ever-behindthescenes.mp4
-    ├── Not the best scene-deleted.mp4
-    ├── Theme Song Music Video-featurette.mp4
-    └── Art of the Best Movie Ever-short.mp4
-```
-
-## Extras of TV shows
+### Naming TV Shows, episodes and extras
 
 In
 [the jellyfin documentation](https://jellyfin.org/docs/general/server/media/shows.html)
 is a section on how to name the files correctly.
+In the following slight changes are made to ensure better naming schemes.
 Inside the shows folder you can create the `season_00` folder as a directory
 for extras.
+Additionally to indicate the encoding and source can be indicated before the
+file extension.
+`brd` for Blu-ray disc, `dvd` for digital versatile disc.
+This is followed by an encoding indicator starting with `u` and followed by
+your own scheme for encodings.
+Files containing multiple episodes at once are named by specifying the first
+and last episode they include `s01e01-e02`.
+Because of the heavily varying the titles of the episodes are not included.
+Use the following list to specify the extras inside the `season_0` folder:
+
+- `behind_the_scenes`
+- `deleted_scenes`
+- `extras` (generic catch all for extras of an unknown type)
+- `featurettes`
+- `interviews`
+- `samples`
+- `scenes`
+- `shorts`
+- `trailers`
 
-An example looks like the following:
+The `shows` folder is a folder containing all tv shows.
+An example looks like the following.
 
 ```
-Shows
-├── Series (2010)
-│   ├── Season 00
-│   │   ├── Some Special.mkv
-│   │   ├── Episode S00E01.mkv
-│   │   └── Episode S00E02.mkv
-│   ├── Season 01
-│   │   ├── Episode S01E01-E02.mkv
-│   │   ├── Episode S01E03.mkv
-│   │   └── Episode S01E04.mkv
-│   └── Season 02
-│       ├── Episode S02E01.mkv
-│       └── Episode S02E02.mkv
-└── Series (2018)
-    ├── Episode S01E01.mkv
-    ├── Episode S01E02.mkv
-    ├── Episode S02E01-E02.mkv
-    └── Episode S02E03.mkv
+shows
+└── series_(2010)
+    ├── season_0
+    │   ├── series_-_behind_the_scenes_brd_uu.mkv
+    │   ├── series_-_name_interview_brd_uu.mkv
+    │   └── series_-_featurette_dvd_un.mkv
+    │
+    ├── season_1
+    │   ├── series_-_s01e01-e02_dvd_un.mkv
+    │   ├── series_-_s01e03_brd_un.mkv
+    │   └── series_-_s01e04_brd_un.mkv
+    └── season_2
+        ├── series_-_s02e01_dvd_un.mkv
+        └── series_-_s02e02_dvd_un.mkv
 ```
-
-In this case it is recommended to name the files not `S00Exy` but according to
-their content.