Mise à jour de 'dns-blacklists/adguard-home/liste.md'

Merge pull request 'Ajout + correction emplacement ghost' (#143 ) from pump into master
Reviewed-on: #143
2022-10-17 22:48:23 +02:00 · 2022-09-26 00:07:41 +02:00 · 2022-09-25 22:09:51 +02:00 · 2022-09-25 22:08:46 +02:00 · 2022-09-25 22:07:46 +02:00 · 2022-09-25 22:07:08 +02:00
54 changed files with 3271 additions and 843 deletions
--- a/Scripts-Divers/Batch
+++ b/Scripts-Divers/Batch
@ -0,0 +1,885 @@
+##==============================================================================================
+##                                                                                            ##
+##                             Batch Merge Subtitles with MKVMerge                            ##
+##                                          By Miles                                          ##
+##                   Idea from Iain McCain : https://superuser.com/a/1249870                  ##
+##                                                                                            ##
+##==============================================================================================
+##                                                                                            ##
+## Utilisation et conditions :                                                                ##
+## - Il faut que les .srt et les .mkv soient dans le même dossier.                            ##
+## - Il faut que les sous-titres externes .SRT aient le même nom de fichier que les .MKV.     ##
+## - Il faut paramétrer l'extension des fichiers de sous-titres pour que ces derniers         ##
+##      reflètent la langue : eng, fre,...                                                    ##
+## - Il faudra par ailleurs modifier le code langage dans AudioLang_X et SubTrackLang_1       ##
+## Il est possible de :                                                                       ##
+## - spécifier des dossiers sources et destinations identiques ou différents                  ##
+## - spécifier un titre de piste (pour toutes)                                                ##
+##                                                                                            ##
+##==============================================================================================
+##                                                                                            ##
+##                                         Objectifs :                                        ##
+##    Remuxer deux MKV en gardant l'audio et le(s) sous-titre du premier ou un sous-titre     ##
+##                        externe, et seulement la vidéo du second MKV                        ##
+##                                                                                            ##
+##==============================================================================================
+
+# ┌──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+# │ - MKV1 : file to keep with 2 audio, 1 internal SRT, DROP the video (720p)                                            │
+# │ - MKV2 : file to keep with only the video 1080p !                                                                    │
+# │ - SRT1 : external SRT file with same name of the MKV2 file (SRT made by extracted PGS in the MKV2 file)              │
+# │ - SRT2 : external SRT file with same name of the MKV2 file (SRT made by extracted PGS in the MKV2 file)              │
+# └──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
+
+Clear-Host
+Invoke-Command -ScriptBlock {
+    
+    # #############################################################################################
+    # -> BEGIN VARIABLES DECLARATION    -----------------------------------------------------------
+    # #############################################################################################
+
+    # Set MKVMerge.exe and MediaInfo.exe (CLI version) Path
+    $MKVMerge = "`"PATH_TO\mkvtoolnix\mkvmerge.exe`""
+    $MediaInfo = "`"PATH_TO\MediaInfo_CLI\MediaInfo.exe`""
+    # For the parameters to pass to MKVMerge executable, will be construct
+    # Set this to $true in order to merge a MKV_2 present in $sourceDirectory_2
+    $merge_another_video_MKV2 = $false      # If set to $false, $sourceDirectory_2 will be ignored.
+
+    # Don't add a \ at the end of the path...
+    $sourceDirectory_1 = "PATH_TO_SOURCE_1"
+    $sourceDirectory_2 = "PATH_TO_SOURCE_1"
+
+    $destinationDirectory = "PATH_TO_DESTINATION"
+
+    # If you want a .json file created, set this $JSON_Export to $true, set the $sourceDirectory_1_json variable to set the path for the .json file.
+    # If you don"t want a .json file, set set this $JSON_Export to $false, and let the others as they are.
+    $JSON_Export = $false    
+    $sourceDirectory_1_json = "PATH_TO_JSON_FILE"
+
+
+
+    # Remove dots before the season or the resolution ?
+    $remove_dots = $false
+    # If there is the year in the title, set it to $true
+    $set_year_with_brackets = $false
+
+    # Renaming the output file (and the video title)
+    # Use https://regex101.com/r/cU5lC2/1 to get the RegEx
+    $chain_to_search = ''
+    $chain__to_replace = ''
+
+    # $chain_to_search = '(.*) - S(\d{2})E(\d{3})(.*)H264(.*)'
+    # $chain_to_search = '(.*) - S(\d{2})E(\d{3})(.*)'
+    # $chain__to_replace = '$1 - S$2E$3$4x265-10bits$5--Custom'
+    
+    # Move MKV1 (and SRT) to Not-Merged folder ? Set to $false or $true
+    $move_mkv1_after_merge = $true
+    $move_mkv2_after_merge = $true
+
+    # Extension without the .
+    $VideoExtension_1 = "mkv"
+    $VideoExtension_2 = "mkv"
+
+    $no_attachements = $true
+
+    # ################ VIDEO to keep ##################
+    # = 0 : for video from MKV1 (first file)
+    # = 1 : for video from MKV2 (second file)
+    $Video_Lang = "ja"          # en for english / fr for french / ja for japanese
+    # ================== AUDIO ================== Common for all videos, MAX 2 audio
+    # _1 will be the first in track-name order, then _2 
+
+    # How many audio tracks to keep = 0, 1 or 2
+    $NB_Audio_MKV1 = 1
+    # This is to search for the right ID in the MKV (with JSON)
+    $AudioTrack_1_Lang = "ja"           # Set here the first audio lang to keep
+    $AudioTrack_2_Lang = "fr"           # Set here the second audio lang to keep
+    # $AudioTrack_Default_Lang = "ja"     # Set here the default audio lang to set in merge
+
+    # This is for personalizing the tracks info !
+    # Track 1 = Audio n°1
+    $AudioTrackName_1_sansID = "Japonais - AAC 2.0"
+    $AudioLang_1_sansID = "ja"                      # en for english / fr for french / ja for japanese
+    $AudioTrack_1_default_sansID = "yes"
+    # Define track order. Do not modify it unless you changed the track number in this section
+
+    # Track 2 = Audio n°2
+    # Name and language of Audio Track n°2
+    $AudioTrackName_2_sansID = "Français - Dolby Digital 2.0"
+    $AudioLang_2_sansID = "fr"                      # en for english / fr for french / ja for japanese
+    $AudioTrack_2_default_sansID = "no"
+    # Define track order. Do not modify it unless you changed the track number in this section
+    # ================================================================
+
+
+
+    # ===========================================
+    # ================== Internal SUB ? =========
+    # To keep or not internal subtitles
+    # $keep_internal_Sub = $true
+    $Internal_SUB_Number = 0            # Set this to 1 or 2 to keep 1 or 2 or 3 internal subtitles, or to 0 to keep no internal sub.
+    $Internal_SUB_Lang_1 = "fr"         # Set here the first internal subtitle lang to keep
+    $Internal_SUB_Lang_2 = "fr"         # Set here the second internal subtitle lang to keep
+    $Internal_SUB_Lang_3 = "fr"         # Set here the third internal subtitle lang to keep
+
+    # If there is 2 sub in the same language, like "FR Full" and "FR Forced", set those variables :
+    $Internal_SUB_to_search_with_title = $false      # Set this to $true if there is at least 2 internal sub in the same lang
+    $Internal_SUB_1_title_to_search = "SDH"    # Set this to a string to search in sub title to set it into the first internal sub
+    $Internal_SUB_2_title_to_search = ""    # Set this to a string to search in subtitle TITLE to set it into the second internal sub
+    $Internal_SUB_2_title_to_search = ""    # Set this to a string to search in subtitle TITLE to set it into the third internal sub
+    $Internal_SUB_to_be_forced = ""         # Set this to 1 or 2 in order to set it to forced subtitle
+
+    # Max 3 Internal SRT is configured in the script.
+    # If set to 3, must be 2 SRT configured 
+    $SubTrackName_1_sansID = "English SDH - SRT"
+    $SubTrackLang_1_sansID = "en"              # en for english / fr for french / jp for japanese
+    $SubTrack_1_default_sansID = "yes"
+    $SubTrack_1_forced_track_sansID = "no"
+    $SubTrack_1_SDH_sansID = "yes"
+    $sub_charset_1_sansID = "UTF-8"
+    
+
+    $SubTrackName_2_sansID = "Français - SRT"
+    $SubTrackLang_2_sansID = "fr"              # en for english / fr for french / jp for japanese
+    $SubTrack_2_default_sansID = "no"
+    $SubTrack_2_forced_track_sansID = "no"
+    $SubTrack_2_SDH_sansID = "no"
+    $sub_charset_2_sansID = "UTF-8"
+
+    $SubTrackName_3_sansID = "Français - SRT"
+    $SubTrackLang_3_sansID = "fr"              # en for english / fr for french / jp for japanese
+    $SubTrack_3_default_sansID = "no"
+    $SubTrack_3_forced_track_sansID = "no"
+    $SubTrack_3_SDH_sansID = "no"
+    $sub_charset_3_sansID = "UTF-8"
+    # ===========================================
+
+    # ===========================================
+    # ================== External SUB ? =========
+    # Must have the same name as MKV1
+
+    $External_SUB = $true
+    $External_SUB_Number = 1    # Works only if $External_SUB = $true
+    # Max 2 External SRT is configured in the script.
+    # If set to 2, must be 2 SRT configured 
+
+    # Set Subtitle Extension (Don't add the . before the extension)
+    $SubExtension_1 = 'Full.fre.srt'
+    $SubExtension_2 = 'Forced.fre.srt'
+
+    #### FILE 2 - SRT_1 - Keeping all but the video (audio + chapters tags)
+    # Track 0 = Sub n°1 to keep
+    # Name and language of Subtitle Track n°0 + Sync Value
+    $ExtSubTrackName_1 = "0:Français (Complet) - SRT"
+    $ExtSubTrackLang_1 = "0:fr"
+    $ExtSubTrack_1_default = "0:yes"
+    $ExtSub_charset_1 = "0:UTF-8"
+    $ExtSub_forced_track_1 = "0:no"
+    $ExtSub_SDH_1 = "0:no"
+
+    #### FILE 3 - SRT_2 - Keeping all but the video (audio + chapters tags)
+    # Track 0 = Sub n°1 to keep
+    # Name and language of Subtitle Track n°0 + Sync Value
+    $ExtSubTrackName_2 = "0:Français (Forcé) - SRT"
+    $ExtSubTrackLang_2 = "0:fr"
+    $ExtSubTrack_2_default = "0:no"
+    $ExtSub_charset_2 = "0:UTF-8"
+    $ExtSub_forced_track_2 = "0:yes"
+    $ExtSub_SDH_2 = "0:no"
+    
+    #----------------------------------------------------------------------------------------------
+    # DO NOT TOUCH WHAT'S UNDER THIS    -----------------------------------------------------------
+    #----------------------------------------------------------------------------------------------
+
+    # #############################################################################################
+    # -> BEGIN FUNCTION DEFINITIONS     -----------------------------------------------------------
+    # #############################################################################################
+
+    function Get-Track_ID {
+        param (
+            [Parameter(Mandatory)]$MediaInfo,
+            [Parameter(Mandatory)]$MKV_1,
+            [Parameter(Mandatory)][ValidateSet(1, 2)]$NB_Audio_MKV1,
+            [Parameter(Mandatory)]$AudioTrack_1_Lang,
+            [Parameter(Mandatory)]$AudioTrack_2_Lang,
+            [Parameter(Mandatory)][ValidateSet(0, 1, 2, 3)]$Internal_SUB_Number,
+            [Parameter(Mandatory)]$Internal_SUB_Lang_1,
+            [Parameter(Mandatory)]$Internal_SUB_Lang_2,
+            [Parameter(Mandatory)]$Internal_SUB_Lang_3,
+            [Parameter(Mandatory)][ValidateSet($true, $false)]$Internal_SUB_to_search_with_title,
+            [Parameter(Mandatory)]$Internal_SUB_1_title_to_search = "",
+            [Parameter(Mandatory)]$Internal_SUB_2_title_to_search = "",
+            [Parameter(Mandatory)]$Internal_SUB_3_title_to_search = "",
+            [Parameter(Mandatory = $false)][ValidateSet($true, $false)]$JSON_Export = $false,
+            [Parameter(Mandatory = $false)]$JSON_file = ""
+        )
+
+        # Values witch will be found with MediaInfo JSON
+        $VideoTrack_ID = ""
+        $AudioTrack_1_ID = ""
+        $AudioTrack_2_ID = ""
+        $Internal_Sub_1_ID = ""
+        $Internal_Sub_2_ID = ""
+        $Internal_Sub_3_ID = ""
+
+        $JSON_video_position = ""       # To use with $JSON_object.media.Track[ ]
+        $JSON_audio_1_position = ""     # To use with $JSON_object.media.Track[ ]
+        $JSON_audio_2_position = ""     # To use with $JSON_object.media.Track[ ]
+        $JSON_sub_1_position = ""
+        $JSON_sub_2_position = ""
+        $JSON_sub_3_position = ""
+
+        if (( $JSON_Export -eq $true) -And ( $JSON_file -ne "")) {
+            $MediaInfo_arguments = "--output=JSON --LogFile=`"$JSON_file`""
+        }
+        else {
+            if ( $JSON_Export -eq $false ) {
+                Write-Host "`tNo JSON file will be created..." -ForegroundColor "White" -BackgroundColor "DarkRed"
+            }
+            elseif ( $JSON_file -eq "") {
+                Write-Host "`tNo JSON file is pass in Get-Track_ID function parameters !!`n`tThere will not be any JSON file created..." -ForegroundColor "White" -BackgroundColor "DarkRed"
+            }
+            $MediaInfo_arguments = "--output=JSON"
+        }
+        $command_info = "& $MediaInfo $MediaInfo_arguments `"$MKV_1`""
+        # Launch command begin... and we're grabbing the output into json_output
+        $json_output = Invoke-Expression $command_info
+        # Write-Host "`$json_output = `n$json_output" -ForegroundColor "green"
+        # $JSON_object = Get-Content -Raw -Path "$JSON_file" | ConvertFrom-Json
+        $JSON_object = $json_output | ConvertFrom-Json
+
+
+        $i = 0      # Counter for video track detected
+        $j = 0      # Counter for audio track detected
+        $k = 0      # Counter for audio tracks kept
+        $l = 0      # Counter for track position
+        $m = 0      # Counter for sub track detected
+        $n = 0      # Counter for sub tracks kept
+        $JSON_VideoCount = $JSON_object.media.Track[0].VideoCount
+        $JSON_AudioCount = $JSON_object.media.Track[0].AudioCount
+        $JSON_SubCount = $JSON_object.media.Track[0].TextCount
+
+        foreach ( $track in $JSON_object.media.Track ) {
+            # Note :
+            # The reel track ID is 1 minus the ID get in JSON...
+
+            # Check if there is a bug in the script
+            if ( $j -gt $JSON_AudioCount ) {
+                Write-Host "`tThere is a problem in Audio Track detection from JSON !! Need to debug this !!" -ForegroundColor "White" -BackgroundColor "DarkRed"
+                Exit
+            }
+            elseif ( $i -gt $JSON_VideoCount ) {
+                Write-Host "`tThere is a problem in Video Track detection from JSON !! Need to debug this !!" -ForegroundColor "White" -BackgroundColor "DarkRed"
+                Exit
+            }
+            elseif ( ( $m -gt $JSON_SubCount ) -And ( $JSON_SubCount -ne $null ) ) {
+                Write-Host "`tThere is a problem in Subtitles Track detection from JSON !! Need to debug this !!" -ForegroundColor "White" -BackgroundColor "DarkRed"
+                Exit
+            }
+
+            if ( $track."@type" -match "Video" ) {
+                $VideoTrack_ID = $track.id - 1
+                $i++
+                $JSON_video_position = $l
+            }
+            elseif ( $track."@type" -match "Audio" ) {
+                $j++
+
+                if (( $track."Language" -match "$AudioTrack_1_Lang" ) -And ( $AudioTrack_1_ID -eq "" ) -And ( $k -ne $NB_Audio_MKV1)) {
+                    $AudioTrack_1_ID = $track.id - 1
+                    $k++
+                    $JSON_audio_1_position = $l
+                }
+                elseif (( $track."Language" -match "$AudioTrack_2_Lang" ) -And ( $AudioTrack_2_ID -eq "" ) -And ( $k -ne $NB_Audio_MKV1)) {
+                    $AudioTrack_2_ID = $track.id - 1
+                    $k++
+                    $JSON_audio_2_position = $l
+                }
+                else {
+                    if (( $AudioTrack_1_ID -eq "" ) -And ( $AudioTrack_2_ID -eq "" )) {
+                        Write-Host "`tThere is no audio tracks that match your specifications." -ForegroundColor "Yellow"
+                    }
+                    else {
+                        Write-Host "`tThere is no audio tracks that match your specifications." -ForegroundColor "Yellow"
+                    }
+                }
+            }
+            elseif ( $track."@type" -match "Text" ) {
+                $m++
+                if ($Internal_SUB_Number -ne 0 ) {
+                    if ( ( $Internal_SUB_Lang_1 -ne "" ) -And ( $track."Language" -match "$Internal_SUB_Lang_1" ) -And ( $Internal_Sub_1_ID -eq "" ) -And ( $n -ne $Internal_SUB_Number ) -And (( $Internal_SUB_to_search_with_title -eq $false ) -OR (( $Internal_SUB_to_search_with_title -eq $true ) -And ( $track.Title -match "$Internal_SUB_1_title_to_search" )) ) ) {
+                        $Internal_Sub_1_ID = $track.id - 1
+                        $n++
+                        $JSON_sub_1_position = $l
+                    }
+                    elseif ( ( $Internal_SUB_Lang_2 -ne "" ) -And ( $track."Language" -match "$Internal_SUB_Lang_2" ) -And ( $Internal_Sub_2_ID -eq "" ) -And ( $n -ne $Internal_SUB_Number) -And (( $Internal_SUB_to_search_with_title -eq $false ) -OR (( $Internal_SUB_to_search_with_title -eq $true ) -And ( $track.Title -match "$Internal_SUB_2_title_to_search" )) ) ) {
+                        $Internal_Sub_2_ID = $track.id - 1
+                        $n++
+                        $JSON_sub_2_position = $l
+                    }
+                    elseif ( ( $Internal_SUB_Lang_3 -ne "" ) -And ( $track."Language" -match "$Internal_SUB_Lang_3" ) -And ( $Internal_Sub_3_ID -eq "" ) -And ( $n -ne $Internal_SUB_Number) -And (( $Internal_SUB_to_search_with_title -eq $false ) -OR (( $Internal_SUB_to_search_with_title -eq $true ) -And ( $track.Title -match "$Internal_SUB_3_title_to_search" )) ) ) {
+                        $Internal_Sub_3_ID = $track.id - 1
+                        $n++
+                        $JSON_sub_3_position = $l
+                    }
+                    else {
+                        
+                    }
+                }
+                else {
+                    # Some Internal Sub are present, but we don't care, we don't keep it/them...
+                    Write-Host "`tThere is some internal subtitle tracks, but you choose to not keep it/them..." -ForegroundColor "Cyan"
+                }
+            }
+            
+            $l++    # Increment number of track processed
+        }
+        if ($Internal_SUB_Number -ne 0 ) {
+            # Checking if there are the right number of IDs retrieved
+            if ( ( $Internal_SUB_Number -ne 0 ) -And ( $JSON_SubCount -eq 0 ) ) {
+                Write-Host "`tYou choose to keep at least one internal subtitle, but there isn't any in the MKV..." -ForegroundColor "Red"
+            }
+            
+            
+            if (( $Internal_Sub_1_ID -eq "" ) -And ( $Internal_Sub_2_ID -eq "" ) -And ( $Internal_Sub_3_ID -eq "" )) {
+                Write-Host "`tThere is no internal subtitle tracks that match your specifications." -ForegroundColor "Yellow"
+            }
+            else {
+                $counter = 0
+                if ( $Internal_Sub_1_ID -ne "" ) {
+                    $counter++
+                }
+                if ( $Internal_Sub_2_ID -ne "" ) {
+                    $counter++
+                }
+                if ( $Internal_Sub_3_ID -ne "" ) {
+                    $counter++
+                }
+                if ( $counter -lt $Internal_SUB_Number ) {
+                    # Not all desired subtitles are retrieved
+                    Write-Host "`tNot all desired subtitles are retrieved..." -ForegroundColor "Red"
+                    if (( $Internal_SUB_Number -ge 1 ) -And ( $Internal_Sub_1_ID -eq "" )) {
+                        Write-Host "`tThere is no internal subtitle tracks that match your specification language : $Internal_SUB_Lang_1." -ForegroundColor "Yellow"
+                    }
+                    if (( $Internal_SUB_Number -ge 2 ) -And ( $Internal_Sub_2_ID -eq "" )) {
+                        Write-Host "`tThere is no internal subtitle tracks that match your specification language : $Internal_SUB_Lang_2." -ForegroundColor "Yellow"
+                    }
+                    if (( $Internal_SUB_Number -eq 3 ) -And ( $Internal_Sub_3_ID -eq "" )) {
+                        Write-Host "`tThere is no internal subtitle tracks that match your specification language : $Internal_SUB_Lang_3." -ForegroundColor "Yellow"
+                    }
+                }
+                
+                
+                
+                # Write-Host "`tThere is no internal subtitle tracks that match your specifications." -ForegroundColor "Yellow"
+            }
+        }
+
+        # if ( ( $Internal_SUB_Number -eq 1 ) -And ( $Internal_Sub_1_ID -eq "" ) ) {
+        #     Write-Host "`tYou choose to keep one internal subtitle, but there isn't any in the MKV..." -ForegroundColor "Red"
+        # }
+        # elseif ( ( $Internal_SUB_Number -eq 2 ) -And ( ($Internal_Sub_1_ID -eq "") -Or ($Internal_Sub_2_ID -eq "") ) ) {
+        #     if ( $Internal_Sub_1_ID -eq "" ) {
+        #         Write-Host "`tYou choose to keep two internal subtitle, but there isn't any in the MKV..." -ForegroundColor "Yellow"
+        #     }
+        # }
+        # elseif ( ( $Internal_SUB_Number -eq 2 ) -And ( ($Internal_Sub_1_ID -eq "") -And ($Internal_Sub_2_ID -eq "") ) ) {
+        #     Write-Host "`tYou choose to keep two internal subtitle, but there isn't any in the MKV..." -ForegroundColor "Yellow"
+        # }
+        # elseif ( ( $Internal_SUB_Number -eq 2 ) -And ( ($Internal_Sub_1_ID -ne "") -And ($Internal_Sub_2_ID -ne "") -And ($Internal_Sub_3_ID -eq "") ) ) {
+        #     Write-Host "`tOnly Two Internal Subtitles ID have been retrieved ! Great !" -ForegroundColor "Yellow"
+        # }
+        # elseif ( ( $Internal_SUB_Number -eq 3 ) -And ( ($Internal_Sub_1_ID -ne "") -And ($Internal_Sub_2_ID -ne "") -And ($Internal_Sub_3_ID -ne "") ) ) {
+        #     Write-Host "`tOnly Three Internal Subtitles ID have been retrieved ! Great !" -ForegroundColor "Yellow"
+        # }
+        
+        Write-Host "`t`$VideoTrack_ID = $VideoTrack_ID" -ForegroundColor "Yellow"
+        if ($NB_Audio_MKV1 -ge 1) {
+            Write-Host "`t`$AudioTrack_1_ID = $AudioTrack_1_ID`tLang set in the script = $AudioTrack_1_Lang" -ForegroundColor "Yellow"
+            if ($NB_Audio_MKV1 -eq 2) {
+                Write-Host "`t`$AudioTrack_2_ID = $AudioTrack_2_ID`tLang set in the script = $AudioTrack_2_Lang" -ForegroundColor "Yellow"
+            }
+        }
+        
+        if ( $Internal_SUB_Number -ne 0 ) {
+            Write-Host "`t`$Internal_Sub_1_ID = $Internal_Sub_1_ID`tLang set in the script = $Internal_SUB_Lang_1" ( &{ If ($Internal_SUB_to_search_with_title -eq $true) { "`tSearched Title was : $Internal_SUB_1_title_to_search" } Else { "" } }) -ForegroundColor "Yellow"
+            if ($Internal_SUB_Number -ge 2) {
+                Write-Host "`t`$Internal_Sub_2_ID = $Internal_Sub_2_ID`tLang set in the script = $Internal_SUB_Lang_2" ( &{ If ($Internal_SUB_to_search_with_title -eq $true) { "`tSearched Title was : $Internal_SUB_2_title_to_search" } Else { "" } }) -ForegroundColor "Yellow"
+                if ($Internal_SUB_Number -eq 3) {
+                    Write-Host "`t`$Internal_Sub_3_ID = $Internal_Sub_3_ID`tLang set in the script = $Internal_SUB_Lang_3" ( &{ If ($Internal_SUB_to_search_with_title -eq $true) { "`tSearched Title was : $Internal_SUB_3_title_to_search" } Else { "" } }) -ForegroundColor "Yellow"        
+                }
+            }
+        }
+
+        return $VideoTrack_ID, $AudioTrack_1_ID, $AudioTrack_2_ID, $Internal_Sub_1_ID, $Internal_Sub_2_ID, $Internal_Sub_3_ID
+    }
+
+    function Test-Directory {
+        param (
+            [Parameter(Mandatory)]$path_to_verify
+        )
+        If (!(test-path $path_to_verify)) {
+            New-Item -ItemType "Directory" -Force -Path $path_to_verify
+            Write-Host "The path $path_to_verify (or one of the last subfolder) didn't exist. It has been created." -ForegroundColor "DarkBlue"
+        }
+    }
+
+
+    # #############################################################################################
+    # -> BEGIN MAIN SCRIPT      -------------------------------------------------------------------
+    # #############################################################################################
+
+    # Resetting some variables that should be equal to ""
+    if ( $NB_Audio_MKV1 -eq 0 ) {
+        $AudioTrack_1_Lang = ""
+        $AudioTrack_2_Lang = ""
+    }
+    elseif ( $NB_Audio_MKV1 -eq 1 ) {
+        $AudioTrack_2_Lang = ""
+    }
+
+    if ( $Internal_SUB_Number -eq 0 ) {
+        $Internal_SUB_Lang_1 = ""
+        $Internal_SUB_Lang_2 = ""
+        $Internal_SUB_Lang_3 = ""
+    }
+    elseif ( $Internal_SUB_Number -eq 1 ) {
+        $Internal_SUB_Lang_2 = ""
+        $Internal_SUB_Lang_3 = ""
+    }
+    elseif ( $Internal_SUB_Number -eq 2 ) {
+        $Internal_SUB_Lang_3 = ""
+    }
+    # -------------------------------------------------
+
+    # Define track order - DO NOT TOUCH
+    $track_order_EXT_sub = ""
+    if ( $merge_another_video_MKV2 -eq $false) {
+        if ( $External_SUB -eq $true ) {
+            if ( $External_SUB_Number -ge 1 ) {
+                $track_order_EXT_sub += "1:0"
+                if ( $External_SUB_Number -eq 2 ) {
+                    $track_order_EXT_sub += ",2:0"
+                }
+            }
+        }
+    }
+    else {
+        if ( $External_SUB -eq $true ) {
+            if ( $External_SUB_Number -ge 1 ) {
+                $track_order_EXT_sub += "2:0"
+                if ( $External_SUB_Number -eq 2 ) {
+                    $track_order_EXT_sub += ",3:0"
+                }
+            }
+        }
+    }
+    
+    # ===========================================
+
+    # Checking if the $destinationDirectory exists, if not, create the folder(s)
+    Test-Directory $destinationDirectory
+
+    # Counting the number of MKV_1
+    $MKV_1_List = Get-ChildItem $sourceDirectory_1 -Filter "*.$VideoExtension_1" | ForEach-Object { $_.FullName } | Sort-Object
+    $Count_1 = $MKV_1_List.count
+    Write-Host "$Count_1 Videos ($VideoExtension_1) to be processed in $sourceDirectory_1."
+    # Testing if the Done_Remerged folder already exists : if yes, it will be renamed, else it will be created.
+    $Path_Folder_NotMerged_1 = $sourceDirectory_1 + "\Done_Remerged"
+    Test-Directory $Path_Folder_NotMerged_1
+
+    if ($merge_another_video_MKV2 -eq $true) {
+        # Counting the number of MKV_1
+        $MKV_2_List = Get-ChildItem $sourceDirectory_2 -Filter "*.$VideoExtension_2" | ForEach-Object { $_.FullName } | Sort-Object
+        $Count_2 = $MKV_2_List.count
+        Write-Host "$Count_2 MKV's to be processed in $sourceDirectory_2."    
+        # Testing if the Done_Remerged folder already exists : if yes, it will be renamed, else it will be created.
+        $Path_Folder_NotMerged_2 = $sourceDirectory_2 + "\Done_Remerged"
+        Test-Directory $Path_Folder_NotMerged_2
+
+
+        # #########################
+        # Check if there is the same .mkv files in both source directory
+        if ($Count_1 -eq $Count_2) {
+            Write-Host "There is the same number of MKV in the two sources folders. Let's continue."
+        }
+        else {
+            Write-Host "The number of MKV in the two sources folders isn't the same. ABORT..." -foreground "red"
+            Exit
+        }
+        # #########################
+    }
+
+    # #########################
+    # Check if there is the same number of .srt files as .mkv files
+    if ( $External_SUB -eq $true ) {
+        if ( $External_SUB_Number -ge 1 ) {
+            # If $NB_External_SUB >= 1 (include =1 and =2)
+            $SRT_1_List = Get-ChildItem $sourceDirectory_1 -Filter "*.$SubExtension_1" | ForEach-Object { $_.FullName } | Sort-Object
+            $Count_1_SRT = $SRT_1_List.count
+            Write-Host "$Count_1_SRT SRT's ($SubExtension_1) to be processed in $sourceDirectory_1."
+            if ($Count_1 -eq $Count_1_SRT) {
+                Write-Host "There is the same number of MKV and SRT n°1 files ($SubExtension_1) in this folder. Let's continue."
+            }
+            else {
+                Write-Host "The number of MKV and SRT n°1 files isn't the same. ABORT..." -foreground "red"
+                Exit
+            }
+        }
+        
+        if ( $External_SUB_Number -eq 2 ) {
+            # Only if $External_SUB_Number = 2
+            $SRT_2_List = Get-ChildItem $sourceDirectory_1 -Filter "*.$SubExtension_2" | ForEach-Object { $_.FullName } | Sort-Object
+            $Count_2_SRT = $SRT_2_List.count
+            Write-Host "$Count_2_SRT SRT's ($SubExtension_2) to be processed in $sourceDirectory_1."
+
+            if ($Count_1 -eq $Count_2_SRT) {
+                Write-Host "There is the same number of MKV and SRT n°2 files ($SubExtension_2) in this folder. Let's continue."
+            }
+            else {
+                Write-Host "The number of MKV and SRT n°2 files ($SubExtension_2) isn't the same. ABORT..." -foreground "red"
+                Exit
+            }
+        }
+    }
+    # #########################
+
+    $compteur = 1       # Counter to show the progress of file processed
+
+    Foreach ($MKV_1 in $MKV_1_List) {
+    
+        Write-Host "" -ForegroundColor "black" -BackgroundColor "white"
+        Write-Host "Traitement du fichier n° $compteur / $Count_1..." -ForegroundColor "black" -BackgroundColor "white"
+        Write-Host "" -ForegroundColor "black" -BackgroundColor "white"
+
+        # Clear variables
+        $MKVMerge_param_start = ""
+        $MKVMerge_param_mkv1 = ""
+        $MKVMerge_param_srt1 = ""
+        $MKVMerge_param_srt2 = ""
+        $MKVMerge_param_all = ""
+        $MKVMerge_sub_param = ""
+        $SRT_1_Name = ""
+        $SRT_2_Name = ""
+        $SRT_1 = ""
+        $SRT_2 = ""
+        $SubTrackName_1 = ""
+        $SubTrackLang_1 = ""
+        $SubTrack_1_default = ""
+        $sub_charset_1 = ""
+        $SubTrackName_2 = ""
+        $SubTrackLang_2 = ""
+        $SubTrack_2_default = ""
+        $sub_charset_2 = ""
+        $track_order = ""
+        $VideoTrack_ID, $AudioTrack_1_ID, $AudioTrack_2_ID = "", "", ""
+        $Internal_Sub_1_ID, $Internal_Sub_2_ID, $Internal_Sub_3_ID = "", "", ""
+        $MKVMerge_audio_param = ""
+        
+        $FormatName_1 = (Get-Item $MKV_1).Basename
+        $MKV_1_name = $FormatName_1.ToString()
+
+        # #################################################################
+        # Title for the video track and for the destination file $Output
+        $VideoTrackName = $MKV_1_name
+        if ( $set_year_with_brackets -eq $true ) {
+            if ( $type_media -eq "movie" ) {
+                $VideoTrackName = $VideoTrackName -replace '(\d{4}(?=\..*))', '($1)'
+            }
+            elseif ( $type_media -eq "serie" ) {
+                $VideoTrackName = $VideoTrackName -replace '(\d{4}(?=.*S\d{2}E\d{2}))', '($1)'
+            }
+        }
+        if ( $remove_dots -eq $true ) {
+            if ( $type_media -eq "movie" ) {
+                $VideoTrackName = $VideoTrackName -replace '\.(?=.*\d{4})', ' '
+            }
+            elseif ( $type_media -eq "serie" ) {
+                $VideoTrackName = $VideoTrackName -replace '\.(?=.*S\d{2}E\d{2})', ' '
+            }
+        }
+        $VideoTrackName = $VideoTrackName -replace $chain_to_search, $chain__to_replace
+        $VideoTrackName = "$VideoTrackName"
+        Write-Host "`tThe Video Track Name will be : `r`n`t`t  $VideoTrackName" -ForegroundColor "green"
+        if ( $compteur -le 3 ) {
+            # Will prompt for a key to be pressed for the 3 first names
+            Write-Host "`tFor the 3 first file, this will show up, and pause for 10s" -ForegroundColor "yellow";
+            Start-Sleep -Seconds 10
+        }
+        $Output = "$destinationDirectory" + "\" + "$VideoTrackName" + ".mkv"
+        $JSON_file = "$sourceDirectory_1_json\$MKV_1_name.json"
+        # #################################################################
+
+        # Now we'll get the track ID for the MKV in action !
+        $VideoTrack_ID, $AudioTrack_1_ID, $AudioTrack_2_ID, $Internal_Sub_1_ID, $Internal_Sub_2_ID, $Internal_Sub_3_ID = Get-Track_ID $MediaInfo $MKV_1 $NB_Audio_MKV1 $AudioTrack_1_Lang $AudioTrack_2_Lang $Internal_SUB_Number $Internal_SUB_Lang_1 $Internal_SUB_Lang_2 $Internal_SUB_Lang_3 $Internal_SUB_to_search_with_title $Internal_SUB_1_title_to_search $Internal_SUB_2_title_to_search $Internal_SUB_3_title_to_search $JSON_Export $JSON_file
+
+        # Exception for some files !!! -----------------------------------------------------------------
+        if ( $MKV_1_name.Substring(0, 26) -eq "One Piece (1999) - S20E001" ) {
+            $AudioTrack_1_ID = 2        # Manual set for 1st audio track in final MKV
+            $AudioTrack_2_ID = 1        # Manual set for 2nd audio track in final MKV
+            Write-Host "`tThis file doesn't have correct track language. We set it to :`n`t`t`$AudioTrack_1_ID = $AudioTrack_1_ID`t for audio lang 1 = $AudioTrack_1_Lang`n`t`t`$AudioTrack_2_ID = $AudioTrack_2_ID." -ForegroundColor "White" -BackgroundColor "DarkRed"
+        }
+        # if ( $MKV_1_name.Substring(0, 26) -eq "One Piece (1999) - S18E001" ) {
+        #     $AudioTrackName_1_sansID = "Japonais - AAC 2.0"
+        #     $AudioTrackName_2_sansID = "Français - AAC 2.0"
+        #     Write-Host "`tThis file doesn't have correct track language. We set it to : `$AudioTrack_1_ID = $AudioTrack_1_ID`tand`t`$AudioTrack_2_ID = $AudioTrack_2_ID."
+        # }
+        # if ( $MKV_1_name.Substring(0, 26) -eq "One Piece (1999) - S18E008" ) {
+        #     $AudioTrack_1_ID = 2
+        #     $AudioTrack_2_ID = 1
+        #     Write-Host "`tThis file doesn't have correct track language. We set it to : `$AudioTrack_1_ID = $AudioTrack_1_ID`tand`t`$AudioTrack_2_ID = $AudioTrack_2_ID."
+        # }
+        # if ( $MKV_1_name.Substring(0, 26) -eq "One Piece (1999) - S18E020" ) {
+        #     $AudioTrack_1_ID = 2
+        #     $AudioTrack_2_ID = 1
+        #     Write-Host "`tThis file doesn't have correct track language. We set it to : `$AudioTrack_1_ID = $AudioTrack_1_ID`tand`t`$AudioTrack_2_ID = $AudioTrack_2_ID."
+        # }
+
+
+        # End of Exceptions ----------------------------------------------------------------------------
+
+        if ( $merge_another_video_MKV2 -eq $false ) {
+            # Only 1 MKV is to re-merge
+            # We keep video and audio from MKV_1
+            if (( $NB_Audio_MKV1 -gt 0 ) -and ($NB_Audio_MKV1 -le 2)) {
+                # $NB_Audio_MKV1 = 1 or 2
+                $MKVMerge_audio_param = "--language $AudioTrack_1_ID" + ":$AudioLang_1_sansID --track-name `"$AudioTrack_1_ID" + ":$AudioTrackName_1_sansID`" --default-track $AudioTrack_1_ID" + ":$AudioTrack_1_default_sansID"
+                $track_order = "$VideoTrack_ID" + ":0,0:$AudioTrack_1_ID"
+                if ( $NB_Audio_MKV1 -eq 2 ) {
+                    $MKVMerge_audio_param += " --language $AudioTrack_2_ID" + ":$AudioLang_2_sansID --track-name `"$AudioTrack_2_ID" + ":$AudioTrackName_2_sansID`" --default-track $AudioTrack_2_ID" + ":$AudioTrack_2_default_sansID"
+                    $track_order += ",0:$AudioTrack_2_ID"
+                }
+            }
+            elseif ($NB_Audio_MKV1 -ne 0) {
+                write-host "Problem with `$NB_Audio_MKV1=$NB_Audio_MKV1.`n`$NB_Audio_MKV1 must be set to : 0, 1 or 2" -ForegroundColor "Red"
+                exit
+            }
+
+        }
+        else {
+            # 2 MKV are to be merged, keeping audio from MKV_1 and only video from MKV_2
+            
+            # We change the video track ID because it's on the MKV_2 !!
+            $VideoTrack_ID = "0"    # May not be usefull... TO-DO !!!!
+            
+            # ########################################################
+            # Extracting the episode number of the OnePiece Serie (must be commented if not used...)
+            # Generating pattern string to search for the right MKV2 file in case of filename differents...
+
+            # $MKV1_search_pattern = '(.*) - (\d{3}) -(.*)'
+            # # $chain__to_replace = ''
+            # $MKV1_chain_to_replace_for_MKV2 = '$1 - $2'
+            # $MKV_2_search_pattern = $MKV_1_name -replace $MKV1_search_pattern, $MKV1_chain_to_replace_for_MKV2
+
+            $MKV_2_search_pattern = $MKV_1_name
+            # Get MKV2 filename
+            $MKV_2_file = get-ChildItem $sourceDirectory_2 | where { $_.name -like "*$MKV_2_search_pattern*" } | select name
+            $FormatName_2 = $MKV_2_file.Name.ToString()
+            $MKV_2_name = $FormatName_2.Substring(0, $FormatName_2.Length - ($VideoExtension_2.Length + 1))
+            $MKV_2 = $sourceDirectory_2 + "\" + $MKV_2_name + ".$VideoExtension_2"
+
+            # Now that MKV_2 is defined, we can create the MKVmerge parameters, witch will be common to all merge.
+            $MKVMerge_param_mkv2 = "--no-audio --no-subtitles --no-track-tags --no-global-tags --language 0:$Video_Lang --track-name `"0:$VideoTrackName`" --default-track 0:yes `"$MKV_2`""
+
+            
+
+            if (( $NB_Audio_MKV1 -gt 0 ) -and ($NB_Audio_MKV1 -le 2)) {
+                # $NB_Audio_MKV1 = 1 or 2
+                $MKVMerge_audio_param = "--language $AudioTrack_1_ID" + ":$AudioLang_1_sansID --track-name `"$AudioTrack_1_ID" + ":$AudioTrackName_1_sansID`" --default-track $AudioTrack_1_ID" + ":$AudioTrack_1_default_sansID"
+                $track_order = "1:0,0:$AudioTrack_1_ID"
+                if ( $NB_Audio_MKV1 -eq 2 ) {
+                    $MKVMerge_audio_param += " --language $AudioTrack_2_ID" + ":$AudioLang_2_sansID --track-name `"$AudioTrack_2_ID" + ":$AudioTrackName_2_sansID`" --default-track $AudioTrack_2_ID" + ":$AudioTrack_2_default_sansID"
+                    $track_order += ",0:$AudioTrack_2_ID"
+                }
+            }
+            elseif ($NB_Audio_MKV1 -ne 0) {
+                write-host "Problem with `$NB_Audio_MKV1=$NB_Audio_MKV1.`n`$NB_Audio_MKV1 must be set to : 0, 1 or 2" -ForegroundColor "Red"
+                exit
+            }
+
+        }
+
+
+        if ( $Internal_SUB_Number -ne 0 ) {  
+
+            # Sub n°1 to keep
+            # Name and language of Subtitle Track n°1 + Sync Value
+            $SubTrackName_1 = "$Internal_Sub_1_ID" + ":$SubTrackName_1_sansID"
+            $SubTrackLang_1 = "$Internal_Sub_1_ID" + ":$SubTrackLang_1_sansID"
+            $SubTrack_1_default = "$Internal_Sub_1_ID" + ":$SubTrack_1_default_sansID"
+            $SubTrack_1_forced_track = "$Internal_Sub_1_ID" + ":$SubTrack_1_forced_track_sansID"
+            $SubTrack_1_SDH = "$Internal_Sub_1_ID" + ":$SubTrack_1_SDH_sansID"
+            $sub_charset_1 = "$Internal_Sub_1_ID" + ":$sub_charset_1_sansID"
+            # Define track order
+            $track_order += ",0:$Internal_Sub_1_ID"
+            $subtitle_tracks = "$Internal_Sub_1_ID"
+            $MKVMerge_sub_param = "--sub-charset $sub_charset_1 --language $SubTrackLang_1 --track-name `"$SubTrackName_1`" --default-track $SubTrack_1_default --forced-track $SubTrack_1_forced_track --hearing-impaired-flag $SubTrack_1_SDH"
+
+            if ( $Internal_SUB_Number -ge 2 ) {
+                # Sub n°2 to keep
+                # Name and language of Subtitle Track n°1 + Sync Value
+                $SubTrackName_2 = "$Internal_Sub_2_ID" + ":$SubTrackName_2_sansID"
+                $SubTrackLang_2 = "$Internal_Sub_2_ID" + ":$SubTrackLang_2_sansID"
+                $SubTrack_2_default = "$Internal_Sub_2_ID" + ":$SubTrack_2_default_sansID"
+                $SubTrack_2_forced_track = "$Internal_Sub_2_ID" + ":$SubTrack_2_forced_track_sansID"
+                $SubTrack_2_SDH = "$Internal_Sub_2_ID" + ":$SubTrack_2_SDH_sansID"
+                $sub_charset_2 = "$Internal_Sub_2_ID" + ":$sub_charset_2_sansID"
+                # Define track order
+                $track_order += ",0:$Internal_Sub_2_ID"
+                $subtitle_tracks += ",$Internal_Sub_2_ID"
+                $MKVMerge_sub_param += " --sub-charset $sub_charset_2 --language $SubTrackLang_2 --track-name `"$SubTrackName_2`" --default-track $SubTrack_2_default --forced-track $SubTrack_2_forced_track --hearing-impaired-flag $SubTrack_2_SDH"
+            }
+            if ( $Internal_SUB_Number -eq 3 ) {
+                # Sub n°3 to keep
+                # Name and language of Subtitle Track n°1 + Sync Value
+                $SubTrackName_3 = "$Internal_Sub_3_ID" + ":$SubTrackName_3_sansID"
+                $SubTrackLang_3 = "$Internal_Sub_3_ID" + ":$SubTrackLang_3_sansID"
+                $SubTrack_3_default = "$Internal_Sub_3_ID" + ":$SubTrack_3_default_sansID"
+                $SubTrack_3_forced_track = "$Internal_Sub_3_ID" + ":$SubTrack_3_forced_track_sansID"
+                $SubTrack_3_SDH = "$Internal_Sub_3_ID" + ":$SubTrack_3_SDH_sansID"
+                $sub_charset_3 = "$Internal_Sub_3_ID" + ":$sub_charset_3_sansID"
+                # Define track order
+                $track_order += ",0:$Internal_Sub_3_ID"
+                $subtitle_tracks += ",$Internal_Sub_3_ID"
+                $MKVMerge_sub_param += " --sub-charset $sub_charset_3 --language $SubTrackLang_3 --track-name `"$SubTrackName_3`" --default-track $SubTrack_3_default --forced-track $SubTrack_3_forced_track --hearing-impaired-flag $SubTrack_3_SDH"
+            }
+            $subtitle_tracks = "`"$subtitle_tracks`""
+        }
+
+        if ( ( $External_SUB_Number -ne 0 ) -and ( $External_SUB -eq $true ) ) {
+            
+            # First external SRT to include
+            $SRT_1_Name = $MKV_1_name + ".$SubExtension_1"
+            $SRT_1 = $sourceDirectory_1 + "\" + $SRT_1_name
+            
+            # Subtitles are elsewhere...
+            # $SRT_1_Name = "3_English.srt"
+            # $SRT_1 = $sourceDirectory_1 + "\" + $SRT_1_name
+            # $SRT_1 = $sourceDirectory_1 + "\Subs\" + $MKV_1_name + "\" + $SRT_1_name
+            
+            If (-Not (Test-Path $SRT_1) ) {
+                Write-Host "File NON-EXISTANT - $SRT_1" -ForegroundColor "Red"
+                Write-Host "Check the filename or the script. ABORT..." -ForegroundColor "Red"
+                Exit
+            }
+            $track_order += ",$track_order_EXT_sub"
+
+            $MKVMerge_param_srt1 = "--sub-charset $Extsub_charset_1 --language $ExtSubTrackLang_1 --track-name `"$ExtSubTrackName_1`" --default-track $ExtSubTrack_1_default --forced-track $ExtSub_forced_track_1 --hearing-impaired-flag $ExtSub_SDH_1 `"$SRT_1`""
+
+            if ( $External_SUB_Number -eq 2 ) {
+                # Second external SRT to include
+                $SRT_2_Name = $MKV_1_name + ".$SubExtension_2"
+                $SRT_2 = $sourceDirectory_1 + "\" + $SRT_2_name
+
+                # Subtitles are elsewhere...
+                # $SRT_2_Name = "3_English.srt"
+                # $SRT_2 = $sourceDirectory_1 + "\" + $SRT_2_name
+                # $SRT_2 = $sourceDirectory_1 + "\Subs\" + $MKV_1_name + "\" + $SRT_2_name
+
+                $MKVMerge_param_srt2 = "--sub-charset $Extsub_charset_2 --language $ExtSubTrackLang_2 --track-name `"$ExtSubTrackName_2`" --default-track $ExtSubTrack_2_default --forced-track $ExtSub_forced_track_2 --hearing-impaired-flag $ExtSub_SDH_2 `"$SRT_2`""
+            }
+        }
+
+        $MKVMerge_param_start = "--output `"$Output`" --title `"$VideoTrackName`" --track-order `"$track_order`""
+        
+        if ( $Internal_SUB_Number -eq 0 ) {
+            $MKVMerge_param_start += " --no-subtitles"
+        }
+        else {            
+            # Part for internal subtitles
+            $MKVMerge_param_start += " --subtitle-tracks $subtitle_tracks"
+        }
+
+
+        if ($merge_another_video_MKV2 -eq $false) {
+            # Video is from MKV_1
+            $MKVMerge_param_start += " --track-name `"$VideoTrack_ID" + ":$VideoTrackName`" --default-track $VideoTrack_ID" + ":yes --language $VideoTrack_ID" + ":$Video_Lang"
+        }
+        else {
+            # If Video is from MKV_2, we don't want the video from MKV_1 added...
+            $MKVMerge_param_start += " --no-video"
+        }
+        
+        
+        if ( $no_attachements -eq $true ) {
+            $MKVMerge_param_start += " --no-attachments"
+        }
+
+        if ( $Internal_SUB_Number -ne 0 ) {
+            # Part for internal subtitles
+            $MKVMerge_param_mkv1 = "$MKVMerge_audio_param $MKVMerge_sub_param `"$MKV_1`""
+        }
+        else {
+            $MKVMerge_param_mkv1 = "$MKVMerge_audio_param `"$MKV_1`""
+        }
+        
+        $MKVMerge_param_all = "$MKVMerge_param_start  $MKVMerge_param_mkv1"
+        
+        if ( $merge_another_video_MKV2 -eq $true ) {
+            $MKVMerge_param_all += " $MKVMerge_param_mkv2"
+        }
+
+        if ( ( $External_SUB_Number -ne 0 ) -and ( $External_SUB -eq $true ) ) {
+            $MKVMerge_param_all += " $MKVMerge_param_srt1"
+            if ( $External_SUB_Number -eq 2 ) {
+                $MKVMerge_param_all += " $MKVMerge_param_srt2"
+            }
+        }
+    
+        # Write-Host "`$MKVMerge_param_start = $MKVMerge_param_start" -ForegroundColor "White"
+        # Write-Host "`$MKVMerge_param_mkv1 = $MKVMerge_param_mkv1" -ForegroundColor "White"
+        # Write-Host "`$MKVMerge_param_all = $MKVMerge_param_all" -ForegroundColor "White"
+        Write-Host "`tRecap. of all language tracks :" -ForegroundColor "Cyan"
+        Write-Host "`t`t- Video lang will be : $Video_Lang" -ForegroundColor "Cyan"
+        Write-Host "`t`t- Audio 1 lang will be : $AudioLang_1_sansID`t`tand name = $AudioTrackName_1_sansID" -ForegroundColor "Cyan"
+        if ($NB_Audio_MKV1 -eq 2) {
+            Write-Host "`t`t- Audio 2 lang will be : $AudioLang_2_sansID`t`tand name = $AudioTrackName_2_sansID" -ForegroundColor "Cyan"
+        }
+        if ($Internal_SUB_Number -ge 1) {
+            Write-Host "`t`t- Internal Sub 1 lang will be : $SubTrackLang_1_sansID`tand name = $SubTrackName_1_sansID" ( &{ If ( ($SubTrack_1_SDH_sansID -eq "yes") -eq $true) { "`tFlagged with SDH (--hearing-impaired-flag)" } }) -ForegroundColor "Cyan"
+            if ($Internal_SUB_Number -ge 2) {
+                Write-Host "`t`t- Internal Sub 2 lang  will be : $SubTrackLang_2_sansID`tand name = $SubTrackName_2_sansID" ( &{ If ( ($SubTrack_2_SDH_sansID -eq "yes") -eq $true) { "`tFlagged with SDH (--hearing-impaired-flag)" } }) -ForegroundColor "Cyan"
+                if ($Internal_SUB_Number -eq 3) {
+                    Write-Host "`t`t- Internal Sub 3 lang  will be : $SubTrackLang_3_sansID`tand name = $SubTrackName_3_sansID" ( &{ If ( ($SubTrack_3_SDH_sansID -eq "yes") -eq $true) { "`tFlagged with SDH (--hearing-impaired-flag)" } }) -ForegroundColor "Cyan"
+                }
+            }
+        }
+        if ($External_SUB -eq $true) {
+            Write-Host "`t`t- External Sub 1 lang will be : $($ExtSubTrackLang_1 -replace '0:', '')`tand name = $($ExtSubTrackName_1 -replace '0:', '')" ( &{ If ( ($ExtSub_SDH_1 -match "yes") -eq $true) { "`tFlagged with SDH (--hearing-impaired-flag)" } }) -ForegroundColor "Cyan" 
+            if ($External_SUB_Number -eq 2) {
+                Write-Host "`t`t- External Sub 2 lang will be : $($ExtSubTrackLang_2 -replace '0:', '')`tand name = $($ExtSubTrackName_1 -replace '0:', '')" ( &{ If ( ($ExtSub_SDH_2 -match "yes") -eq $true) { "`tFlagged with SDH (--hearing-impaired-flag)" } }) -ForegroundColor "Cyan" 
+            }
+        }
+
+        # Last step to command construction
+        $command = "& $MKVMerge $MKVMerge_param_all"
+        # Launch begin...
+        Invoke-Expression $command
+        
+        Write-Host ""
+        Write-Host "Fin du traitement du fichier n° $compteur / $Count_1.`n" -ForegroundColor "black" -BackgroundColor "white"
+
+        If (-Not (Test-Path $Output) ) {
+            write-host "File NON-EXISTANT - $Output" -foreground "red"
+            "File NON-EXISTANT - $Output" | Out-File "$destinationDirectory\Errors.txt" -Append
+        }
+        else {
+            if ( $move_mkv1_after_merge -eq $true ) {
+                Move-Item -Path $MKV_1 -Destination $Path_Folder_NotMerged_1 -Verbose
+                if ( $External_SUB -eq $true ) {
+                    Move-Item -Path $SRT_1 -Destination $Path_Folder_NotMerged_1 -Verbose
+                    if ( $External_SUB_Number -eq 2 ) {
+                        Move-Item -Path $SRT_2 -Destination $Path_Folder_NotMerged_1 -Verbose
+                    }
+                }
+            }
+            if ( ( $move_mkv2_after_merge -eq $true ) -And ( $merge_another_video_MKV2 -eq $true) ) {
+                Move-Item -Path $MKV_2 -Destination $Path_Folder_NotMerged_2 -Verbose
+            }
+        }
+
+        $compteur++
+        
+
+    }
+}
--- a/Scripts-Divers/Batch
+++ b/Scripts-Divers/Batch
@ -19,153 +19,461 @@
 ##==============================================================================================
 ##                                                                                            ##
 ##                                         Objectifs :                                        ##
-##  Remuxer deux MKV en gardant l'audio et le(s) sous-titre du premier, et seulement la vidéo ##
-##                                          du second                                         ##
+##    Remuxer deux MKV en gardant l'audio et le(s) sous-titre du premier ou un sous-titre     ##
+##                        externe, et seulement la vidéo du second MKV                        ##
 ##                                                                                            ##
 ##==============================================================================================

-#Set MKVMerge.exe Path
-$MKVMerge = 'H:\z_MKV\mkvtoolnix\mkvmerge.exe'
+Clear-Host
+Invoke-Command -ScriptBlock {

-#Set Source and Target directories (Don't put an \ at the end)
-$sourceDirectory_1 = "D:\DOSSIER_SOURCE-1"
-$sourceDirectory_2 = "D:\DOSSIER_SOURCE-2"
-$destinationDirectory = "F:\TEMP\"
+    # Set MKVMerge.exe Path
+    $MKVMerge = "`"PATH_TO\mkvtoolnix\mkvmerge.exe`""
+    # For the parameters to pass to MKVMerge executable, will be construct

-#If source and destination are the same folder, set this to True, Otherwise let it to "False"
-$merged_SUFFIX_name = "False"
+    #Set Source and Target directories (Don't put an \ at the end)
+    $sourceDirectory_1 = "PATH_TO_SOURCE_1"
+    $sourceDirectory_2 = "PATH_TO_SOURCE_2"
+    $destinationDirectory = "PATH_TO_DESTINATION"

-#### Objective : Keep audio and subtitles and tags from FILE n°1 - Add video from FILE n°2
+    # Rename output file with this settings :
+    # Use https://regex101.com/r/cU5lC2/1 to get the RegEx
+    $chain_to_search = ''
+    # $chain_to_search = '(\w+)\.S(\d{2})E(\d{2}).(.*)H264(.*)'
+    # $chain_to_search = '(\w+)\.S(\d{2})E(\d{2})(.*)1080p.(.*)H.264(.*)'
+    $chain__to_replace = ''
+    # $chain__to_replace = '$1 - S$2E$3 - $4x265-10bits$5--Reencoded'
+    # $chain__to_replace = '$1 (2021) - S$2E$3 - 1080p.$5x265-10bits$6--Reencoded'

-#### FILE 1 - Keeping all but the video
-# ================== AUDIO ==================
-# Track 1 = Audio n°1
-# Name and language of Audio Track n°1
-$AudioTrackName_1 = "1:Français - AC3 5.1 640kb/s"
-$AudioLang_1 = "1:fr"
-$AudioTrack_1_default = "1:yes"
+    # The filenames must be like : blabla.S00E00.blabla.H.264.blabla
+    # They will be renamed to : blabla - S00E00 - blabla.x265-10bits.blabla--Reencoded
+    # If you don't want the rename to be made, juste set to '' the variables.

-# ================== SUBTITLES ==================
-# Track 3 = Sub n°1 to keep
-# Name and language of Subtitle Track n°1 + Sync Value
-$SubTrackName_1 = "2:Français Forcés - SRT"
-$SubTrackLang_1 = "2:fr"
-$SubTrack_1_default = "2:yes"
-####
+    # If there is no internal subtitles to keep :
+    # Set to $false for no internal subtitle
+    # Set to $true for one or more internal subtitles
+    $Internal_SUB = $true

-# ================== OTHER SETTINGS ==================
-# Define track order
-$track_order = "1:0,0:1,0:2"
-# Define subtitles track to keep
-$subtitle_tracks = "2"
+    # Is there an external subtitle ? Set the number of .SRT (0 - 2)
+    # It's exclusive, no internal SUB will be proceed..
+    $NB_External_SUB = 0

-# Files name, without .mkv : 
-#       format = filename_1_part_1 + S + filename_season + E + i_counter + filename_1_part_2 + .mkv
-#       format = filename_2_part_1 + S + filename_season + E + i_counter + filename_2_part_2 + .mkv
-$filename_1_part_1 = "Ma série (20xx) - "
-$filename_1_part_2 = " - 1080p-h264"
-# Final name 1 = Ma série (20xx) - S01E01 - 1080p-h264
+    # Extension without the .
+    $MkvExtension = "mkv"
+    #Set Subtitle Extension (Don't add the . before the extension)
+    $SubExtension_1 = 'eng.srt'
+    $SubExtension_2 = 'fre.srt'

-$filename_2_part_1 = "Ma série (20xx) - "
-$filename_2_part_2 = " - 1080p.x265"
-# Final name 2 = Ma série (20xx) - S01E01 - 1080p.x265
+    #If source and destination are the same folder, set this to True, Otherwise let it to "False"
+    $merged_SUFFIX_name = "False"

-$filename_season = "02"
-$filename_ep_total = "10"
-##==============================================================================================
-##==============================================================================================
+    # Move MKV1 (and SRT) to Not-Merged folder ? Set to $false or $true
+    $move_mkv1_after_merge = $true
+    # Move MKV2 (and SRT) to Not-Merged folder ? Set to $false or $true
+    $move_mkv1_after_merge = $true

-# Testing if the Not-Merged folder already exists : if yes, it will be renamed, else it will be created.
-$Path_Folder_NotMerged_2 = $sourceDirectory_2 + "\Not-Merged"
-If(!(test-path $Path_Folder_NotMerged_2)) {
-    New-Item -ItemType "Directory" -Force -Path $Path_Folder_NotMerged_2 -Verbose
-} else {
-    # Don't know what's the best... TO BE IMPROVED
-    #Move-Item -Path $Path_Folder_NotMerged_2 -Destination "$sourceDirectory\Not-Merged--backup" -Verbose
-    #Move-Item -Path $Path_Folder_NotMerged_2 -Destination "$sourceDirectory\Not-Merged--backup" -Verbose
-}
+    # Initialization for those 3 variables, do not change them !
+    $MKVMerge_sub_param = ""
+    $MKVMerge_audio_param = ""
+    $subtitle_tracks = ""
+    # ##################

+    #### FILE 1 - Keeping all but the video
+    # ================== AUDIO ==================
+    # Track 1 = Audio n°1
+    # Name and language of Audio Track n°1
+    $AudioTrackName_1 = "1:English - DDP 5.1"
+    $AudioLang_1 = "1:eng"
+    $AudioTrack_1_default = "1:yes"
+    # Define track order. Do not modify it unless you changed the track number in this section
+    $track_order = "1:0,0:1"
+    # $MKVMerge_audio_param = '--language', "$AudioLang_1", '--track-name', "$AudioTrackName_1", '--default-track', "$AudioTrack_1_default"
+    $MKVMerge_audio_param = "--language $AudioLang_1 --track-name `"$AudioTrackName_1`" --default-track $AudioTrack_1_default"

-#Process
-$MKV_1_List = Get-ChildItem $sourceDirectory_1 -Filter "*.mkv" | ForEach-Object { $_.FullName } | Sort-Object
-$Count_1 = $MKV_1_List.count
-Write-Host "$Count_1 MKV's to be processed in $sourceDirectory_1."
+    # # Track 2 = Audio n°2
+    # # Name and language of Audio Track n°2
+    # $AudioTrackName_1 = "2:English - DDP 5.1"
+    # $AudioLang_1 = "2:en"
+    # $AudioTrack_1_default = "2:yes"
+    # # Define track order. Do not modify it unless you changed the track number in this section
+    # $track_order = "1:0,0:1,0:2"
+    # $MKVMerge_audio_param += "--language $AudioLang_2 --track-name `"$AudioTrackName_2`" --default-track $AudioTrack_2_default"

-$MKV_2_List = Get-ChildItem $sourceDirectory_2 -Filter "*.mkv" | ForEach-Object { $_.FullName } | Sort-Object
-$Count_2 = $MKV_2_List.count
-Write-Host "$Count_2 MKV's to be processed in $sourceDirectory_2."
+    ##########################################
+    #### FILE 2 - MKV - Keeping only the video
+    #### $file_2_options = "--no-audio --no-track-tags --no-global-tags"

-if ($Count_1 -eq $Count_2) {
-    Write-Host "There is the same number of MKV in the two sources folders. Let's continue."
-} else {
-    Write-Host "The number of MKV in the two sources folders isn't the same. ABORT..." -foreground "red"
-    Exit
-}
-
-if (!($Count_1 -eq $filename_ep_total)) {
-    Write-Host "The number of epidoes set in the script isn't the same as the number of files in the folders... EXITING NOW !" -foreground "red"
-    Exit
-}
-
-for ($i = 1; $i -lt $Count_1+1; $i++) {
-    
-    # Genreating File Name
-    #       format = filename_1_part_1 + S + filename_season + E + i_counter + filename_1_part_2 + .mkv
-    #       format = filename_2_part_1 + S + filename_season + E + i_counter + filename_2_part_2 + .mkv
-    # Final name 1 = Le Bureau des Légendes (2015) - S01E01 - 1080p-h264
-    # Final name 2 = Le Bureau des Légendes (2015) - S01E01 - 1080p.BDRip.x265.Aac.NoTag
-
-    if ($i -lt 10 ) { # i<10
-        $MKV_1_name = $filename_1_part_1 + "S" + $filename_season + "E0" + $i + $filename_1_part_2
-        $MKV_2_name = $filename_2_part_1 + "S" + $filename_season + "E0" + $i + $filename_2_part_2
-    } else {    # i=10
-        $MKV_1_name = $filename_1_part_1 + "S" + $filename_season + "E" + $i + $filename_1_part_2
-        $MKV_2_name = $filename_2_part_1 + "S" + $filename_season + "E" + $i + $filename_2_part_2
+    if ( $NB_External_SUB -ne 0 ) {
+        # ================== EXTERNAL SUBTITLE ==================
+        # Must have the same name as MKV1
+        ####
+        #### FILE 3 - SRT - Keeping all but the video (audio + chapters tags)
+        # ================== SUBTITLES ==================
+        # Track 0 = Sub n°1 to keep
+        # Name and language of Subtitle Track n°0 + Sync Value
+        $ExtSubTrackName_1 = "0:English - SRT"
+        $ExtSubTrackLang_1 = "0:eng"
+        $ExtSubTrack_1_default = "0:yes"
+        $ExtSub_charset_1 = "0:UTF-8"
+        # Define track order
+        $track_order += ",2:0"
+        ####
+        #### FILE 4 - SRT - Keeping all but the video (audio + chapters tags)
+        # ================== SUBTITLES ==================
+        # Track 0 = Sub n°1 to keep
+        # Name and language of Subtitle Track n°0 + Sync Value
+        $ExtSubTrackName_2 = "0:Français - SRT"
+        $ExtSubTrackLang_2 = "0:fr"
+        $ExtSubTrack_2_default = "0:no"
+        $ExtSub_charset_2 = "0:UTF-8"
+        # Define track order
+        if ( $NB_External_SUB -eq 2 ) {
+            $track_order += ",3:0"
+        }
    }
-    $MKV_1 = $sourceDirectory_1 + "\" + $MKV_1_name + ".mkv"
-    $MKV_2 = $sourceDirectory_2 + "\" + $MKV_2_name + ".mkv"
+    else {
+        # ================== INTERNAL SUBTITLES ==================
+        if ( $Internal_SUB -eq $true ) {
+            # Track 2 = Sub n°1 to keep
+            # Name and language of Subtitle Track n°1 + Sync Value
+            # $SubTrackName_1 = "2:English - SRT"
+            # $SubTrackLang_1 = "2:en"
+            # $SubTrack_1_default = "2:yes"
+            # $sub_charset_1 = "2:UTF-8"
+            # # Define track order
+            # $track_order += ",0:2"
+            # $subtitle_tracks = "2"
+            # # $MKVMerge_sub_param = '--sub-charset', "$sub_charset_1", '--language', "$SubTrackLang_1", '--track-name', "$SubTrackName_1", '--default-track', "$SubTrack_1_default"
+            # $MKVMerge_sub_param = "--sub-charset $sub_charset_1 --language $SubTrackLang_1 --track-name `"$SubTrackName_1`" --default-track $SubTrack_1_default"

-    # Title for the video track
-    $VideoTrackName = $MKV_2_name
+            # Track 3 = Sub n°2 to keep
+            # Name and language of Subtitle Track n°1 + Sync Value
+            $SubTrackName_2 = "3:English SDH - SRT"
+            $SubTrackLang_2 = "3:eng"
+            $SubTrack_2_default = "3:yes"
+            $sub_charset_2 = "3:UTF-8"
+            # Define track order
+            $track_order += ",0:3"
+            $subtitle_tracks = "3"
+            $MKVMerge_sub_param += "--sub-charset $sub_charset_2 --language $SubTrackLang_2 --track-name `"$SubTrackName_2`" --default-track $SubTrack_2_default"
+            ####
+        }
+        else {
+            # No internal subtitles are to be kept...
+            $MKVMerge_sub_param = ""
+        }
+    }
+    ## End of part where there is something to change !
+    ##==============================================================================================

-    #Set Output File Name
-    #$Output = $Name + '___MERGED' + '.mkv'
-    If ($merged_SUFFIX_name -eq "True") {
-        $Output = $destinationDirectory + "\" + $VideoTrackName + '___MERGED' + '.mkv'
-    } elseif ($merged_SUFFIX_name -eq "False") {
-        $Output = $destinationDirectory + "\" + $VideoTrackName + '.mkv'
-    } else {
-        write-host "Error in the value of the merged_SUFFIX_name variable. Current value = $merged_SUFFIX_name" -foreground "red"
-        write-host "Should be set to True or False.`nScript is exiting now..." -foreground "white"
+    # Testing if the Not-Merged folder already exists : if yes, it will be renamed, else it will be created.
+    $Path_Folder_NotMerged_2 = $sourceDirectory_2 + "\Not-Merged"
+    If (!(test-path $Path_Folder_NotMerged_2)) {
+        New-Item -ItemType "Directory" -Force -Path $Path_Folder_NotMerged_2 -Verbose
+    }
+    else {
+        # Don't know what's the best... TO BE IMPROVED
+        #Move-Item -Path $Path_Folder_NotMerged_2 -Destination "$sourceDirectory\Not-Merged--backup" -Verbose
+        #Move-Item -Path $Path_Folder_NotMerged_2 -Destination "$sourceDirectory\Not-Merged--backup" -Verbose
+    }
+    # Testing if the Not-Merged folder already exists : if yes, it will be renamed, else it will be created.
+    $Path_Folder_NotMerged_1 = $sourceDirectory_1 + "\Not-Merged"
+    If (!(test-path $Path_Folder_NotMerged_1)) {
+        New-Item -ItemType "Directory" -Force -Path $Path_Folder_NotMerged_1 -Verbose
+    }
+    else {
+        # Don't know what's the best... TO BE IMPROVED
+        #Move-Item -Path $Path_Folder_NotMerged_2 -Destination "$sourceDirectory\Not-Merged--backup" -Verbose
+        #Move-Item -Path $Path_Folder_NotMerged_2 -Destination "$sourceDirectory\Not-Merged--backup" -Verbose
+    }
+
+    #Process
+    $MKV_1_List = Get-ChildItem $sourceDirectory_1 -Filter "*.mkv" | ForEach-Object { $_.FullName } | Sort-Object
+    $Count_1 = $MKV_1_List.count
+    Write-Host "$Count_1 MKV's to be processed in $sourceDirectory_1."
+
+    $MKV_2_List = Get-ChildItem $sourceDirectory_2 -Filter "*.mkv" | ForEach-Object { $_.FullName } | Sort-Object
+    $Count_2 = $MKV_2_List.count
+    Write-Host "$Count_2 MKV's to be processed in $sourceDirectory_2."
+
+    # #########################
+    # Check if there is the same number of .srt files as .mkv files
+    if ( $NB_External_SUB -ne 0 ) {
+        if ( $NB_External_SUB -ge 1 ) {
+            # If $NB_External_SUB >= 1 (include =1 and =2)
+            $SRT_1_List = Get-ChildItem $sourceDirectory_1 -Filter "*.$SubExtension_1" | ForEach-Object { $_.FullName } | Sort-Object
+            $Count_1_SRT = $SRT_1_List.count
+            Write-Host "$Count_1 MKV's to be processed and $Count_1_SRT SRT's to be processed in $sourceDirectory_1."
+            if ($Count_1 -eq $Count_1_SRT) {
+                Write-Host "There is the same number of MKV and SRT n°1 files in this folder. Let's continue."
+            }
+            else {
+                Write-Host "The number of MKV and SRT n°1 files isn't the same. ABORT..." -foreground "red"
+                Exit
+            }
+        }
+    
+        if ( $NB_External_SUB -eq 2 ) {
+            # Only if $NB_External_SUB = 2
+            $SRT_2_List = Get-ChildItem $sourceDirectory_1 -Filter "*.$SubExtension_2" | ForEach-Object { $_.FullName } | Sort-Object
+            $Count_2_SRT = $SRT_2_List.count
+            if ($Count_1 -eq $Count_2_SRT) {
+                Write-Host "There is the same number of MKV and SRT n°2 files in this folder. Let's continue."
+            }
+            else {
+                Write-Host "The number of MKV and SRT n°2 files isn't the same. ABORT..." -foreground "red"
+                Exit
+            }
+        }
+    }
+    # #########################
+
+    # #########################
+    # Check if there is the same .mkv files in both source directory
+    if ($Count_1 -eq $Count_2) {
+        Write-Host "There is the same number of MKV in the two sources folders. Let's continue."
+    }
+    else {
+        Write-Host "The number of MKV in the two sources folders isn't the same. ABORT..." -foreground "red"
        Exit
    }
+    # if (!($Count_1 -eq ($filename_ep_final - $filename_ep_start + 1))) {
+    #     Write-Host "The number of episodes set in the script isn't the same as the number of files in the folders... EXITING NOW !" -foreground "red"
+    #     Exit
+    # }
+    # #########################
+    $compteur = 1

-
-    #Execute
-    # Keep Audio/Subtitles/tags from MKV_1 + Only video from MKV_2
-#    & $MKVMerge --title "$VideoTrackName" --track-order "$track_order" --subtitle-tracks "$subtitle_tracks" -o "$Output" --no-video 
-#--language "$AudioLang_1" --track-name "$AudioTrackName_1" --default-track "$AudioTrack_1_default" 
-#--sub-charset "2:UTF-8" --language "$SubTrackLang_1" --track-name "$SubTrackName_1" --default-track "$SubTrack_1_default"
-# "$MKV_1"
-# --language "0:fr" --track-name "0:$VideoTrackName" --default-track "0:yes"
-# "$MKV_2"
+    # for ($i = $filename_ep_start; $i -lt $filename_ep_final+1; $i++) {
+    Foreach ($MKV_1 in $MKV_1_List) {
    
-    & $MKVMerge --title "$VideoTrackName" --track-order "$track_order" --subtitle-tracks "$subtitle_tracks" -o "$Output" --no-video --no-chapters --no-global-tags --language "$AudioLang_1" --track-name "$AudioTrackName_1" --default-track "$AudioTrack_1_default" --sub-charset "2:UTF-8" --language "$SubTrackLang_1" --track-name "$SubTrackName_1" --default-track "$SubTrack_1_default" "$MKV_1" --language "0:fr" --track-name "0:$VideoTrackName" --default-track "0:yes" --no-subtitles --no-audio "$MKV_2"
+        Write-Host "" -ForegroundColor "black" -BackgroundColor "white"
+        Write-Host "Traitement du fichier n° $compteur / $Count_1..." -ForegroundColor "black" -BackgroundColor "white"
+        Write-Host "" -ForegroundColor "black" -BackgroundColor "white"

-    If (Test-Path $Output) {
-        #Clean Up
-        #Remove-Item $MKV
-        #Remove-Item $Sub
-        #Remove-Item $OtherSub
-        # Move to folder Not-Merged, this folder's existence has already been tested, and the folder is created.
-        Move-Item -Path $MKV_2 -Destination $Path_Folder_NotMerged_2 -Verbose
-        #Move-Item -Path $Sub -Destination $Path_Folder_NotMerged_2 -Verbose
+        # Genreating Files Name & Video Title
+        #       format = filename_1_part_1 + S + filename_season + E + i_counter + filename_1_part_2 + .mkv
+        #       format = filename_2_part_1 + S + filename_season + E + i_counter + filename_2_part_2 + .mkv
+        $FormatName_1 = (Get-Item $MKV_1).Basename
+        $MKV_1_name = $FormatName_1.ToString()

-        # Renaming the output file is not necessary if the output filename doesn't have __MERGED in it
-        #Rename-Item -Path $Output -NewName $MKV -Verbose
+        $MKV_2_file = get-ChildItem $sourceDirectory_2 -recurse | where { $_.name -like "*$MKV_1_name*" } | select name

-    } Else {
-        write-host "File NON-EXISTANT - $Output" -foreground "red"
-        "File NON-EXISTANT - $Output" | Out-File "$destinationDirectory\Errors.txt" -Append
+        # Faire test si count = 1 -> ok      Sinon soucis !
+
+        $FormatName_2 = $MKV_2_file.Name.ToString()
+        $MKV_2_name = $FormatName_2.Substring(0, $FormatName_2.Length - ($MkvExtension.Length + 1))
+        $MKV_2 = $sourceDirectory_2 + "\" + $MKV_2_name + ".$MkvExtension"
+
+        # Title for the video track and for the destination file
+        $VideoTrackName = $MKV_1_name
+        if ( $set_year_with_brackets -eq $true ) {
+            $VideoTrackName = $VideoTrackName -replace '(\d{4}(?=.*S\d{2}E\d{2}))', '($1)'
+        }
+        if ( $remove_dots -eq $true ) {
+            $VideoTrackName = $VideoTrackName -replace '\.(?=.*S\d{2}E\d{2})', ' '
+        }
+        $VideoTrackName = $VideoTrackName -replace $chain_to_search, $chain__to_replace
+        $VideoTrackName = "$VideoTrackName"
+        Write-Host "`tThe Video Track Name will be : `r`n`t`t  $VideoTrackName" -ForegroundColor "green"
+        if ( $compteur -le 3 ) {
+            # Will prompt for a key to be pressed for the 3 first names
+            Write-Host "`tFor the 3 first file, this will show up, and pause for 10s" -ForegroundColor "yellow";
+            Start-Sleep -Seconds 10
+        }
+
+        #########################################################
+        # Exceptions for some files with other than 2 SRT inside
+        # You must copy paste the default entries set in the begining of this script in the Default section
+        switch ($MKV_1_name) {
+            "MY_FILE_WITH_EXCEPTION" {
+                # # ================== AUDIO ==================
+                # # Track 1 = Audio n°1
+                # # Name and language of Audio Track n°1
+                # $AudioTrackName_1 = "1:English - DDP 5.1"
+                # $AudioLang_1 = "1:en"
+                # $AudioTrack_1_default = "1:yes"
+
+                # # Only One subtitle track : n°2
+                # $SubTrackName_1 = "3:English SDH - SRT"
+                # $SubTrackLang_1 = "3:en"
+                # $SubTrack_1_default = "3:yes"
+                # $sub_charset_1 = "3:UTF-8"
+                # # Define track order
+                # $track_order = "1:0,0:1,0:3"
+                # # Define subtitles track to keep
+                # $subtitle_tracks = "3"
+
+                $VideoTrackName = "Defiance - S03E01-E02 - 720p.HDTV.x265-10bits-DIMENSION--Reencoded"
+                break
+            }
+            "MY_FILE_WITH_EXCEPTION_2" {
+                # # Track 1 = Audio n°1
+                # # Name and language of Audio Track n°1
+                # $AudioTrackName_1 = "1:English - AAC 2.0"
+                # $AudioLang_1 = "1:en"
+                # $AudioTrack_1_default = "1:yes"
+
+                # # Only One subtitle track : n°2
+                # $SubTrackName_1 = "2:English - SRT"
+                # $SubTrackLang_1 = "2:en"
+                # $SubTrack_1_default = "2:yes"
+                # $sub_charset_1 = "2:UTF-8"
+                # # Define track order
+                # $track_order = "1:0,0:1,0:2"
+                # # Define subtitles track to keep
+                # $subtitle_tracks = "2"
+
+                $VideoTrackName = "Defiance - S02S02E12-E13 - PROPER.720p.HDTV.x265-10bits-KILLERS--Reencoded"
+
+                break
+            }
+            #Default state
+            Default {
+                # If not an exception, we don't want to modify the variables
+                # $SubTrackName_1 = "3:English SDH - SRT"
+                # $SubTrackLang_1 = "3:eng"
+                # $SubTrack_1_default = "3:yes"
+                # $sub_charset_1 = "3:UTF-8"
+                # # Define track order
+                # $track_order = "1:0,0:1,0:3"
+                # # Define subtitles track to keep
+                # $subtitle_tracks = "3"
+                break
+            }
+        }
+        #########################################################
+
+        # Set Output File Name
+        If ($merged_SUFFIX_name -eq "True") {
+            $Output = $destinationDirectory + "\" + $VideoTrackName + '___MERGED' + '.mkv'
+        }
+        elseif ($merged_SUFFIX_name -eq "False") {
+            # $Output = $destinationDirectory + "\" + $VideoTrackName + '.mkv'
+            $Output = "$destinationDirectory" + "\" + "$VideoTrackName" + ".mkv"
+        }
+        else {
+            write-host "Error in the value of the merged_SUFFIX_name variable. Current value = $merged_SUFFIX_name" -ForegroundColor "red"
+            write-host "Should be set to True or False.`nScript is exiting now..." -ForegroundColor "white"
+            Exit
+        }
+        # write-host "Output file will be :" -ForegroundColor "white"
+        # write-host "$Output" -ForegroundColor "white"
+        # write-host "--" -ForegroundColor "white"
+
+        if ( $NB_External_SUB -ne 0 ) {
+        
+            # First external SRT to include
+            $SRT_1_Name = $MKV_1_name + ".$SubExtension_1"
+            $SRT_1 = $sourceDirectory_1 + "\" + $SRT_1_name
+
+            $MKVMerge_param_start = "--output `"$Output`" --title `"$VideoTrackName`" --track-order `"$track_order`" --no-video --no-subtitles"
+            if ( $no_attachements -eq $true ) {
+                $MKVMerge_param_start += " --no-attachments"
+            }
+
+            $MKVMerge_param_mkv1 = "$MKVMerge_audio_param `"$MKV_1`""
+            $MKVMerge_param_mkv2 = "--no-audio --no-track-tags --no-global-tags --language 0:en --track-name `"0:$VideoTrackName`" --default-track 0:yes --no-subtitles --no-audio `"$MKV_2`""
+        
+            $MKVMerge_param_srt1 = "--sub-charset $Extsub_charset_1 --language $ExtSubTrackLang_1 --track-name `"$ExtSubTrackName_1`" --default-track $ExtSubTrack_1_default `"$SRT_1`""
+        
+            $MKVMerge_param_srt_all = "$MKVMerge_param_srt1"
+
+            if ( $NB_External_SUB -eq 2 ) {
+                # Second external SRT to include
+                $SRT_2_Name = $MKV_1_name + ".$SubExtension_2"
+                $SRT_2 = $sourceDirectory_1 + "\" + $SRT_2_name
+            
+                $MKVMerge_param_srt2 = "--sub-charset $Extsub_charset_2 --language $ExtSubTrackLang_2 --track-name `"$ExtSubTrackName_2`" --default-track $ExtSubTrack_2_default `"$SRT_2`""
+                $MKVMerge_param_srt_all += " $MKVMerge_param_srt2"
+            }
+
+            $MKVMerge_param_all = "$MKVMerge_param_start  $MKVMerge_param_mkv1 $MKVMerge_param_mkv2 $MKVMerge_param_srt_all"
+
+        } 
+        else {
+            # INTERNAL SUB to keep
+            $MKVMerge_param_start = "--output `"$Output`" --title `"$VideoTrackName`" --track-order `"$track_order`" --subtitle-tracks $subtitle_tracks --no-video"
+            if ( $Internal_SUB -eq $true ) {
+                # There is some internal subtitles to keep
+                $MKVMerge_param_mkv1 = "$MKVMerge_audio_param $MKVMerge_sub_param `"$MKV_1`""
+            }
+            else {
+                # There is no internal subtitles to keep
+                $MKVMerge_param_mkv1 = "$MKVMerge_audio_param `"$MKV_1`""
+            }
+            $MKVMerge_param_mkv2 = "--no-audio --no-track-tags --no-global-tags --language 0:en --track-name `"0:$VideoTrackName`" --default-track 0:yes --no-subtitles --no-audio `"$MKV_2`""
+
+            $MKVMerge_param_all = "$MKVMerge_param_start  $MKVMerge_param_mkv1 $MKVMerge_param_mkv2"
+
+            # ##################
+            # Debug
+            # Write-Host "$MKVMerge_param_start" -ForegroundColor "black" -BackgroundColor "DarkGray"
+            # Write-Host "$MKVMerge_audio_param" -ForegroundColor "black" -BackgroundColor "DarkGray"
+            # Write-Host "$MKVMerge_sub_param" -ForegroundColor "black" -BackgroundColor "DarkGray"
+            # Write-Host "$MKVMerge_param_mkv2" -ForegroundColor "black" -BackgroundColor "DarkGray"
+            # Write-Host "" -ForegroundColor "black" -BackgroundColor "DarkGray"
+            # Write-Host "$MKVMerge_param_all" -ForegroundColor "black" -BackgroundColor "DarkGray"
+            # Write-Host "" -ForegroundColor "black" -BackgroundColor "DarkGray"
+            # Write-Host "Commande qui sera lancée :" -ForegroundColor "black" -BackgroundColor "DarkGray"
+
+            # Write-Host "& $MKVMerge" "$MKVMerge_param_all" -ForegroundColor "black" -BackgroundColor "DarkGray"
+            # ##################
+        }
+    
+        # Last step to command construction
+        $command = "& $MKVMerge $MKVMerge_param_all"
+        # Launch begin...
+        Invoke-Expression $command
+
+        Write-Host "" -ForegroundColor "black" -BackgroundColor "white"
+        Write-Host "Fin du traitement du fichier n° $compteur / $Count_1." -ForegroundColor "black" -BackgroundColor "white"
+        Write-Host "" -ForegroundColor "black" -BackgroundColor "white"
+
+        If (Test-Path $Output) {
+            #Clean Up
+            #Remove-Item $MKV
+            #Remove-Item $Sub
+            #Remove-Item $OtherSub
+            # Move to folder Not-Merged, this folder's existence has already been tested, and the folder is created.
+            if ( $move_mkv1_after_merge -eq $true ) {
+                Move-Item -Path $MKV_1 -Destination $Path_Folder_NotMerged_1 -Verbose
+                if ( $NB_External_SUB -ne 0 ) {
+                    Move-Item -Path $SRT_1 -Destination $Path_Folder_NotMerged_1 -Verbose
+                    if ( $NB_External_SUB -eq 2 ) {
+                        Move-Item -Path $SRT_2 -Destination $Path_Folder_NotMerged_2 -Verbose
+                    }
+                }
+            }
+            if ( $move_mkv2_after_merge -eq $true ) {
+                Move-Item -Path $MKV_2 -Destination $Path_Folder_NotMerged_2 -Verbose
+            }        
+        }
+        Else {
+            write-host "File NON-EXISTANT - $Output" -foreground "red"
+            "File NON-EXISTANT - $Output" | Out-File "$destinationDirectory\Errors.txt" -Append
+        }
+        $compteur++
    }
+
+
+
+    # ##############################
+    # Command History
+    #
+    # internal Subtitles :
+    # two subtiles to keep :
+    #& $MKVMerge --title "$VideoTrackName" --track-order "$track_order" --subtitle-tracks "$subtitle_tracks" -o "$Output" --no-video --language "$AudioLang_1" --track-name "$AudioTrackName_1" --default-track "$AudioTrack_1_default" --sub-charset "$sub_charset_1" --language "$SubTrackLang_1" --track-name "$SubTrackName_1" --default-track "$SubTrack_1_default" --sub-charset "$sub_charset_2" --language "$SubTrackLang_2" --track-name "$SubTrackName_2" --default-track "$SubTrack_2_default" "$MKV_1" --no-audio --no-track-tags --no-global-tags --language "0:en" --track-name "0:$VideoTrackName" --default-track "0:yes" --no-subtitles --no-audio "$MKV_2"
+
+    # Only one subtitles to keep
+    # & $MKVMerge --title "$VideoTrackName" --track-order "$track_order" --subtitle-tracks "$subtitle_tracks" -o "$Output" --no-video --language "$AudioLang_1" --track-name "$AudioTrackName_1" --default-track "$AudioTrack_1_default" --sub-charset "$sub_charset_1" --language "$SubTrackLang_1" --track-name "$SubTrackName_1" --default-track "$SubTrack_1_default" "$MKV_1" --no-audio --no-track-tags --no-global-tags --language "0:en" --track-name "0:$VideoTrackName" --default-track "0:yes" --no-subtitles --no-audio "$MKV_2"
+    #
+    #
+    # External Subtitles 
+    # # 1 SRT
+    # & $MKVMerge --output "$Output" --title "$VideoTrackName" --track-order "$track_order" --no-video --no-subtitles --language "$AudioLang_1" --track-name "$AudioTrackName_1" --default-track "$AudioTrack_1_default" "$MKV_1" --no-audio --no-track-tags --no-global-tags --language "0:en" --track-name "0:$VideoTrackName" --default-track "0:yes" "$MKV_2" --sub-charset "$Extsub_charset_1" --language "$ExtSubTrackLang_1" --track-name "$ExtSubTrackName_1" --default-track "$ExtSubTrack_1_default" "$SRT_1"
+    #
+    # # 2 SRTs
+    # & $MKVMerge --title "$VideoTrackName" --track-order "$track_order" -o "$Output" --no-video --no-subtitles --language "$AudioLang_1" --track-name "$AudioTrackName_1" --default-track "$AudioTrack_1_default" --language "$AudioLang_1" --track-name "$AudioTrackName_1" --default-track "$AudioTrack_1_default" "$MKV_1" --no-audio --no-track-tags --no-global-tags --language "0:en" --track-name "0:$VideoTrackName" --default-track "0:yes" "$MKV_2" --sub-charset "$ExtSub_charset_1" --language "$ExtSubTrackLang_1" --track-name "$ExtSubTrackName_1" --default-track "$ExtSubTrack_1_default" "$SRT_1" --sub-charset "$ExtSub_charset_2" --language "$ExtSubTrackLang_2" --track-name "$ExtSubTrackName_2" --default-track "$ExtSubTrack_2_default" "$SRT_2"
+    
 }
--- a/Scripts-Divers/Batch
+++ b/Scripts-Divers/Batch
@ -0,0 +1,332 @@
+# ┌──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+# │ Powershell Script                                                                                                    │
+# │                                                                                                                      │
+# │ Objective : to keep up to 2 internal subtiles form a MKV and adding 1 or 2 external SRT.                             │
+# │                                                                                                                      │
+# │ Configure :                                                                                                          │
+# │     - the Audio_ variables                                                                                           │
+# │     - the ExtSubTrack_ variables                                                                                     │
+# │     - All variables before the function Get-SubID                                                                    │
+# │     - The Track ID in the function Get-SubID + the filename for those track ID                                       │
+# └──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
+
+
+Clear-Host
+
+# Set MKVMerge.exe Path
+$MKVMerge = "`"H:\z_MKV\mkvtoolnix\mkvmerge.exe`""
+# For the parameters to pass to MKVMerge executable, will be construct
+
+$sourceDirectory_1 = "PATH_TO_SOURCE_1"
+$destinationDirectory = "PATH_TO_DESTINATION"
+
+# Remove dots before the season or the resolution ?
+$remove_dots = $true
+# If there is the year in the title, set it to $true
+$set_year_with_brackets = $false
+# $chain_to_search = ''
+# $chain__to_replace = ''
+$chain_to_search = '(.*) S(\d{2})E(\d{2}).(.*)'
+$chain__to_replace = '$1 - S$2E$3 - $4--Custom'
+
+# Move MKV1 (and SRT) to Not-Merged folder ? Set to $false or $true
+$move_mkv1_after_merge = $true
+
+# ================== AUDIO ================== Common for all videos
+# Track 1 = Audio n°1
+# Name and language of Audio Track n°1
+$AudioTrackName_1 = "1:Japonais - AAC 2.0"
+$AudioLang_1 = "1:ja"                      # en for english / fr for french / ja for japanese
+$AudioTrack_1_default = "1:yes"
+# Define track order. Do not modify it unless you changed the track number in this section
+$track_order = "0:0,0:1"
+
+# ================================================================
+
+# To keep or not internal subtitles
+$keep_internal_Sub = $false
+# NOTE : Internal SUB always came first in the track order !
+
+# ===========================================
+# ================== Internal SUB ? =========
+$Internal_SUB_Number = 2    # Works only if $External_SUB = $true
+                            # Max 2 Internal SRT is configured in the script.
+                            # If set to 2, must be 2 SRT configured 
+$SubTrackName_1 = "Français - SRT"
+$SubTrackLang_1 = "fr"              # en for english / fr for french / jp for japanese
+$SubTrack_1_default = "yes"
+$sub_charset_1 = "UTF-8"
+
+$SubTrackName_2 = "English SDH - SRT"
+$SubTrackLang_2 = "en"              # en for english / fr for french / jp for japanese
+$SubTrack_2_default = "no"
+$sub_charset_2 = "UTF-8"
+
+# ===========================================
+
+
+# ===========================================
+# ================== External SUB ? =========
+# Must have the same name as MKV1
+$External_SUB = $true
+$External_SUB_Number = 1    # Works only if $External_SUB = $true
+                            # Max 2 External SRT is configured in the script.
+                            # If set to 2, must be 2 SRT configured 
+# Set Subtitle Extension (Don't add the . before the extension)
+$SubExtension_1 = 'fre.srt'
+$SubExtension_2 = 'fre.srt'
+
+#### FILE 2 - SRT_1 - Keeping all but the video (audio + chapters tags)
+# ================== SUBTITLES ==================
+# Track 0 = Sub n°1 to keep
+# Name and language of Subtitle Track n°0 + Sync Value
+$ExtSubTrackName_1 = "0:Français - SRT"
+$ExtSubTrackLang_1 = "0:fr"
+$ExtSubTrack_1_default = "0:yes"
+$ExtSub_charset_1 = "0:UTF-8"
+
+#### FILE 3 - SRT_2 - Keeping all but the video (audio + chapters tags)
+# ================== SUBTITLES ==================
+# Track 0 = Sub n°1 to keep
+# Name and language of Subtitle Track n°0 + Sync Value
+$ExtSubTrackName_2 = "0:Français - SRT"
+$ExtSubTrackLang_2 = "0:fr"
+$ExtSubTrack_2_default = "0:no"
+$ExtSub_charset_2 = "0:UTF-8"
+
+# Define track order - DO NOT TOUCH
+$track_order_EXT_sub = ""
+if ( $External_SUB -eq $true ) {
+    if ( $External_SUB_Number -eq 1 ) {
+        $track_order_EXT_sub += ",1:0"
+        if ( $External_SUB_Number -eq 2 ) {
+            $track_order_EXT_sub += ",2:0"
+        }
+    }
+}
+# ===========================================
+
+function Get-SubID {         # FOR INTERNAL SUB !
+    param (                  # sub_1_id for 1st sub to keep
+        $file_name           # sub_2_id for 2nd sub to keep
+    )
+
+    switch ($file_name)        
+    {
+        "FILE1"
+        {
+            $sub_1_id = "4"
+            $sub_2_id = "5"
+            break
+        }
+        "FILE2"
+        {
+            $sub_1_id = "5"
+            $sub_2_id = "6"
+            break
+        }
+        #Default state
+        Default
+        {
+            Write-Host "This file is not set in the script : $file_name" -ForegroundColor "red"
+            Write-Host "End of script..." -ForegroundColor "red"
+            Exit
+        }
+    }
+
+    return $sub_1_id, $sub_2_id
+}
+
+#Process
+$MKV_1_List = Get-ChildItem $sourceDirectory_1 -Filter "*.mkv" | ForEach-Object { $_.FullName } | Sort-Object
+$Count_1 = $MKV_1_List.count
+Write-Host "$Count_1 MKV's to be processed in $sourceDirectory_1."
+
+# Testing if the Done_Remerged folder already exists : if yes, it will be renamed, else it will be created.
+$Path_Folder_NotMerged_1 = $sourceDirectory_1 + "\Done_Remerged"
+If(!(test-path $Path_Folder_NotMerged_1)) {
+    New-Item -ItemType "Directory" -Force -Path $Path_Folder_NotMerged_1 -Verbose
+} else {
+    # Don't know what's the best... TO BE IMPROVED
+    #Move-Item -Path $Path_Folder_NotMerged_2 -Destination "$sourceDirectory\Not-Merged--backup" -Verbose
+    #Move-Item -Path $Path_Folder_NotMerged_2 -Destination "$sourceDirectory\Not-Merged--backup" -Verbose
+}
+
+
+# #########################
+# Check if there is the same number of .srt files as .mkv files
+if ( $External_SUB -eq $true ) {
+    if ( $External_SUB_Number -ge 1 ) {     # If $NB_External_SUB >= 1 (include =1 and =2)
+        $SRT_1_List = Get-ChildItem $sourceDirectory_1 -Filter "*.$SubExtension_1" | ForEach-Object { $_.FullName } | Sort-Object
+        $Count_1_SRT = $SRT_1_List.count
+        Write-Host "$Count_1_SRT SRT's ($SubExtension_1) to be processed in $sourceDirectory_1."
+        if ($Count_1 -eq $Count_1_SRT) {
+            Write-Host "There is the same number of MKV and SRT n°1 files ($SubExtension_1) in this folder. Let's continue."
+        } else {
+            Write-Host "The number of MKV and SRT n°1 files isn't the same. ABORT..." -foreground "red"
+            Exit
+        }
+    }
+    
+    if ( $External_SUB_Number -eq 2 ) {     # Only if $External_SUB_Number = 2
+        $SRT_2_List = Get-ChildItem $sourceDirectory_1 -Filter "*.$SubExtension_2" | ForEach-Object { $_.FullName } | Sort-Object
+        $Count_2_SRT = $SRT_2_List.count
+        Write-Host "$Count_2_SRT SRT's ($SubExtension_2) to be processed in $sourceDirectory_1."
+
+        if ($Count_1 -eq $Count_2_SRT) {
+            Write-Host "There is the same number of MKV and SRT n°2 files ($SubExtension_2) in this folder. Let's continue."
+        } else {
+            Write-Host "The number of MKV and SRT n°2 files ($SubExtension_2) isn't the same. ABORT..." -foreground "red"
+            Exit
+        }
+    }
+}
+# #########################
+
+$compteur = 1
+
+Foreach ($MKV_1 in $MKV_1_List) {
+  
+    Write-Host "" -ForegroundColor "black" -BackgroundColor "white"
+    Write-Host "Traitement du fichier n° $compteur / $Count_1..." -ForegroundColor "black" -BackgroundColor "white"
+    Write-Host "" -ForegroundColor "black" -BackgroundColor "white"
+
+    # Clear variables
+    $MKVMerge_param_start = ""
+    $MKVMerge_param_mkv1 = ""
+    $MKVMerge_param_srt1 = ""
+    $MKVMerge_param_srt2 = ""
+    $MKVMerge_param_all = ""
+    $MKVMerge_sub_param = ""
+    $SRT_1_Name = ""
+    $SRT_2_Name = ""
+    $SRT_1 = ""
+    $SRT_2 = ""
+
+    $FormatName_1 = (Get-Item $MKV_1).Basename
+    $MKV_1_name = $FormatName_1.ToString()
+
+    # Title for the video track and for the destination file
+    $VideoTrackName = $MKV_1_name
+    if ( $set_year_with_brackets -eq $true ) {
+        $VideoTrackName = $VideoTrackName -replace '(\d{4}(?=.*S\d{2}E\d{2}))', '($1)'
+      }
+    if ( $remove_dots -eq $true ) {
+        $VideoTrackName = $VideoTrackName -replace '\.(?=.*S\d{2}E\d{2})', ' '
+    }
+    $VideoTrackName = $VideoTrackName -replace $chain_to_search, $chain__to_replace
+    $VideoTrackName = "$VideoTrackName"
+    Write-Host "`tThe Video Track Name will be : `r`n`t`t  $VideoTrackName" -ForegroundColor "green"
+    
+    $Output = "$destinationDirectory" + "\" + "$VideoTrackName" + ".mkv"
+    
+
+    # DO NOT TOUCH - Common for all files
+    $MKVMerge_audio_param = "--language $AudioLang_1 --track-name `"$AudioTrackName_1`" --default-track $AudioTrack_1_default"
+
+    if (( $keep_internal_Sub -eq $true ) -and ( $Internal_SUB_Number -ne 0 )) {  
+
+        $sub_1_id, $sub_2_id = Get-SubID $MKV_1_name
+        
+        # Track 2 = Sub n°1 to keep
+        # Name and language of Subtitle Track n°1 + Sync Value
+        $SubTrackName_1 = $sub_1_id + ":$SubTrackName_1"
+        $SubTrackLang_1 = $sub_1_id + ":$SubTrackLang_1"
+        $SubTrack_1_default = $sub_1_id + ":$SubTrack_1_default"
+        $sub_charset_1 = $sub_1_id + ":$sub_charset_1"
+        # Define track order
+        $track_order += ",0:" + $sub_1_id
+        $subtitle_tracks = "$sub_1_id"
+        $MKVMerge_sub_param = "--sub-charset $sub_charset_1 --language $SubTrackLang_1 --track-name `"$SubTrackName_1`" --default-track $SubTrack_1_default"
+
+        if ( $Internal_SUB_Number -eq 2 ) {
+            # Track 3 = Sub n°2 to keep
+            # Name and language of Subtitle Track n°1 + Sync Value
+            $SubTrackName_2 = $sub_2_id + ":$SubTrackName_2"
+            $SubTrackLang_2 = $sub_2_id + ":$SubTrackLang_2"
+            $SubTrack_2_default = $sub_2_id + ":$SubTrack_2_default"
+            $sub_charset_2 = $sub_2_id + ":$sub_charset_2"
+            # Define track order
+            $track_order += ",0:" + $sub_2_id
+            $subtitle_tracks += ",$sub_2_id"
+            $MKVMerge_sub_param += " --sub-charset $sub_charset_2 --language $SubTrackLang_2 --track-name `"$SubTrackName_2`" --default-track $SubTrack_2_default"
+        }
+    }
+    elseif (( $keep_internal_Sub -eq $true ) -and ( $Internal_SUB_Number -eq 0 )) {
+        write-host "Problem with `$keep_internal_Sub=$keep_internal_Sub and `$Internal_SUB_Number=$Internal_SUB_Number.`nIf `$keep_internal_Sub=true, `$Internal_SUB_Number should have a value different from 0 !" -ForegroundColor "Red"
+        exit
+    }
+
+    if ( ( $External_SUB_Number -ne 0 ) -and ( $External_SUB -eq $true ) ) {
+        
+        # First external SRT to include
+        $SRT_1_Name = $MKV_1_name + ".$SubExtension_1"
+        $SRT_1 = $sourceDirectory_1 + "\" + $SRT_1_name
+        
+        $track_order += $track_order_EXT_sub
+
+        $MKVMerge_param_srt1 = "--sub-charset $Extsub_charset_1 --language $ExtSubTrackLang_1 --track-name `"$ExtSubTrackName_1`" --default-track $ExtSubTrack_1_default `"$SRT_1`""
+        $MKVMerge_param_srt_all = "$MKVMerge_param_srt1"
+        if ( $External_SUB_Number -eq 2 ) {
+            # Second external SRT to include
+            $SRT_2_Name = $MKV_1_name + ".$SubExtension_2"
+            $SRT_2 = $sourceDirectory_1 + "\" + $SRT_2_name
+            
+            $MKVMerge_param_srt2 = "--sub-charset $Extsub_charset_2 --language $ExtSubTrackLang_2 --track-name `"$ExtSubTrackName_2`" --default-track $ExtSubTrack_2_default `"$SRT_2`""
+            $MKVMerge_param_srt_all += " $MKVMerge_param_srt2"
+        }
+
+        if ( $keep_internal_Sub -eq $false ) {
+            $MKVMerge_param_start = "--output `"$Output`" --title `"$VideoTrackName`" --track-order `"$track_order`" --no-subtitles --track-name `"0:$VideoTrackName`" --default-track 0:yes"
+            $MKVMerge_param_mkv1 = "$MKVMerge_audio_param `"$MKV_1`""
+            $MKVMerge_param_all = "$MKVMerge_param_start  $MKVMerge_param_mkv1 $MKVMerge_param_srt_all"
+        }
+        else {            
+            $MKVMerge_param_start = "--output `"$Output`" --title `"$VideoTrackName`" --track-order `"$track_order`" --subtitle-tracks $subtitle_tracks --track-name `"0:$VideoTrackName`" --default-track 0:yes"
+            $MKVMerge_param_mkv1 = "$MKVMerge_audio_param $MKVMerge_sub_param `"$MKV_1`""
+            $MKVMerge_param_all = "$MKVMerge_param_start  $MKVMerge_param_mkv1 $MKVMerge_param_srt_all"
+        }
+    }
+    elseif (( $External_SUB_Number -eq 0 ) -and ( $External_SUB -eq $true )) {
+        write-host "Problem with `$External_SUB_Number=$External_SUB_Number and `$External_SUB=$External_SUB.`nIf `$External_SUB=true, `$External_SUB_Number should have a value different from 0 !" -ForegroundColor "Red"
+        exit
+    } 
+    
+    # To modify a SubTrackName after previous operation... :
+    # if ( $MKV_1_name -eq "BLABLA" ) {
+    #     $SubTrackName_2 = $sub_2_id + ":Français Québécois - SRT"
+    # }
+   
+    # Write-Host "`$MKVMerge_param_start = $MKVMerge_param_start" -ForegroundColor "White"
+    # Write-Host "`$MKVMerge_param_mkv1 = $MKVMerge_param_mkv1" -ForegroundColor "White"
+    # Write-Host "`$MKVMerge_param_all = $MKVMerge_param_all" -ForegroundColor "White"
+
+    # Last step to command construction
+    $command = "& $MKVMerge $MKVMerge_param_all"
+    # Launch begin...
+    Invoke-Expression $command
+
+    Write-Host "" -ForegroundColor "black" -BackgroundColor "white"
+    Write-Host "Fin du traitement du fichier n° $compteur / $Count_1." -ForegroundColor "black" -BackgroundColor "white"
+    Write-Host "" -ForegroundColor "black" -BackgroundColor "white"
+
+    If (-Not (Test-Path $Output) ) {
+        write-host "File NON-EXISTANT - $Output" -foreground "red"
+        "File NON-EXISTANT - $Output" | Out-File "$destinationDirectory\Errors.txt" -Append
+    }
+    else {
+        if ( $move_mkv1_after_merge -eq $true ) {
+            Move-Item -Path $MKV_1 -Destination $Path_Folder_NotMerged_1 -Verbose
+            if ( $NB_External_SUB -ne 0 ) {
+                Move-Item -Path $SRT_1 -Destination $Path_Folder_NotMerged_1 -Verbose
+                if ( $NB_External_SUB -eq 2 ) {
+                    Move-Item -Path $SRT_2 -Destination $Path_Folder_NotMerged_2 -Verbose
+                }
+            }
+        }
+    }
+
+    $compteur++
+    
+
+}
--- a/Scripts-Divers/OLD/2ST
+++ b/Scripts-Divers/OLD/2ST
--- a/Scripts-Divers/OLD/3ST
+++ b/Scripts-Divers/OLD/3ST
--- a/Scripts-Divers/OLD/4ST
+++ b/Scripts-Divers/OLD/4ST
--- a/Scripts-Divers/OLD/5ST
+++ b/Scripts-Divers/OLD/5ST
--- a/Scripts-Divers/OLD/Batch
+++ b/Scripts-Divers/OLD/Batch
--- a/Scripts-Divers/OLD/Batch
+++ b/Scripts-Divers/OLD/Batch
--- a/Scripts-Divers/OLD/Batch
+++ b/Scripts-Divers/OLD/Batch
--- a/Scripts-Divers/Script
+++ b/Scripts-Divers/Script
@ -0,0 +1,46 @@
+# Script pour créer un certain nombre de dossiers de même nom avec un n° qui change
+
+# Source : https://stackoverflow.com/questions/28631419/how-to-recursively-remove-all-empty-folders-in-powershell
+
+Clear-Host
+Invoke-Command -ScriptBlock {
+    $source_folder = "PATH_WHERE_TO_CREATE_FOLDERS"
+    $nb_folder = 10
+    # Base Name : (number will be added after with a space)
+    $folder_to_create = "My Folder Base NAME"
+
+    function Test-Directory {
+        param (
+            [Parameter(Mandatory)]$path_to_verify
+        )
+        If (!(test-path $path_to_verify)) {
+            New-Item -ItemType "Directory" -Force -Path $path_to_verify
+            Write-Host "The path $path_to_verify (or one of the last subfolder) didn't exist. It has been created." -ForegroundColor "DarkBlue"
+        }
+        else {
+            Write-Host "The path $path_to_verify already exist." -ForegroundColor "DarkBlue"
+        }
+    }
+
+    
+    for ($i = 1 ; $i -le $nb_folder ; $i++) {
+        
+        $folder_name = $folder_to_create + " $i"
+        
+        # Exceptions
+        if ( $folder_name -eq "My Folder Base NAME 9" ) {
+            $folder_name = "My Folder Base NAME Part.1"
+        }
+        elseif ( $folder_name -eq "My Folder Base NAME 10" ) {
+            $folder_name = "My Folder Base NAME Part.2"
+        }
+
+        # Construction of the final folder name
+        $final_folder_name =  $source_folder + "\" + $folder_name 
+        Test-Directory $final_folder_name
+
+
+    }
+
+
+}
--- a/Scripts-Divers/Script
+++ b/Scripts-Divers/Script
@ -0,0 +1,14 @@
+# Script pour tester si le dossier mis en paramètre contient des dossiers vides
+# et si oui, les supprimer.
+
+# Source : https://stackoverflow.com/questions/28631419/how-to-recursively-remove-all-empty-folders-in-powershell
+
+Clear-Host
+Invoke-Command -ScriptBlock {
+  $folder_to_check = "PATH_TO_FOLDER_CONTAINING_EMPTY_FOLDERS"
+
+  $dirs = Get-ChildItem $folder_to_check -Directory -Recurse | Where-Object { (Get-ChildItem $_.fullName).count -eq 0 } | Select-Object -ExpandProperty  FullName
+  $dirs | Foreach-Object { Write-Host "Dossier qui sera supprimer car considéré comme vide : " $_ }
+  # $dirs | Foreach-Object { Remove-Item $_ }
+
+}
--- a/dns-blacklists/adguard-home/liste.md
+++ b/dns-blacklists/adguard-home/liste.md
@ -31,3 +31,9 @@ https://raw.githubusercontent.com/Perflyst/PiHoleBlocklist/master/SmartTV.txt

 * `Firebog.net - ads-and-tracking-extended`<br/>
  https://www.github.developerdan.com/hosts/lists/ads-and-tracking-extended.txt
+
+* `adaway.org`<br/>
+  https://adaway.org/hosts.txt
+
+* `Lien vers : COLLECTION BIG BLOCKLIST`<br/>
+  https://firebog.net
--- a/dns-blacklists/pihole/liste
+++ b/dns-blacklists/pihole/liste
@ -1,39 +1,65 @@
-https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts   
 https://justdomains.github.io/blocklists/lists/easylist-justdomains.txt
 https://raw.githubusercontent.com/kboghdady/youTube_ads_4_pi-hole/master/black.list
-https://www.github.developerdan.com/hosts/lists/amp-hosts-extended.txt    
-https://www.github.developerdan.com/hosts/lists/tracking-aggressive-extended.txt     
-https://www.github.developerdan.com/hosts/lists/ads-and-tracking-extended.txt  
-https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.Spam/hosts    
-https://v.firebog.net/hosts/static/w3kbl.txt    
-https://adaway.org/hosts.txt    
-https://v.firebog.net/hosts/AdguardDNS.txt    
+https://www.github.developerdan.com/hosts/lists/amp-hosts-extended.txt
+https://www.github.developerdan.com/hosts/lists/tracking-aggressive-extended.txt
+https://www.github.developerdan.com/hosts/lists/ads-and-tracking-extended.txt
+https://raw.githubusercontent.com/PolishFiltersTeam/KADhosts/master/KADhosts_without_controversies.txt
+https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.Spam/hosts
+https://v.firebog.net/hosts/static/w3kbl.txt
+https://adaway.org/hosts.txt
+https://v.firebog.net/hosts/AdguardDNS.txt
 https://v.firebog.net/hosts/Admiral.txt
-https://raw.githubusercontent.com/anudeepND/blacklist/master/adservers.txt    
-https://s3.amazonaws.com/lists.disconnect.me/simple_ad.txt    
-https://v.firebog.net/hosts/Easylist.txt    
-https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=0&mimetype=plaintext    
-https://raw.githubusercontent.com/FadeMind/hosts.extras/master/UncheckyAds/hosts    
-https://raw.githubusercontent.com/bigdargon/hostsVN/master/hosts    
-https://v.firebog.net/hosts/Easyprivacy.txt    
-https://v.firebog.net/hosts/Prigent-Ads.txt    
-https://gitlab.com/quidsup/notrack-blocklists/raw/master/notrack-blocklist.txt    
+https://raw.githubusercontent.com/anudeepND/blacklist/master/adservers.txt
+https://s3.amazonaws.com/lists.disconnect.me/simple_ad.txt
+https://v.firebog.net/hosts/Easylist.txt
+https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=0&mimetype=plaintext
+https://raw.githubusercontent.com/FadeMind/hosts.extras/master/UncheckyAds/hosts
+https://raw.githubusercontent.com/bigdargon/hostsVN/master/hosts
+https://v.firebog.net/hosts/Easyprivacy.txt
+https://v.firebog.net/hosts/Prigent-Ads.txt
+https://gitlab.com/quidsup/notrack-blocklists/raw/master/notrack-blocklist.txt
 https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.2o7Net/hosts
-https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/spy.txt    
+https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/spy.txt
 https://hostfiles.frogeye.fr/firstparty-trackers-hosts.txt
 https://zerodot1.gitlab.io/CoinBlockerLists/hosts_browser
 https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Alternate%20versions%20Anti-Malware%20List/AntiMalwareHosts.txt
-https://osint.digitalside.it/Threat-Intel/lists/latestdomains.txt    
-https://s3.amazonaws.com/lists.disconnect.me/simple_malvertising.txt    
-https://mirror1.malwaredomains.com/files/justdomains    
-https://v.firebog.net/hosts/Prigent-Crypto.txt    
-https://mirror.cedia.org.ec/malwaredomains/immortal_domains.txt    
-https://www.malwaredomainlist.com/hostslist/hosts.txt
+https://osint.digitalside.it/Threat-Intel/lists/latestdomains.txt
+https://s3.amazonaws.com/lists.disconnect.me/simple_malvertising.txt
+https://v.firebog.net/hosts/Prigent-Crypto.txt
 https://bitbucket.org/ethanr/dns-blacklists/raw/8575c9f96e5b4a1308f2f12394abd86d0927a4a0/bad_lists/Mandiant_APT1_Report_Appendix_D.txt
 https://phishing.army/download/phishing_army_blocklist_extended.txt
 https://gitlab.com/quidsup/notrack-blocklists/raw/master/notrack-malware.txt
 https://v.firebog.net/hosts/Shalla-mal.txt
-https://raw.githubusercontent.com/Spam404/lists/master/main-blacklist.txt  
+https://raw.githubusercontent.com/Spam404/lists/master/main-blacklist.txt
+https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.Risk/hosts
 https://urlhaus.abuse.ch/downloads/hostfile/
-https://emmanuel-lecoq.fr/wp-content/uploads/2020/02/Pi-hole-list.txt
-https://gitlab.com/ZeroDot1/CoinBlockerLists/raw/master/list.txt
+https://gitlab.com/ZeroDot1/CoinBlockerLists/raw/master/list.txt
+http://sysctl.org/cameleon/hosts
+https://s3.amazonaws.com/lists.disconnect.me/simple_tracking.txt
+https://gist.githubusercontent.com/anudeepND/adac7982307fec6ee23605e281a57f1a/raw/5b8582b906a9497624c3f3187a49ebc23a9cf2fb/Test.txt
+https://raw.githubusercontent.com/Dawsey21/Lists/master/main-blacklist.txt
+https://v.firebog.net/hosts/Kowabit.txt
+http://forcet.fr/shared/pihole/Samsung-TV.txt
+https://raw.githubusercontent.com/neodevpro/neodevhost/master/host
+https://raw.githubusercontent.com/durablenapkin/scamblocklist/master/hosts.txt
+https://raw.githubusercontent.com/PolishFiltersTeam/KADhosts/master/KADhosts.txt
+https://raw.githubusercontent.com/matomo-org/referrer-spam-blacklist/master/spammers.txt
+https://someonewhocares.org/hosts/zero/hosts
+https://raw.githubusercontent.com/VeleSila/yhosts/master/hosts
+https://winhelp2002.mvps.org/hosts.txt
+https://v.firebog.net/hosts/neohostsbasic.txt
+https://raw.githubusercontent.com/RooneyMcNibNug/pihole-stuff/master/SNAFU.txt
+https://paulgb.github.io/BarbBlock/blacklists/hosts-file.txt
+https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/extra.txt
+https://git.ponywave.de/Akamaru/Pi-Hole-Lists/raw/branch/master/mobile.txt
+https://git.ponywave.de/Akamaru/Pi-Hole-Lists/raw/branch/master/smarttv.txt
+https://git.ponywave.de/Akamaru/Pi-Hole-Lists/raw/branch/master/adobeblock.txt
+https://git.ponywave.de/Akamaru/Pi-Hole-Lists/raw/branch/master/nintendoblock.txt
+https://git.ponywave.de/Akamaru/Pi-Hole-Lists/raw/branch/master/nomsdata.txt
+https://git.ponywave.de/Akamaru/Pi-Hole-Lists/raw/branch/master/gamefake.txt
+https://git.ponywave.de/Akamaru/Pi-Hole-Lists/raw/branch/master/fakenewsde.txt
+https://git.ponywave.de/Akamaru/Pi-Hole-Lists/raw/branch/master/cryptomine.txt
+https://git.ponywave.de/Akamaru/Pi-Hole-Lists/raw/branch/master/other.txt
+https://git.ponywave.de/Akamaru/Pi-Hole-Lists/raw/branch/master/unsorted.txt
+https://raw.githubusercontent.com/Perflyst/PiHoleBlocklist/master/SmartTV.txt
+https://raw.githubusercontent.com/StevenBlack/hosts/master/alternates/fakenews-gambling-porn-social/hosts
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@ -0,0 +1,22 @@
+## Discord Plex FR : https://discord.gg/3gtABCH
+## Version 2021-09-18
+##
+## Pour une aide à l'installation, consulter le README
+##
+version: "2.1"
+
+services:
+  unifi-controller:
+    image: ghcr.io/linuxserver/unifi-controller
+    container_name: unifi-controller
+#    labels:
+#      - com.centurylinklabs.watchtower.enable=true
+    network_mode: host
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - MEM_LIMIT=1024M
+      - MEM_STARTUP=1024M
+    volumes:
+      - /volume1/docker/unifi/config:/config
+    restart: unless-stopped
--- a/docker-compose/ghost-mysql/docker-compose.yml
+++ b/docker-compose/ghost-mysql/docker-compose.yml
@ -0,0 +1,43 @@
+## Discord Plex FR : https://discord.gg/3gtABCH
+## Version 2022-08-21
+version: '3.1'
+
+services:
+  ghost:
+    container_name: blog_ghost
+    image: ghost:5-alpine
+    restart: unless-stopped
+    ports:
+      - 2368:2368
+    volumes:
+      - ./ghost_content:/var/lib/ghost/content
+    environment:
+      url: https://blog.ndd.fr # LIEN DU BLOG, peut être http://IP_LOCAL:2368 si utilisation local uniquement
+      database__client: mysql
+      database__connection__host: db
+      database__connection__user: root
+      database__connection__password: PASSWORD_SUPER_FORT # CHOISIR UN MOT DE PASSE
+      database__connection__database: ghost
+# - DEBUT - CONFIGURATION MAIL - NON OBLIGATOIRE #
+#      mail__transport: SMTP
+#      mail__from: monmail@ndd.fr
+#      mail__options__service: SMTP
+#      mail__options__host: serveur.smtp.net
+#      mail__options__port: <PORT_SMTP>
+#      mail__options__auth__user: nom_utilisateur
+#      mail__options__auth__pass: mon_mot_de_passe
+# - FIN - CONFIGURATION MAIL - NON OBLIGATOIRE #
+    depends_on:
+      - db
+    mem_limit: 512m
+
+  db: 
+    container_name: blog_db
+    image: mysql:8-debian 
+    restart: unless-stopped 
+    environment:
+      MYSQL_ROOT_PASSWORD: PASSWORD_SUPER_FORT # RE-UTILISER LE MOT DE PASSE CHOISI DANS LES VARIABLES DE GHOST
+    volumes:
+      - ./ghost_db:/var/lib/mysql
+    mem_limit: 768m
+
--- a/docker-compose/gitea/Changer-Theme-Gitea.md
+++ b/docker-compose/gitea/Changer-Theme-Gitea.md
@ -1,7 +1,9 @@
 Changer le thème de Gitea <!-- omit in toc -->
 ============
 ---
-> :pencil2: **Mise à jour v2.1 :** Petit changement du header.tmpl suite à la MAJ 1.15 de Gitea.<br>
+> :pencil2: **Mise à jour v3.1 :** Suppression du `header.tmpl` au profit de `body_outer_pre.tmpl` suite à la MAJ par theme-park ([voir ici](https://github.com/GilbN/theme.park/issues/293#issuecomment-972038142)). Suppression de l'ancienne méthode.<br>
+> :pencil2: **Mise à jour v3.0 :** Gros changement `header.tmpl` suite à la MAJ par theme-park. Suppression de l'ancienne méthode.<br>
+> :pencil2: **Mise à jour v2.1 :** Petit changement du `header.tmpl` suite à la MAJ 1.15 de Gitea.<br>
 > :pencil2: **Mise à jour :** De nouveaux thèmes sont disponibles. Il faut re-télécharger les fichiers CSS. <br>
 *Voir* [§ 1. Ajouter les différents thèmes en laissant le choix à l'utilisateur](#1-ajouter-les-différents-thèmes-en-laissant-le-choix-à-lutilisateur)
 ---
@ -13,21 +15,23 @@ Changer le thème de Gitea <!-- omit in toc -->
 ## Table des matières <!-- omit in toc -->
 - [1. Ajouter les différents thèmes en laissant le choix à l'utilisateur](#1-ajouter-les-différents-thèmes-en-laissant-le-choix-à-l-utilisateur)
  - [1.1. Création des dossiers dans `/volume1/docker/gitea/data/`](#1-1-création-des-dossiers-dans-volume1-docker-gitea-data)
-  - [1.2. Télécharger les différents css](#1-2-télécharger-les-différents-css)
-  - [1.3. Création du fichier `header.tmpl` -- MAJ v2.1](#1-3-création-du-fichier-header-tmpl-maj-v2-1)
-  - [1.4. Modification du fichier `/data/gitea/conf/app.ini`](#1-4-modification-du-fichier-data-gitea-conf-app-ini)
-    - [1.4.1. Point info sur la modification de ce fichier](#1-4-1-point-info-sur-la-modification-de-ce-fichier)
-    - [1.4.2. Ce qu'il faut ajouter au fichier `/data/gitea/conf/app.ini`](#1-4-2-ce-qu-il-faut-ajouter-au-fichier-data-gitea-conf-app-ini)
-    - [1.4.3. Redémarrer le conteneur](#1-4-3-redémarrer-le-conteneur)
-  - [1.5. Choisir son thème dans l'interface graphique de Gitea](#1-5-choisir-son-thème-dans-l-interface-graphique-de-gitea)
- [2. Autre méthode (déconseillée et dépréciée) : Modifier le thème sans laisser le choix à l'utilisateur](#2-autre-méthode-déconseillée-et-dépréciée-modifier-le-thème-sans-laisser-le-choix-à-l-utilisateur)
-  - [2.1. Installer le thème](#2-1-installer-le-thème)
-  - [2.2. Exemple avec le dernier lien du dépôt donnée précédemment](#2-2-exemple-avec-le-dernier-lien-du-dépôt-donnée-précédemment)
-    - [2.2.1. Installer le thème (imposé pour tous)](#2-2-1-installer-le-thème-imposé-pour-tous)
-    - [2.2.2. Changer le thème](#2-2-2-changer-le-thème)
+  - [1.2. Création du fichier `body_outer_pre.tmpl` -- MAJ v3.1](#1-2-création-du-fichier-body-outer-pre-tmpl-maj-v3-1)
+  - [1.3. Modification du fichier `/data/gitea/conf/app.ini`](#1-3-modification-du-fichier-data-gitea-conf-app-ini)
+    - [1.3.1. Point info sur la modification de ce fichier](#1-3-1-point-info-sur-la-modification-de-ce-fichier)
+    - [1.3.2. Ce qu'il faut ajouter au fichier `/data/gitea/conf/app.ini`](#1-3-2-ce-qu-il-faut-ajouter-au-fichier-data-gitea-conf-app-ini)
+    - [2.4.3. Redémarrer le conteneur](#2-4-3-redémarrer-le-conteneur)
+  - [2.5. Choisir son thème dans l'interface graphique de Gitea](#2-5-choisir-son-thème-dans-l-interface-graphique-de-gitea)
+- [2. Méthode précédente - Ajouter les différents thèmes en laissant le choix à l'utilisateur (Laissée pour la postérité)](#2-méthode-précédente-ajouter-les-différents-thèmes-en-laissant-le-choix-à-l-utilisateur-laissée-pour-la-postérité)
+  - [2.1. Création des dossiers dans `/volume1/docker/gitea/data/`](#2-1-création-des-dossiers-dans-volume1-docker-gitea-data)
+  - [2.2. Télécharger les différents css](#2-2-télécharger-les-différents-css)
+  - [2.3. Création du fichier `header.tmpl` -- MAJ v2.1](#2-3-création-du-fichier-header-tmpl-maj-v2-1)
+  - [2.4. Modification du fichier `/data/gitea/conf/app.ini`](#2-4-modification-du-fichier-data-gitea-conf-app-ini)
+    - [2.4.1. Point info sur la modification de ce fichier](#2-4-1-point-info-sur-la-modification-de-ce-fichier)
+    - [2.4.2. Ce qu'il faut ajouter au fichier `/data/gitea/conf/app.ini`](#2-4-2-ce-qu-il-faut-ajouter-au-fichier-data-gitea-conf-app-ini)
+    - [2.4.3. Redémarrer le conteneur](#2-4-3-redémarrer-le-conteneur-1)
+  - [2.5. Choisir son thème dans l'interface graphique de Gitea](#2-5-choisir-son-thème-dans-l-interface-graphique-de-gitea-1)


---
 ---

 # 1. Ajouter les différents thèmes en laissant le choix à l'utilisateur
@ -53,13 +57,91 @@ Changer le thème de Gitea <!-- omit in toc -->
  - `templates`
  - `templates/custom`

-## 1.2. Télécharger les différents css
+## 1.2. Création du fichier `body_outer_pre.tmpl` -- MAJ v3.1
+
+- Supprimer le fichier `header.tmpl` du le dossier `.../templates/custom/` s'il est présent (créé lors d'une méthode précédente dépréciée).
+- Créer le fichier `body_outer_pre.tmpl` et l'enregistrer dans le dossier `.../templates/custom/` créé précédemment.
+```go
+<!-- Voir : https://docs.theme-park.dev/themes/gitea/#adding-the-themes-in-gitea -->
+{{ if .IsSigned }}
+  {{ if and (ne .SignedUser.Theme "gitea") (ne .SignedUser.Theme "arc-green") }}
+    <link rel="stylesheet" href="https://theme-park.dev/css/base/gitea/{{.SignedUser.Theme}}.css">
+  {{end}}
+{{ else if and (ne DefaultTheme "gitea") (ne DefaultTheme "arc-green") }}
+  <link rel="stylesheet" href="https://theme-park.dev/css/base/gitea/{{DefaultTheme}}.css">
+{{end}}
+```
+- Vous pouvez aussi récupérer le fichier tout prêt [dans dossier `data--gitea/public/template/custom/` de ce dépôt](https://gitea.zoz-serv.org/Zoz/plex_fr_discord_repo/src/branch/master/docker-compose/gitea/data--gitea/templates/custom/body_outer_pre.tmpl). Il contient en commentaires quelques détails.
+
+## 1.3. Modification du fichier `/data/gitea/conf/app.ini`
+
+### 1.3.1. Point info sur la modification de ce fichier
+
+Pour modifier ce fichier, il se peut que vous n'ayez pas les permissions d'enregistrer les modifications apportées... Il faudra alors le copier ailleurs, faire les modifications et sauvegarder, puis re-copier dans l'autre sens le fichier dans son dossier d'origine.
+
+C'est ce que je dois faire. Depuis une ligne de commande SSH, je fais :
+- Je copie le fichier dans un dossier où mon utilisateur Admin à les droits en écriture (je ne me logue pas avec l'utilisateur choisir pour Gitea) : <br>`cp /volume1/docker/gitea/data/gitea/conf/app.ini /volume1/docker/gitea/`
+- Je modifie et sauvegarde mon fichier...
+- puis je copie en retour le fichier modifier : `cp /volume1/docker/gitea/app.ini /volume1/docker/gitea/data/gitea/conf/`
+- Il faut ensuite relancer le conteneur Gitea avec Portainer/DSM ou en CLI :  `docker restart gitea`
+
+### 1.3.2. Ce qu'il faut ajouter au fichier `/data/gitea/conf/app.ini`
+
+Il faut ajouter ceci au fichier `app.ini` :
+
+```ini
+[ui]
+THEMES        = gitea,arc-green,dracula,plex,dark,aquamarine,hotline,hotpink,nord,organizr,overseerr,space-gray,onedark,blackberry-abyss,blackberry-amethyst,blackberry-carol,blackberry-dreamscape,blackberry-flamingo,blackberry-hearth,blackberry-martian,blackberry-pumpkin,blackberry-royal,blackberry-shadow,blackberry-solar,blackberry-vanta
+DEFAULT_THEME = dracula
+```
+> :memo: Note 1 : Il se peut que la section `[ui]` soit déjà présente dans votre `app.ini`, il faudra alors modifier la ligne `THEMES`.
+> :memo: Note 2 : **Le thème par défaut n'a plus besoin d'être obligatoirement "gitea".**
+
+### 2.4.3. Redémarrer le conteneur
+
+Il faut bien penser à redémarrer le conteneur une fois le app.ini modifié et copié dans `/data/gitea/conf/`.
+
+## 2.5. Choisir son thème dans l'interface graphique de Gitea
+
+![](https://gitea.zoz-serv.org/Zoz/plex_fr_discord_repo/raw/branch/master/docker-compose/gitea/tuto-1.png)
+
+![](https://gitea.zoz-serv.org/Zoz/plex_fr_discord_repo/raw/branch/master/docker-compose/gitea/tuto-2.png)
+
+![](https://gitea.zoz-serv.org/Zoz/plex_fr_discord_repo/raw/branch/master/docker-compose/gitea/tuto-3.png)
+
+
+
+
+# 2. Méthode précédente - Ajouter les différents thèmes en laissant le choix à l'utilisateur (Laissée pour la postérité)
+
+> :memo: Cette partie devrait être compatible avec d'autres thèmes qui n'apportent qu'un seul fichier `.css`. ***À confirmer...***
+
+## 2.1. Création des dossiers dans `/volume1/docker/gitea/data/`
+
+- Il faut vérifier si la variable GITEA_CUSTOM a été paramétrée. En temps normal, ce n'est pas le cas.
+
+- Si ce n'est pas le cas, on peut aller vérifier le chemin qui est paramétré pour le dossier dit CUSTOM de gitea. Pour celà, il faut aller ici : 
+`https://url-de-votre-gitea.tlds/admin/config`
+
+- Puis chercher la ligne `GITEA_CUSTOM` où apparaîtra le chemin d'accès : `/data/gitea`.
+
+- Dans le cas d'une installation Docker, ça donnerait ceci : `/docker/gitea/data/gitea`
+ <br>(voir le fichier **docker-compose.yml** pour le chemin d'accès avant le `/data/gitea`)
+
+- Il faudra alors créer les dossiers suivants :
+
+  - `public`
+  - `public/css`
+  - `templates`
+  - `templates/custom`
+
+## 2.2. Télécharger les différents css

 - Télécharger les différents fichiers .css [du dossier `data--gitea/public/css/` de ce dépôt](https://gitea.zoz-serv.org/Zoz/plex_fr_discord_repo/src/branch/master/docker-compose/gitea/data--gitea/public/css).
 *(Ne pas les renommer.)*
 - Placer ces fichiers dans le dossier `...public/css` créé précédemment.

-## 1.3. Création du fichier `header.tmpl` -- MAJ v2.1
+## 2.3. Création du fichier `header.tmpl` -- MAJ v2.1

 - Créer le fichier `header.tmpl` et l'enregistrer dans le dossier `.../templates/custom/` créé précédemment.
 ```html
@ -73,9 +155,9 @@ Changer le thème de Gitea <!-- omit in toc -->
 ```
 - Vous pouvez aussi récupérer le fichier tout prêt [dans dossier `data--gitea/public/template/custom/` de ce dépôt](https://gitea.zoz-serv.org/Zoz/plex_fr_discord_repo/src/branch/master/docker-compose/gitea/data--gitea/templates/custom/header.tmpl). Il contient en commentaires quelques détails.

-## 1.4. Modification du fichier `/data/gitea/conf/app.ini`
+## 2.4. Modification du fichier `/data/gitea/conf/app.ini`

-### 1.4.1. Point info sur la modification de ce fichier
+### 2.4.1. Point info sur la modification de ce fichier

 Pour modifier ce fichier, il se peut que vous n'ayez pas les permissions d'enregistrer les modifications apportées... Il faudra alors le copier ailleurs, faire les modifications et sauvegarder, puis re-copier dans l'autre sens le fichier dans son dossier d'origine.

@ -85,23 +167,23 @@ C'est ce que je dois faire. Depuis une ligne de commande SSH, je fais :
 - puis je copie en retour le fichier modifier : `cp /volume1/docker/gitea/app.ini /volume1/docker/gitea/data/gitea/conf/`
 - Il faut ensuite relancer le conteneur Gitea avec Portainer/DSM ou en CLI :  `docker restart gitea`

-### 1.4.2. Ce qu'il faut ajouter au fichier `/data/gitea/conf/app.ini`
+### 2.4.2. Ce qu'il faut ajouter au fichier `/data/gitea/conf/app.ini`

 Il faut ajouter ceci au fichier `app.ini` :

 ```ini
 [ui]
-THEMES        = gitea,arc-green,plex,aquamarine,dark,dracula,hotline,organizr-dark,space-gray,hotpink,mind,onedark,overseer,power,reality,soul,space,time
+THEMES        = gitea,arc-green,dracula,dracula-test,plex,dark,aquamarine,hotline,hotpink,nord,organizr,overseerr,space-gray,onedark,blackberry-abyss,blackberry-amethyst,blackberry-carol,blackberry-dreamscape,blackberry-flamingo,blackberry-hearth,blackberry-martian,blackberry-pumpkin,blackberry-royal,blackberry-shadow,blackberry-solar,blackberry-vanta
 DEFAULT_THEME = gitea
 ```
 > :memo: Note 1 : Il se peut que la section `[ui]` soit déjà présente dans votre `app.ini`, il faudra alors modifier la ligne `THEMES`.
 > :memo: Note 2 : **Il faut que le thème par défaut soit "gitea" car les nouveaux thèmes de theme.park se base sur celui-là.**

-### 1.4.3. Redémarrer le conteneur
+### 2.4.3. Redémarrer le conteneur

 Il faut bien penser à redémarrer le conteneur une fois le app.ini modifié et copié dans `/data/gitea/conf/`.

-## 1.5. Choisir son thème dans l'interface graphique de Gitea
+## 2.5. Choisir son thème dans l'interface graphique de Gitea

 ![](https://gitea.zoz-serv.org/Zoz/plex_fr_discord_repo/raw/branch/master/docker-compose/gitea/tuto-1.png)

@ -115,71 +197,3 @@ Il faut bien penser à redémarrer le conteneur une fois le app.ini modifié et
 Voilà, c'est la fin :D

 ---
---
-La méthode ci-dessous est une méthode que je ne conseille pas, car il n'est pas possible de laisser l'utilisateur choisir son style, et changer est plus pénible... bien que ce soit la méthode indiquée actuellement par l'auteur des thèmes...
-
-# 2. Autre méthode (déconseillée et dépréciée) : Modifier le thème sans laisser le choix à l'utilisateur
-
-## 2.1. Installer le thème
-
-Il faut vérifier si la variable GITEA_CUSTOM a été paramétrée. En temps normal, ce n'est pas le cas.
-
-Si ce n'est pas le cas, on peut aller vérifier le chemin qui est paramétré pour le dossier dit CUSTOM de gitea. Pour celà, il faut aller ici : <br>
-`https://url-de-votre-gitea.tld/admin/config`
-
-Puis chercher la ligne `GITEA_CUSTOM` où apparaîtra le chemin d'accès : `/data/gitea`.
-
-Dans le cas d'une installation Docker, ça donnerait ceci : `/docker/gitea/data/gitea`
- <br>(voir le fichier **docker-compose.yml** pour le chemin d'accès avant le `/data/gitea`)
-
-Il faudra alors créer les dossiers suivants :
-
- `public`
- `templates`
- `templates/custom`
-
-Puis il faudra suivre les instructions du thème choisi. Pour ceux qui n'auraient pas d'instructions, le fichier `styles.css` devra se trouver dans le dossier `public`.
-
-## 2.2. Exemple avec le dernier lien du dépôt donnée précédemment
-
-### 2.2.1. Installer le thème (imposé pour tous)
-
-Je vais prendre le dernier lien présent dans le dépôt donné avant la table des matières.
-
-> - [theme.park](https://docs.theme-park.dev/themes/gitea/) - A theme suite for Gitea.
-
-Dans ce nouveau dépôt ( https://docs.theme-park.dev/themes/gitea/ ) vous trouverez plusieurs thèmes.
-
-Je trouve les thèmes plex, dark et space-gray relativement sympas.
-Des captures sont présentes plus bas dans la page : https://docs.theme-park.dev/themes/gitea/#screenshots
-
-Il faut créer deux fichiers :
-
- `public/styles.css` qui contient (avec des commentaires perso) :
-```css
-/*  Source : https://docs.theme-park.dev/themes/gitea/
-    Possibilités :  https://theme-park.dev/CSS/themes/gitea/XXX.css
-                    aquamarine.css      <--- pas terrible
-                    hotline.css
-                    plex.css            <--- TOP
-                    dark.css            <--- TOP
-                    space-gray.css      <--- TOP
-                    organizr-dark.css
-                    dracula.css
-*/
-@import url("https://theme-park.dev/CSS/themes/gitea/plex.css");
-```
-
- `templates/custom/header.tmpl` qui contient :
-```html
-<link rel="stylesheet" href="{{AppSubUrl}}/styles.css">
-```
-Une fois les fichiers créés et placés dans ces dossiers (faire attention aux permissions), il suffit de redémarrer Gitea (ou le conteneur si installation en Docker).
-
-### 2.2.2. Changer le thème
-
-Pour changer le thème, il suffit de :
-
- modifier le `public/styles.css` avec le nom du css désiré ;
- redémarrer Gitea ;
- ne pas oublier de vider le cache du navigateur... sinon le nouveau thème ne sera pas visible... (ça m'a pris 15 minutes d'essais et au bout de ce temps l'utilisation d'un autre navigateur pour le comprendre...).
--- a/docker-compose/gitea/data--gitea/public/css/aquamarine.css
+++ b/docker-compose/gitea/data--gitea/public/css/aquamarine.css
@ -12,48 +12,36 @@

 /*  https://docs.theme-park.dev/setup/#stylus-method

-    @import "https://theme-park.dev/CSS/themes/<APP_NAME>/<APP_NAME>-base.css";
-    @import "https://theme-park.dev/CSS/variables/THEME.css";
+    @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+    @import "https://theme-park.dev/css/theme-options/THEME.css";
    
-    Anciens thèmes avec :
-        @import url("https://theme-park.dev/CSS/themes/<APP_NAME>/THEME.css");
-                    aquamarine.css
-                    hotline.css
-                    plex.css
-                    dark.css
-                    space-gray.css
-                    organizr-dark.css
-                    dracula.css
    Nouveaux thèmes avec :
-        @import "https://theme-park.dev/CSS/themes/<APP_NAME>/<APP_NAME>-base.css";
-        @import "https://theme-park.dev/CSS/variables/THEME.css";
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/theme-options/THEME.css";
+                    aquamarine.css
+                    dark.css
+                    dracula.css
+                    hotline.css
                    hotpink.css
+                    nord.css
+                    organizr.css
+                    overseerr.css
+                    plex.css
+                    space-gray.css
+
+    Nouveaux thèmes avec :
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/community-theme-options/THEME.css";
                    mind.css
                    onedark.css
-                    overseer.css
                    power.css
                    reality.css
                    soul.css
                    space.css
                    time.css
-                    aquamarine.css
-                    hotline.css
-                    plex.css
-                    dark.css
-                    space-gray.css
-                    organizr-dark.css
-                    dracula.css
+                    ... voir ici la liste -> https://github.com/GilbN/theme.park/tree/master/css/community-theme-options
 */

-
-/* OLD METHOD
-@import url("https://theme-park.dev/CSS/themes/gitea/aquamarine.css");
-*/
-/* NEW METHOD
-@import "https://theme-park.dev/CSS/themes/gitea/gitea-base.css";
-@import "https://theme-park.dev/CSS/themes/gitea/chroma.css";
-@import "https://theme-park.dev/CSS/variables/aquamarine.css";
-*/
-@import "https://theme-park.dev/CSS/themes/gitea/gitea-base.css";
-@import "https://theme-park.dev/CSS/themes/gitea/chroma.css";
-@import "https://theme-park.dev/CSS/variables/aquamarine.css";
+@import "https://theme-park.dev/css/base/gitea/gitea-base.css";
+@import "https://theme-park.dev/css/base/gitea/chroma.css";
+@import "https://theme-park.dev/css/theme-options/aquamarine.css";
--- a/docker-compose/gitea/data--gitea/public/css/blackberry-abyss.css
+++ b/docker-compose/gitea/data--gitea/public/css/blackberry-abyss.css
@ -0,0 +1,59 @@
+/*    dP   dP                                                                  dP        */
+/*    88   88                                                                  88        */
+/*  d8888P 88d888b. .d8888b. 88d8b.d8b. .d8888b.    88d888b. .d8888b. 88d888b. 88  .dP   */
+/*    88   88'  `88 88ooood8 88'`88'`88 88ooood8    88'  `88 88'  `88 88'  `88 88888"    */
+/*    88   88    88 88.  ... 88  88  88 88.  ...    88.  .88 88.  .88 88       88  `8b.  */
+/*    dP   dP    dP `88888P' dP  dP  dP `88888P' 88 88Y888P' `88888P8 dP       dP   `YP  */
+/*                                                  88                                   */
+/*                                                  dP					                 */
+
+/*		   		        Made by @gilbN					         */
+/*			      https://github.com/gilbN/theme.park			 */
+
+/*  https://docs.theme-park.dev/setup/#stylus-method
+
+    @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+    @import "https://theme-park.dev/css/theme-options/THEME.css";
+    
+    Nouveaux thèmes avec :
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/theme-options/THEME.css";
+                    aquamarine.css
+                    dark.css
+                    dracula.css
+                    hotline.css
+                    hotpink.css
+                    nord.css
+                    organizr.css
+                    overseerr.css
+                    plex.css
+                    space-gray.css
+
+    Nouveaux thèmes avec :
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/community-theme-options/THEME.css";
+                    blackberry-abyss.css
+                    blackberry-amethyst.css
+                    blackberry-carol.css
+                    blackberry-dreamscape.css
+                    blackberry-flamingo.css
+                    blackberry-hearth.css
+                    blackberry-martian.css
+                    blackberry-pumpkin.css
+                    blackberry-royal.css
+                    blackberry-shadow.css
+                    blackberry-solar.css
+                    blackberry-vanta.css
+                    mind.css
+                    onedark.css
+                    power.css
+                    reality.css
+                    soul.css
+                    space.css
+                    time.css
+                    ... voir ici la liste -> https://github.com/GilbN/theme.park/tree/master/css/community-theme-options
+*/
+
+@import "https://theme-park.dev/css/base/gitea/gitea-base.css";
+@import "https://theme-park.dev/css/base/gitea/chroma.css";
+@import "https://theme-park.dev/css/community-theme-options/blackberry-abyss.css";
--- a/docker-compose/gitea/data--gitea/public/css/blackberry-amethyst.css
+++ b/docker-compose/gitea/data--gitea/public/css/blackberry-amethyst.css
@ -0,0 +1,59 @@
+/*    dP   dP                                                                  dP        */
+/*    88   88                                                                  88        */
+/*  d8888P 88d888b. .d8888b. 88d8b.d8b. .d8888b.    88d888b. .d8888b. 88d888b. 88  .dP   */
+/*    88   88'  `88 88ooood8 88'`88'`88 88ooood8    88'  `88 88'  `88 88'  `88 88888"    */
+/*    88   88    88 88.  ... 88  88  88 88.  ...    88.  .88 88.  .88 88       88  `8b.  */
+/*    dP   dP    dP `88888P' dP  dP  dP `88888P' 88 88Y888P' `88888P8 dP       dP   `YP  */
+/*                                                  88                                   */
+/*                                                  dP					                 */
+
+/*		   		        Made by @gilbN					         */
+/*			      https://github.com/gilbN/theme.park			 */
+
+/*  https://docs.theme-park.dev/setup/#stylus-method
+
+    @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+    @import "https://theme-park.dev/css/theme-options/THEME.css";
+    
+    Nouveaux thèmes avec :
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/theme-options/THEME.css";
+                    aquamarine.css
+                    dark.css
+                    dracula.css
+                    hotline.css
+                    hotpink.css
+                    nord.css
+                    organizr.css
+                    overseerr.css
+                    plex.css
+                    space-gray.css
+
+    Nouveaux thèmes avec :
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/community-theme-options/THEME.css";
+                    blackberry-abyss.css
+                    blackberry-amethyst.css
+                    blackberry-carol.css
+                    blackberry-dreamscape.css
+                    blackberry-flamingo.css
+                    blackberry-hearth.css
+                    blackberry-martian.css
+                    blackberry-pumpkin.css
+                    blackberry-royal.css
+                    blackberry-shadow.css
+                    blackberry-solar.css
+                    blackberry-vanta.css
+                    mind.css
+                    onedark.css
+                    power.css
+                    reality.css
+                    soul.css
+                    space.css
+                    time.css
+                    ... voir ici la liste -> https://github.com/GilbN/theme.park/tree/master/css/community-theme-options
+*/
+
+@import "https://theme-park.dev/css/base/gitea/gitea-base.css";
+@import "https://theme-park.dev/css/base/gitea/chroma.css";
+@import "https://theme-park.dev/css/community-theme-options/blackberry-amethyst.css";
--- a/docker-compose/gitea/data--gitea/public/css/blackberry-carol.css
+++ b/docker-compose/gitea/data--gitea/public/css/blackberry-carol.css
@ -0,0 +1,59 @@
+/*    dP   dP                                                                  dP        */
+/*    88   88                                                                  88        */
+/*  d8888P 88d888b. .d8888b. 88d8b.d8b. .d8888b.    88d888b. .d8888b. 88d888b. 88  .dP   */
+/*    88   88'  `88 88ooood8 88'`88'`88 88ooood8    88'  `88 88'  `88 88'  `88 88888"    */
+/*    88   88    88 88.  ... 88  88  88 88.  ...    88.  .88 88.  .88 88       88  `8b.  */
+/*    dP   dP    dP `88888P' dP  dP  dP `88888P' 88 88Y888P' `88888P8 dP       dP   `YP  */
+/*                                                  88                                   */
+/*                                                  dP					                 */
+
+/*		   		        Made by @gilbN					         */
+/*			      https://github.com/gilbN/theme.park			 */
+
+/*  https://docs.theme-park.dev/setup/#stylus-method
+
+    @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+    @import "https://theme-park.dev/css/theme-options/THEME.css";
+    
+    Nouveaux thèmes avec :
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/theme-options/THEME.css";
+                    aquamarine.css
+                    dark.css
+                    dracula.css
+                    hotline.css
+                    hotpink.css
+                    nord.css
+                    organizr.css
+                    overseerr.css
+                    plex.css
+                    space-gray.css
+
+    Nouveaux thèmes avec :
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/community-theme-options/THEME.css";
+                    blackberry-abyss.css
+                    blackberry-amethyst.css
+                    blackberry-carol.css
+                    blackberry-dreamscape.css
+                    blackberry-flamingo.css
+                    blackberry-hearth.css
+                    blackberry-martian.css
+                    blackberry-pumpkin.css
+                    blackberry-royal.css
+                    blackberry-shadow.css
+                    blackberry-solar.css
+                    blackberry-vanta.css
+                    mind.css
+                    onedark.css
+                    power.css
+                    reality.css
+                    soul.css
+                    space.css
+                    time.css
+                    ... voir ici la liste -> https://github.com/GilbN/theme.park/tree/master/css/community-theme-options
+*/
+
+@import "https://theme-park.dev/css/base/gitea/gitea-base.css";
+@import "https://theme-park.dev/css/base/gitea/chroma.css";
+@import "https://theme-park.dev/css/community-theme-options/blackberry-carol.css";
--- a/docker-compose/gitea/data--gitea/public/css/blackberry-dreamscape.css
+++ b/docker-compose/gitea/data--gitea/public/css/blackberry-dreamscape.css
@ -0,0 +1,59 @@
+/*    dP   dP                                                                  dP        */
+/*    88   88                                                                  88        */
+/*  d8888P 88d888b. .d8888b. 88d8b.d8b. .d8888b.    88d888b. .d8888b. 88d888b. 88  .dP   */
+/*    88   88'  `88 88ooood8 88'`88'`88 88ooood8    88'  `88 88'  `88 88'  `88 88888"    */
+/*    88   88    88 88.  ... 88  88  88 88.  ...    88.  .88 88.  .88 88       88  `8b.  */
+/*    dP   dP    dP `88888P' dP  dP  dP `88888P' 88 88Y888P' `88888P8 dP       dP   `YP  */
+/*                                                  88                                   */
+/*                                                  dP					                 */
+
+/*		   		        Made by @gilbN					         */
+/*			      https://github.com/gilbN/theme.park			 */
+
+/*  https://docs.theme-park.dev/setup/#stylus-method
+
+    @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+    @import "https://theme-park.dev/css/theme-options/THEME.css";
+    
+    Nouveaux thèmes avec :
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/theme-options/THEME.css";
+                    aquamarine.css
+                    dark.css
+                    dracula.css
+                    hotline.css
+                    hotpink.css
+                    nord.css
+                    organizr.css
+                    overseerr.css
+                    plex.css
+                    space-gray.css
+
+    Nouveaux thèmes avec :
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/community-theme-options/THEME.css";
+                    blackberry-abyss.css
+                    blackberry-amethyst.css
+                    blackberry-carol.css
+                    blackberry-dreamscape.css
+                    blackberry-flamingo.css
+                    blackberry-hearth.css
+                    blackberry-martian.css
+                    blackberry-pumpkin.css
+                    blackberry-royal.css
+                    blackberry-shadow.css
+                    blackberry-solar.css
+                    blackberry-vanta.css
+                    mind.css
+                    onedark.css
+                    power.css
+                    reality.css
+                    soul.css
+                    space.css
+                    time.css
+                    ... voir ici la liste -> https://github.com/GilbN/theme.park/tree/master/css/community-theme-options
+*/
+
+@import "https://theme-park.dev/css/base/gitea/gitea-base.css";
+@import "https://theme-park.dev/css/base/gitea/chroma.css";
+@import "https://theme-park.dev/css/community-theme-options/blackberry-dreamscape.css";
--- a/docker-compose/gitea/data--gitea/public/css/blackberry-flamingo.css
+++ b/docker-compose/gitea/data--gitea/public/css/blackberry-flamingo.css
@ -0,0 +1,59 @@
+/*    dP   dP                                                                  dP        */
+/*    88   88                                                                  88        */
+/*  d8888P 88d888b. .d8888b. 88d8b.d8b. .d8888b.    88d888b. .d8888b. 88d888b. 88  .dP   */
+/*    88   88'  `88 88ooood8 88'`88'`88 88ooood8    88'  `88 88'  `88 88'  `88 88888"    */
+/*    88   88    88 88.  ... 88  88  88 88.  ...    88.  .88 88.  .88 88       88  `8b.  */
+/*    dP   dP    dP `88888P' dP  dP  dP `88888P' 88 88Y888P' `88888P8 dP       dP   `YP  */
+/*                                                  88                                   */
+/*                                                  dP					                 */
+
+/*		   		        Made by @gilbN					         */
+/*			      https://github.com/gilbN/theme.park			 */
+
+/*  https://docs.theme-park.dev/setup/#stylus-method
+
+    @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+    @import "https://theme-park.dev/css/theme-options/THEME.css";
+    
+    Nouveaux thèmes avec :
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/theme-options/THEME.css";
+                    aquamarine.css
+                    dark.css
+                    dracula.css
+                    hotline.css
+                    hotpink.css
+                    nord.css
+                    organizr.css
+                    overseerr.css
+                    plex.css
+                    space-gray.css
+
+    Nouveaux thèmes avec :
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/community-theme-options/THEME.css";
+                    blackberry-abyss.css
+                    blackberry-amethyst.css
+                    blackberry-carol.css
+                    blackberry-dreamscape.css
+                    blackberry-flamingo.css
+                    blackberry-hearth.css
+                    blackberry-martian.css
+                    blackberry-pumpkin.css
+                    blackberry-royal.css
+                    blackberry-shadow.css
+                    blackberry-solar.css
+                    blackberry-vanta.css
+                    mind.css
+                    onedark.css
+                    power.css
+                    reality.css
+                    soul.css
+                    space.css
+                    time.css
+                    ... voir ici la liste -> https://github.com/GilbN/theme.park/tree/master/css/community-theme-options
+*/
+
+@import "https://theme-park.dev/css/base/gitea/gitea-base.css";
+@import "https://theme-park.dev/css/base/gitea/chroma.css";
+@import "https://theme-park.dev/css/community-theme-options/blackberry-flamingo.css";
--- a/docker-compose/gitea/data--gitea/public/css/blackberry-hearth.css
+++ b/docker-compose/gitea/data--gitea/public/css/blackberry-hearth.css
@ -0,0 +1,59 @@
+/*    dP   dP                                                                  dP        */
+/*    88   88                                                                  88        */
+/*  d8888P 88d888b. .d8888b. 88d8b.d8b. .d8888b.    88d888b. .d8888b. 88d888b. 88  .dP   */
+/*    88   88'  `88 88ooood8 88'`88'`88 88ooood8    88'  `88 88'  `88 88'  `88 88888"    */
+/*    88   88    88 88.  ... 88  88  88 88.  ...    88.  .88 88.  .88 88       88  `8b.  */
+/*    dP   dP    dP `88888P' dP  dP  dP `88888P' 88 88Y888P' `88888P8 dP       dP   `YP  */
+/*                                                  88                                   */
+/*                                                  dP					                 */
+
+/*		   		        Made by @gilbN					         */
+/*			      https://github.com/gilbN/theme.park			 */
+
+/*  https://docs.theme-park.dev/setup/#stylus-method
+
+    @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+    @import "https://theme-park.dev/css/theme-options/THEME.css";
+    
+    Nouveaux thèmes avec :
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/theme-options/THEME.css";
+                    aquamarine.css
+                    dark.css
+                    dracula.css
+                    hotline.css
+                    hotpink.css
+                    nord.css
+                    organizr.css
+                    overseerr.css
+                    plex.css
+                    space-gray.css
+
+    Nouveaux thèmes avec :
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/community-theme-options/THEME.css";
+                    blackberry-abyss.css
+                    blackberry-amethyst.css
+                    blackberry-carol.css
+                    blackberry-dreamscape.css
+                    blackberry-flamingo.css
+                    blackberry-hearth.css
+                    blackberry-martian.css
+                    blackberry-pumpkin.css
+                    blackberry-royal.css
+                    blackberry-shadow.css
+                    blackberry-solar.css
+                    blackberry-vanta.css
+                    mind.css
+                    onedark.css
+                    power.css
+                    reality.css
+                    soul.css
+                    space.css
+                    time.css
+                    ... voir ici la liste -> https://github.com/GilbN/theme.park/tree/master/css/community-theme-options
+*/
+
+@import "https://theme-park.dev/css/base/gitea/gitea-base.css";
+@import "https://theme-park.dev/css/base/gitea/chroma.css";
+@import "https://theme-park.dev/css/community-theme-options/blackberry-hearth.css";
--- a/docker-compose/gitea/data--gitea/public/css/blackberry-martian.css
+++ b/docker-compose/gitea/data--gitea/public/css/blackberry-martian.css
@ -0,0 +1,59 @@
+/*    dP   dP                                                                  dP        */
+/*    88   88                                                                  88        */
+/*  d8888P 88d888b. .d8888b. 88d8b.d8b. .d8888b.    88d888b. .d8888b. 88d888b. 88  .dP   */
+/*    88   88'  `88 88ooood8 88'`88'`88 88ooood8    88'  `88 88'  `88 88'  `88 88888"    */
+/*    88   88    88 88.  ... 88  88  88 88.  ...    88.  .88 88.  .88 88       88  `8b.  */
+/*    dP   dP    dP `88888P' dP  dP  dP `88888P' 88 88Y888P' `88888P8 dP       dP   `YP  */
+/*                                                  88                                   */
+/*                                                  dP					                 */
+
+/*		   		        Made by @gilbN					         */
+/*			      https://github.com/gilbN/theme.park			 */
+
+/*  https://docs.theme-park.dev/setup/#stylus-method
+
+    @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+    @import "https://theme-park.dev/css/theme-options/THEME.css";
+    
+    Nouveaux thèmes avec :
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/theme-options/THEME.css";
+                    aquamarine.css
+                    dark.css
+                    dracula.css
+                    hotline.css
+                    hotpink.css
+                    nord.css
+                    organizr.css
+                    overseerr.css
+                    plex.css
+                    space-gray.css
+
+    Nouveaux thèmes avec :
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/community-theme-options/THEME.css";
+                    blackberry-abyss.css
+                    blackberry-amethyst.css
+                    blackberry-carol.css
+                    blackberry-dreamscape.css
+                    blackberry-flamingo.css
+                    blackberry-hearth.css
+                    blackberry-martian.css
+                    blackberry-pumpkin.css
+                    blackberry-royal.css
+                    blackberry-shadow.css
+                    blackberry-solar.css
+                    blackberry-vanta.css
+                    mind.css
+                    onedark.css
+                    power.css
+                    reality.css
+                    soul.css
+                    space.css
+                    time.css
+                    ... voir ici la liste -> https://github.com/GilbN/theme.park/tree/master/css/community-theme-options
+*/
+
+@import "https://theme-park.dev/css/base/gitea/gitea-base.css";
+@import "https://theme-park.dev/css/base/gitea/chroma.css";
+@import "https://theme-park.dev/css/community-theme-options/blackberry-martian.css";
--- a/docker-compose/gitea/data--gitea/public/css/blackberry-pumpkin.css
+++ b/docker-compose/gitea/data--gitea/public/css/blackberry-pumpkin.css
@ -0,0 +1,59 @@
+/*    dP   dP                                                                  dP        */
+/*    88   88                                                                  88        */
+/*  d8888P 88d888b. .d8888b. 88d8b.d8b. .d8888b.    88d888b. .d8888b. 88d888b. 88  .dP   */
+/*    88   88'  `88 88ooood8 88'`88'`88 88ooood8    88'  `88 88'  `88 88'  `88 88888"    */
+/*    88   88    88 88.  ... 88  88  88 88.  ...    88.  .88 88.  .88 88       88  `8b.  */
+/*    dP   dP    dP `88888P' dP  dP  dP `88888P' 88 88Y888P' `88888P8 dP       dP   `YP  */
+/*                                                  88                                   */
+/*                                                  dP					                 */
+
+/*		   		        Made by @gilbN					         */
+/*			      https://github.com/gilbN/theme.park			 */
+
+/*  https://docs.theme-park.dev/setup/#stylus-method
+
+    @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+    @import "https://theme-park.dev/css/theme-options/THEME.css";
+    
+    Nouveaux thèmes avec :
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/theme-options/THEME.css";
+                    aquamarine.css
+                    dark.css
+                    dracula.css
+                    hotline.css
+                    hotpink.css
+                    nord.css
+                    organizr.css
+                    overseerr.css
+                    plex.css
+                    space-gray.css
+
+    Nouveaux thèmes avec :
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/community-theme-options/THEME.css";
+                    blackberry-abyss.css
+                    blackberry-amethyst.css
+                    blackberry-carol.css
+                    blackberry-dreamscape.css
+                    blackberry-flamingo.css
+                    blackberry-hearth.css
+                    blackberry-martian.css
+                    blackberry-pumpkin.css
+                    blackberry-royal.css
+                    blackberry-shadow.css
+                    blackberry-solar.css
+                    blackberry-vanta.css
+                    mind.css
+                    onedark.css
+                    power.css
+                    reality.css
+                    soul.css
+                    space.css
+                    time.css
+                    ... voir ici la liste -> https://github.com/GilbN/theme.park/tree/master/css/community-theme-options
+*/
+
+@import "https://theme-park.dev/css/base/gitea/gitea-base.css";
+@import "https://theme-park.dev/css/base/gitea/chroma.css";
+@import "https://theme-park.dev/css/community-theme-options/blackberry-pumpkin.css";
--- a/docker-compose/gitea/data--gitea/public/css/blackberry-royal.css
+++ b/docker-compose/gitea/data--gitea/public/css/blackberry-royal.css
@ -0,0 +1,59 @@
+/*    dP   dP                                                                  dP        */
+/*    88   88                                                                  88        */
+/*  d8888P 88d888b. .d8888b. 88d8b.d8b. .d8888b.    88d888b. .d8888b. 88d888b. 88  .dP   */
+/*    88   88'  `88 88ooood8 88'`88'`88 88ooood8    88'  `88 88'  `88 88'  `88 88888"    */
+/*    88   88    88 88.  ... 88  88  88 88.  ...    88.  .88 88.  .88 88       88  `8b.  */
+/*    dP   dP    dP `88888P' dP  dP  dP `88888P' 88 88Y888P' `88888P8 dP       dP   `YP  */
+/*                                                  88                                   */
+/*                                                  dP					                 */
+
+/*		   		        Made by @gilbN					         */
+/*			      https://github.com/gilbN/theme.park			 */
+
+/*  https://docs.theme-park.dev/setup/#stylus-method
+
+    @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+    @import "https://theme-park.dev/css/theme-options/THEME.css";
+    
+    Nouveaux thèmes avec :
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/theme-options/THEME.css";
+                    aquamarine.css
+                    dark.css
+                    dracula.css
+                    hotline.css
+                    hotpink.css
+                    nord.css
+                    organizr.css
+                    overseerr.css
+                    plex.css
+                    space-gray.css
+
+    Nouveaux thèmes avec :
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/community-theme-options/THEME.css";
+                    blackberry-abyss.css
+                    blackberry-amethyst.css
+                    blackberry-carol.css
+                    blackberry-dreamscape.css
+                    blackberry-flamingo.css
+                    blackberry-hearth.css
+                    blackberry-martian.css
+                    blackberry-pumpkin.css
+                    blackberry-royal.css
+                    blackberry-shadow.css
+                    blackberry-solar.css
+                    blackberry-vanta.css
+                    mind.css
+                    onedark.css
+                    power.css
+                    reality.css
+                    soul.css
+                    space.css
+                    time.css
+                    ... voir ici la liste -> https://github.com/GilbN/theme.park/tree/master/css/community-theme-options
+*/
+
+@import "https://theme-park.dev/css/base/gitea/gitea-base.css";
+@import "https://theme-park.dev/css/base/gitea/chroma.css";
+@import "https://theme-park.dev/css/community-theme-options/blackberry-royal.css";
--- a/docker-compose/gitea/data--gitea/public/css/blackberry-shadow.css
+++ b/docker-compose/gitea/data--gitea/public/css/blackberry-shadow.css
@ -0,0 +1,59 @@
+/*    dP   dP                                                                  dP        */
+/*    88   88                                                                  88        */
+/*  d8888P 88d888b. .d8888b. 88d8b.d8b. .d8888b.    88d888b. .d8888b. 88d888b. 88  .dP   */
+/*    88   88'  `88 88ooood8 88'`88'`88 88ooood8    88'  `88 88'  `88 88'  `88 88888"    */
+/*    88   88    88 88.  ... 88  88  88 88.  ...    88.  .88 88.  .88 88       88  `8b.  */
+/*    dP   dP    dP `88888P' dP  dP  dP `88888P' 88 88Y888P' `88888P8 dP       dP   `YP  */
+/*                                                  88                                   */
+/*                                                  dP					                 */
+
+/*		   		        Made by @gilbN					         */
+/*			      https://github.com/gilbN/theme.park			 */
+
+/*  https://docs.theme-park.dev/setup/#stylus-method
+
+    @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+    @import "https://theme-park.dev/css/theme-options/THEME.css";
+    
+    Nouveaux thèmes avec :
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/theme-options/THEME.css";
+                    aquamarine.css
+                    dark.css
+                    dracula.css
+                    hotline.css
+                    hotpink.css
+                    nord.css
+                    organizr.css
+                    overseerr.css
+                    plex.css
+                    space-gray.css
+
+    Nouveaux thèmes avec :
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/community-theme-options/THEME.css";
+                    blackberry-abyss.css
+                    blackberry-amethyst.css
+                    blackberry-carol.css
+                    blackberry-dreamscape.css
+                    blackberry-flamingo.css
+                    blackberry-hearth.css
+                    blackberry-martian.css
+                    blackberry-pumpkin.css
+                    blackberry-royal.css
+                    blackberry-shadow.css
+                    blackberry-solar.css
+                    blackberry-vanta.css
+                    mind.css
+                    onedark.css
+                    power.css
+                    reality.css
+                    soul.css
+                    space.css
+                    time.css
+                    ... voir ici la liste -> https://github.com/GilbN/theme.park/tree/master/css/community-theme-options
+*/
+
+@import "https://theme-park.dev/css/base/gitea/gitea-base.css";
+@import "https://theme-park.dev/css/base/gitea/chroma.css";
+@import "https://theme-park.dev/css/community-theme-options/blackberry-shadow.css";
--- a/docker-compose/gitea/data--gitea/public/css/blackberry-solar.css
+++ b/docker-compose/gitea/data--gitea/public/css/blackberry-solar.css
@ -0,0 +1,59 @@
+/*    dP   dP                                                                  dP        */
+/*    88   88                                                                  88        */
+/*  d8888P 88d888b. .d8888b. 88d8b.d8b. .d8888b.    88d888b. .d8888b. 88d888b. 88  .dP   */
+/*    88   88'  `88 88ooood8 88'`88'`88 88ooood8    88'  `88 88'  `88 88'  `88 88888"    */
+/*    88   88    88 88.  ... 88  88  88 88.  ...    88.  .88 88.  .88 88       88  `8b.  */
+/*    dP   dP    dP `88888P' dP  dP  dP `88888P' 88 88Y888P' `88888P8 dP       dP   `YP  */
+/*                                                  88                                   */
+/*                                                  dP					                 */
+
+/*		   		        Made by @gilbN					         */
+/*			      https://github.com/gilbN/theme.park			 */
+
+/*  https://docs.theme-park.dev/setup/#stylus-method
+
+    @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+    @import "https://theme-park.dev/css/theme-options/THEME.css";
+    
+    Nouveaux thèmes avec :
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/theme-options/THEME.css";
+                    aquamarine.css
+                    dark.css
+                    dracula.css
+                    hotline.css
+                    hotpink.css
+                    nord.css
+                    organizr.css
+                    overseerr.css
+                    plex.css
+                    space-gray.css
+
+    Nouveaux thèmes avec :
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/community-theme-options/THEME.css";
+                    blackberry-abyss.css
+                    blackberry-amethyst.css
+                    blackberry-carol.css
+                    blackberry-dreamscape.css
+                    blackberry-flamingo.css
+                    blackberry-hearth.css
+                    blackberry-martian.css
+                    blackberry-pumpkin.css
+                    blackberry-royal.css
+                    blackberry-shadow.css
+                    blackberry-solar.css
+                    blackberry-vanta.css
+                    mind.css
+                    onedark.css
+                    power.css
+                    reality.css
+                    soul.css
+                    space.css
+                    time.css
+                    ... voir ici la liste -> https://github.com/GilbN/theme.park/tree/master/css/community-theme-options
+*/
+
+@import "https://theme-park.dev/css/base/gitea/gitea-base.css";
+@import "https://theme-park.dev/css/base/gitea/chroma.css";
+@import "https://theme-park.dev/css/community-theme-options/blackberry-solar.css";
--- a/docker-compose/gitea/data--gitea/public/css/blackberry-vanta.css
+++ b/docker-compose/gitea/data--gitea/public/css/blackberry-vanta.css
@ -0,0 +1,59 @@
+/*    dP   dP                                                                  dP        */
+/*    88   88                                                                  88        */
+/*  d8888P 88d888b. .d8888b. 88d8b.d8b. .d8888b.    88d888b. .d8888b. 88d888b. 88  .dP   */
+/*    88   88'  `88 88ooood8 88'`88'`88 88ooood8    88'  `88 88'  `88 88'  `88 88888"    */
+/*    88   88    88 88.  ... 88  88  88 88.  ...    88.  .88 88.  .88 88       88  `8b.  */
+/*    dP   dP    dP `88888P' dP  dP  dP `88888P' 88 88Y888P' `88888P8 dP       dP   `YP  */
+/*                                                  88                                   */
+/*                                                  dP					                 */
+
+/*		   		        Made by @gilbN					         */
+/*			      https://github.com/gilbN/theme.park			 */
+
+/*  https://docs.theme-park.dev/setup/#stylus-method
+
+    @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+    @import "https://theme-park.dev/css/theme-options/THEME.css";
+    
+    Nouveaux thèmes avec :
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/theme-options/THEME.css";
+                    aquamarine.css
+                    dark.css
+                    dracula.css
+                    hotline.css
+                    hotpink.css
+                    nord.css
+                    organizr.css
+                    overseerr.css
+                    plex.css
+                    space-gray.css
+
+    Nouveaux thèmes avec :
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/community-theme-options/THEME.css";
+                    blackberry-abyss.css
+                    blackberry-amethyst.css
+                    blackberry-carol.css
+                    blackberry-dreamscape.css
+                    blackberry-flamingo.css
+                    blackberry-hearth.css
+                    blackberry-martian.css
+                    blackberry-pumpkin.css
+                    blackberry-royal.css
+                    blackberry-shadow.css
+                    blackberry-solar.css
+                    blackberry-vanta.css
+                    mind.css
+                    onedark.css
+                    power.css
+                    reality.css
+                    soul.css
+                    space.css
+                    time.css
+                    ... voir ici la liste -> https://github.com/GilbN/theme.park/tree/master/css/community-theme-options
+*/
+
+@import "https://theme-park.dev/css/base/gitea/gitea-base.css";
+@import "https://theme-park.dev/css/base/gitea/chroma.css";
+@import "https://theme-park.dev/css/community-theme-options/blackberry-vanta.css";
--- a/docker-compose/gitea/data--gitea/public/css/dark.css
+++ b/docker-compose/gitea/data--gitea/public/css/dark.css
@ -12,47 +12,36 @@

 /*  https://docs.theme-park.dev/setup/#stylus-method

-    @import "https://theme-park.dev/CSS/themes/<APP_NAME>/<APP_NAME>-base.css";
-    @import "https://theme-park.dev/CSS/variables/THEME.css";
+    @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+    @import "https://theme-park.dev/css/theme-options/THEME.css";
    
-    Anciens thèmes avec :
-        @import url("https://theme-park.dev/CSS/themes/<APP_NAME>/THEME.css");
-                    aquamarine.css
-                    hotline.css
-                    plex.css
-                    dark.css
-                    space-gray.css
-                    organizr-dark.css
-                    dracula.css
    Nouveaux thèmes avec :
-        @import "https://theme-park.dev/CSS/themes/<APP_NAME>/<APP_NAME>-base.css";
-        @import "https://theme-park.dev/CSS/variables/THEME.css";
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/theme-options/THEME.css";
+                    aquamarine.css
+                    dark.css
+                    dracula.css
+                    hotline.css
                    hotpink.css
+                    nord.css
+                    organizr.css
+                    overseerr.css
+                    plex.css
+                    space-gray.css
+
+    Nouveaux thèmes avec :
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/community-theme-options/THEME.css";
                    mind.css
                    onedark.css
-                    overseer.css
                    power.css
                    reality.css
                    soul.css
                    space.css
                    time.css
-                    aquamarine.css
-                    hotline.css
-                    plex.css
-                    dark.css
-                    space-gray.css
-                    organizr-dark.css
-                    dracula.css
+                    ... voir ici la liste -> https://github.com/GilbN/theme.park/tree/master/css/community-theme-options
 */

-/* OLD METHOD
-@import url("https://theme-park.dev/CSS/themes/gitea/dark.css");
-*/
-/* NEW METHOD
-@import "https://theme-park.dev/CSS/themes/gitea/gitea-base.css";
-@import "https://theme-park.dev/CSS/themes/gitea/chroma.css";
-@import "https://theme-park.dev/CSS/variables/dark.css";
-*/
-@import "https://theme-park.dev/CSS/themes/gitea/gitea-base.css";
-@import "https://theme-park.dev/CSS/themes/gitea/chroma.css";
-@import "https://theme-park.dev/CSS/variables/dark.css";
+@import "https://theme-park.dev/css/base/gitea/gitea-base.css";
+@import "https://theme-park.dev/css/base/gitea/chroma.css";
+@import "https://theme-park.dev/css/theme-options/dark.css";
--- a/docker-compose/gitea/data--gitea/public/css/dracula-test.css
+++ b/docker-compose/gitea/data--gitea/public/css/dracula-test.css
@ -12,44 +12,36 @@

 /*  https://docs.theme-park.dev/setup/#stylus-method

-    @import "https://theme-park.dev/CSS/themes/<APP_NAME>/<APP_NAME>-base.css";
-    @import "https://theme-park.dev/CSS/variables/THEME.css";
+    @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+    @import "https://theme-park.dev/css/theme-options/THEME.css";
    
-    Anciens thèmes avec :
-        @import url("https://theme-park.dev/CSS/themes/<APP_NAME>/THEME.css");
-                    aquamarine.css
-                    hotline.css
-                    plex.css
-                    dark.css
-                    space-gray.css
-                    organizr-dark.css
-                    dracula.css
    Nouveaux thèmes avec :
-        @import "https://theme-park.dev/CSS/themes/<APP_NAME>/<APP_NAME>-base.css";
-        @import "https://theme-park.dev/CSS/variables/THEME.css";
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/theme-options/THEME.css";
+                    aquamarine.css
+                    dark.css
+                    dracula.css
+                    hotline.css
                    hotpink.css
+                    nord.css
+                    organizr.css
+                    overseerr.css
+                    plex.css
+                    space-gray.css
+
+    Nouveaux thèmes avec :
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/community-theme-options/THEME.css";
                    mind.css
                    onedark.css
-                    overseer.css
                    power.css
                    reality.css
                    soul.css
                    space.css
                    time.css
-                    aquamarine.css
-                    hotline.css
-                    plex.css
-                    dark.css
-                    space-gray.css
-                    organizr-dark.css
-                    dracula.css
+                    ... voir ici la liste -> https://github.com/GilbN/theme.park/tree/master/css/community-theme-options
 */

-/* NEW METHOD
-@import "https://theme-park.dev/CSS/themes/gitea/gitea-base.css";
-@import "https://theme-park.dev/CSS/themes/gitea/chroma.css";
-@import "https://theme-park.dev/CSS/variables/mind.css";
-*/
-@import "https://theme-park.dev/CSS/themes/gitea/gitea-base.css";
-@import "https://theme-park.dev/CSS/themes/gitea/chroma.css";
-@import "https://theme-park.dev/CSS/variables/mind.css";
+@import "https://theme-park.dev/css/base/gitea/gitea-base.css";
+@import "https://theme-park.dev/css/base/gitea/chroma.css";
+@import "https://theme-park.dev/css/theme-options/dracula.css";
--- a/docker-compose/gitea/data--gitea/public/css/dracula.css
+++ b/docker-compose/gitea/data--gitea/public/css/dracula.css
@ -12,48 +12,36 @@

 /*  https://docs.theme-park.dev/setup/#stylus-method

-    @import "https://theme-park.dev/CSS/themes/<APP_NAME>/<APP_NAME>-base.css";
-    @import "https://theme-park.dev/CSS/variables/THEME.css";
+    @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+    @import "https://theme-park.dev/css/theme-options/THEME.css";
    
-    Anciens thèmes avec :
-        @import url("https://theme-park.dev/CSS/themes/<APP_NAME>/THEME.css");
-                    aquamarine.css
-                    hotline.css
-                    plex.css
-                    dark.css
-                    space-gray.css
-                    organizr-dark.css
-                    dracula.css
    Nouveaux thèmes avec :
-        @import "https://theme-park.dev/CSS/themes/<APP_NAME>/<APP_NAME>-base.css";
-        @import "https://theme-park.dev/CSS/variables/THEME.css";
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/theme-options/THEME.css";
+                    aquamarine.css
+                    dark.css
+                    dracula.css
+                    hotline.css
                    hotpink.css
+                    nord.css
+                    organizr.css
+                    overseerr.css
+                    plex.css
+                    space-gray.css
+
+    Nouveaux thèmes avec :
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/community-theme-options/THEME.css";
                    mind.css
                    onedark.css
-                    overseer.css
                    power.css
                    reality.css
                    soul.css
                    space.css
                    time.css
-                    aquamarine.css
-                    hotline.css
-                    plex.css
-                    dark.css
-                    space-gray.css
-                    organizr-dark.css
-                    dracula.css
+                    ... voir ici la liste -> https://github.com/GilbN/theme.park/tree/master/css/community-theme-options
 */

-
-/* OLD METHOD
-@import url("https://theme-park.dev/CSS/themes/gitea/dracula.css");
-*/
-/* NEW METHOD
-@import "https://theme-park.dev/CSS/themes/gitea/gitea-base.css";
-@import "https://theme-park.dev/CSS/themes/gitea/chroma.css";
-@import "https://theme-park.dev/CSS/variables/dracula.css";
-*/
-@import "https://theme-park.dev/CSS/themes/gitea/gitea-base.css";
-@import "https://theme-park.dev/CSS/themes/gitea/chroma.css";
-@import "https://theme-park.dev/CSS/variables/dracula.css";
+@import "https://theme-park.dev/css/base/gitea/gitea-base.css";
+@import "https://theme-park.dev/css/base/gitea/chroma.css";
+@import "https://theme-park.dev/css/theme-options/dracula.css";
--- a/docker-compose/gitea/data--gitea/public/css/hotline.css
+++ b/docker-compose/gitea/data--gitea/public/css/hotline.css
@ -12,47 +12,36 @@

 /*  https://docs.theme-park.dev/setup/#stylus-method

-    @import "https://theme-park.dev/CSS/themes/<APP_NAME>/<APP_NAME>-base.css";
-    @import "https://theme-park.dev/CSS/variables/THEME.css";
+    @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+    @import "https://theme-park.dev/css/theme-options/THEME.css";
    
-    Anciens thèmes avec :
-        @import url("https://theme-park.dev/CSS/themes/<APP_NAME>/THEME.css");
-                    aquamarine.css
-                    hotline.css
-                    plex.css
-                    dark.css
-                    space-gray.css
-                    organizr-dark.css
-                    dracula.css
    Nouveaux thèmes avec :
-        @import "https://theme-park.dev/CSS/themes/<APP_NAME>/<APP_NAME>-base.css";
-        @import "https://theme-park.dev/CSS/variables/THEME.css";
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/theme-options/THEME.css";
+                    aquamarine.css
+                    dark.css
+                    dracula.css
+                    hotline.css
                    hotpink.css
+                    nord.css
+                    organizr.css
+                    overseerr.css
+                    plex.css
+                    space-gray.css
+
+    Nouveaux thèmes avec :
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/community-theme-options/THEME.css";
                    mind.css
                    onedark.css
-                    overseer.css
                    power.css
                    reality.css
                    soul.css
                    space.css
                    time.css
-                    aquamarine.css
-                    hotline.css
-                    plex.css
-                    dark.css
-                    space-gray.css
-                    organizr-dark.css
-                    dracula.css
+                    ... voir ici la liste -> https://github.com/GilbN/theme.park/tree/master/css/community-theme-options
 */

-/* OLD METHOD
-@import url("https://theme-park.dev/CSS/themes/gitea/hotline.css");
-*/
-/* NEW METHOD
-@import "https://theme-park.dev/CSS/themes/gitea/gitea-base.css";
-@import "https://theme-park.dev/CSS/themes/gitea/chroma.css";
-@import "https://theme-park.dev/CSS/variables/hotline.css";
-*/
-@import "https://theme-park.dev/CSS/themes/gitea/gitea-base.css";
-@import "https://theme-park.dev/CSS/themes/gitea/chroma.css";
-@import "https://theme-park.dev/CSS/variables/hotline.css";
+@import "https://theme-park.dev/css/base/gitea/gitea-base.css";
+@import "https://theme-park.dev/css/base/gitea/chroma.css";
+@import "https://theme-park.dev/css/theme-options/hotline.css";
--- a/docker-compose/gitea/data--gitea/public/css/hotpink.css
+++ b/docker-compose/gitea/data--gitea/public/css/hotpink.css
@ -12,44 +12,36 @@

 /*  https://docs.theme-park.dev/setup/#stylus-method

-    @import "https://theme-park.dev/CSS/themes/<APP_NAME>/<APP_NAME>-base.css";
-    @import "https://theme-park.dev/CSS/variables/THEME.css";
+    @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+    @import "https://theme-park.dev/css/theme-options/THEME.css";
    
-    Anciens thèmes avec :
-        @import url("https://theme-park.dev/CSS/themes/<APP_NAME>/THEME.css");
-                    aquamarine.css
-                    hotline.css
-                    plex.css
-                    dark.css
-                    space-gray.css
-                    organizr-dark.css
-                    dracula.css
    Nouveaux thèmes avec :
-        @import "https://theme-park.dev/CSS/themes/<APP_NAME>/<APP_NAME>-base.css";
-        @import "https://theme-park.dev/CSS/variables/THEME.css";
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/theme-options/THEME.css";
+                    aquamarine.css
+                    dark.css
+                    dracula.css
+                    hotline.css
                    hotpink.css
+                    nord.css
+                    organizr.css
+                    overseerr.css
+                    plex.css
+                    space-gray.css
+
+    Nouveaux thèmes avec :
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/community-theme-options/THEME.css";
                    mind.css
                    onedark.css
-                    overseer.css
                    power.css
                    reality.css
                    soul.css
                    space.css
                    time.css
-                    aquamarine.css
-                    hotline.css
-                    plex.css
-                    dark.css
-                    space-gray.css
-                    organizr-dark.css
-                    dracula.css
+                    ... voir ici la liste -> https://github.com/GilbN/theme.park/tree/master/css/community-theme-options
 */

-/* NEW METHOD
-@import "https://theme-park.dev/CSS/themes/gitea/gitea-base.css";
-@import "https://theme-park.dev/CSS/themes/gitea/chroma.css";
-@import "https://theme-park.dev/CSS/variables/hotpink.css";
-*/
-@import "https://theme-park.dev/CSS/themes/gitea/gitea-base.css";
-@import "https://theme-park.dev/CSS/themes/gitea/chroma.css";
-@import "https://theme-park.dev/CSS/variables/hotpink.css";
+@import "https://theme-park.dev/css/base/gitea/gitea-base.css";
+@import "https://theme-park.dev/css/base/gitea/chroma.css";
+@import "https://theme-park.dev/css/theme-options/hotpink.css";
--- a/docker-compose/gitea/data--gitea/public/css/nord.css
+++ b/docker-compose/gitea/data--gitea/public/css/nord.css
@ -12,44 +12,36 @@

 /*  https://docs.theme-park.dev/setup/#stylus-method

-    @import "https://theme-park.dev/CSS/themes/<APP_NAME>/<APP_NAME>-base.css";
-    @import "https://theme-park.dev/CSS/variables/THEME.css";
+    @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+    @import "https://theme-park.dev/css/theme-options/THEME.css";
    
-    Anciens thèmes avec :
-        @import url("https://theme-park.dev/CSS/themes/<APP_NAME>/THEME.css");
-                    aquamarine.css
-                    hotline.css
-                    plex.css
-                    dark.css
-                    space-gray.css
-                    organizr-dark.css
-                    dracula.css
    Nouveaux thèmes avec :
-        @import "https://theme-park.dev/CSS/themes/<APP_NAME>/<APP_NAME>-base.css";
-        @import "https://theme-park.dev/CSS/variables/THEME.css";
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/theme-options/THEME.css";
+                    aquamarine.css
+                    dark.css
+                    dracula.css
+                    hotline.css
                    hotpink.css
+                    nord.css
+                    organizr.css
+                    overseerr.css
+                    plex.css
+                    space-gray.css
+
+    Nouveaux thèmes avec :
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/community-theme-options/THEME.css";
                    mind.css
                    onedark.css
-                    overseer.css
                    power.css
                    reality.css
                    soul.css
                    space.css
                    time.css
-                    aquamarine.css
-                    hotline.css
-                    plex.css
-                    dark.css
-                    space-gray.css
-                    organizr-dark.css
-                    dracula.css
+                    ... voir ici la liste -> https://github.com/GilbN/theme.park/tree/master/css/community-theme-options
 */

-/* NEW METHOD
-@import "https://theme-park.dev/CSS/themes/gitea/gitea-base.css";
-@import "https://theme-park.dev/CSS/themes/gitea/chroma.css";
-@import "https://theme-park.dev/CSS/variables/time.css";
-*/
-@import "https://theme-park.dev/CSS/themes/gitea/gitea-base.css";
-@import "https://theme-park.dev/CSS/themes/gitea/chroma.css";
-@import "https://theme-park.dev/CSS/variables/time.css";
+@import "https://theme-park.dev/css/base/gitea/gitea-base.css";
+@import "https://theme-park.dev/css/base/gitea/chroma.css";
+@import "https://theme-park.dev/css/theme-options/nord.css";
--- a/docker-compose/gitea/data--gitea/public/css/onedark.css
+++ b/docker-compose/gitea/data--gitea/public/css/onedark.css
@ -12,44 +12,48 @@

 /*  https://docs.theme-park.dev/setup/#stylus-method

-    @import "https://theme-park.dev/CSS/themes/<APP_NAME>/<APP_NAME>-base.css";
-    @import "https://theme-park.dev/CSS/variables/THEME.css";
+    @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+    @import "https://theme-park.dev/css/theme-options/THEME.css";
    
-    Anciens thèmes avec :
-        @import url("https://theme-park.dev/CSS/themes/<APP_NAME>/THEME.css");
-                    aquamarine.css
-                    hotline.css
-                    plex.css
-                    dark.css
-                    space-gray.css
-                    organizr-dark.css
-                    dracula.css
    Nouveaux thèmes avec :
-        @import "https://theme-park.dev/CSS/themes/<APP_NAME>/<APP_NAME>-base.css";
-        @import "https://theme-park.dev/CSS/variables/THEME.css";
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/theme-options/THEME.css";
+                    aquamarine.css
+                    dark.css
+                    dracula.css
+                    hotline.css
                    hotpink.css
+                    nord.css
+                    organizr.css
+                    overseerr.css
+                    plex.css
+                    space-gray.css
+
+    Nouveaux thèmes avec :
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/community-theme-options/THEME.css";
+                    blackberry-abyss.css
+                    blackberry-amethyst.css
+                    blackberry-carol.css
+                    blackberry-dreamscape.css
+                    blackberry-flamingo.css
+                    blackberry-hearth.css
+                    blackberry-martian.css
+                    blackberry-pumpkin.css
+                    blackberry-royal.css
+                    blackberry-shadow.css
+                    blackberry-solar.css
+                    blackberry-vanta.css
                    mind.css
                    onedark.css
-                    overseer.css
                    power.css
                    reality.css
                    soul.css
                    space.css
                    time.css
-                    aquamarine.css
-                    hotline.css
-                    plex.css
-                    dark.css
-                    space-gray.css
-                    organizr-dark.css
-                    dracula.css
+                    ... voir ici la liste -> https://github.com/GilbN/theme.park/tree/master/css/community-theme-options
 */

-/* NEW METHOD
-@import "https://theme-park.dev/CSS/themes/gitea/gitea-base.css";
-@import "https://theme-park.dev/CSS/themes/gitea/chroma.css";
-@import "https://theme-park.dev/CSS/variables/onedark.css";
-*/
-@import "https://theme-park.dev/CSS/themes/gitea/gitea-base.css";
-@import "https://theme-park.dev/CSS/themes/gitea/chroma.css";
-@import "https://theme-park.dev/CSS/variables/onedark.css";
+@import "https://theme-park.dev/css/base/gitea/gitea-base.css";
+@import "https://theme-park.dev/css/base/gitea/chroma.css";
+@import "https://theme-park.dev/css/community-theme-options/onedark.css";
--- a/docker-compose/gitea/data--gitea/public/css/organizr-dark.css
+++ b/docker-compose/gitea/data--gitea/public/css/organizr-dark.css
@ -1,58 +0,0 @@
-/*    dP   dP                                                                  dP        */
-/*    88   88                                                                  88        */
-/*  d8888P 88d888b. .d8888b. 88d8b.d8b. .d8888b.    88d888b. .d8888b. 88d888b. 88  .dP   */
-/*    88   88'  `88 88ooood8 88'`88'`88 88ooood8    88'  `88 88'  `88 88'  `88 88888"    */
-/*    88   88    88 88.  ... 88  88  88 88.  ...    88.  .88 88.  .88 88       88  `8b.  */
-/*    dP   dP    dP `88888P' dP  dP  dP `88888P' 88 88Y888P' `88888P8 dP       dP   `YP  */
-/*                                                  88                                   */
-/*                                                  dP					                 */
-
-/*		   		        Made by @gilbN					         */
-/*			      https://github.com/gilbN/theme.park			 */
-
-/*  https://docs.theme-park.dev/setup/#stylus-method
-
-    @import "https://theme-park.dev/CSS/themes/<APP_NAME>/<APP_NAME>-base.css";
-    @import "https://theme-park.dev/CSS/variables/THEME.css";
-    
-    Anciens thèmes avec :
-        @import url("https://theme-park.dev/CSS/themes/<APP_NAME>/THEME.css");
-                    aquamarine.css
-                    hotline.css
-                    plex.css
-                    dark.css
-                    space-gray.css
-                    organizr-dark.css
-                    dracula.css
-    Nouveaux thèmes avec :
-        @import "https://theme-park.dev/CSS/themes/<APP_NAME>/<APP_NAME>-base.css";
-        @import "https://theme-park.dev/CSS/variables/THEME.css";
-                    hotpink.css
-                    mind.css
-                    onedark.css
-                    overseer.css
-                    power.css
-                    reality.css
-                    soul.css
-                    space.css
-                    time.css
-                    aquamarine.css
-                    hotline.css
-                    plex.css
-                    dark.css
-                    space-gray.css
-                    organizr-dark.css
-                    dracula.css
-*/
-
-/* OLD METHOD
-@import url("https://theme-park.dev/CSS/themes/gitea/organizr-dark.css");
-*/
-/* NEW METHOD
-@import "https://theme-park.dev/CSS/themes/gitea/gitea-base.css";
-@import "https://theme-park.dev/CSS/themes/gitea/chroma.css";
-@import "https://theme-park.dev/CSS/variables/organizr-dark.css";
-*/
-@import "https://theme-park.dev/CSS/themes/gitea/gitea-base.css";
-@import "https://theme-park.dev/CSS/themes/gitea/chroma.css";
-@import "https://theme-park.dev/CSS/variables/organizr-dark.css";
--- a/docker-compose/gitea/data--gitea/public/css/organizr.css
+++ b/docker-compose/gitea/data--gitea/public/css/organizr.css
@ -12,44 +12,36 @@

 /*  https://docs.theme-park.dev/setup/#stylus-method

-    @import "https://theme-park.dev/CSS/themes/<APP_NAME>/<APP_NAME>-base.css";
-    @import "https://theme-park.dev/CSS/variables/THEME.css";
+    @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+    @import "https://theme-park.dev/css/theme-options/THEME.css";
    
-    Anciens thèmes avec :
-        @import url("https://theme-park.dev/CSS/themes/<APP_NAME>/THEME.css");
-                    aquamarine.css
-                    hotline.css
-                    plex.css
-                    dark.css
-                    space-gray.css
-                    organizr-dark.css
-                    dracula.css
    Nouveaux thèmes avec :
-        @import "https://theme-park.dev/CSS/themes/<APP_NAME>/<APP_NAME>-base.css";
-        @import "https://theme-park.dev/CSS/variables/THEME.css";
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/theme-options/THEME.css";
+                    aquamarine.css
+                    dark.css
+                    dracula.css
+                    hotline.css
                    hotpink.css
+                    nord.css
+                    organizr.css
+                    overseerr.css
+                    plex.css
+                    space-gray.css
+
+    Nouveaux thèmes avec :
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/community-theme-options/THEME.css";
                    mind.css
                    onedark.css
-                    overseer.css
                    power.css
                    reality.css
                    soul.css
                    space.css
                    time.css
-                    aquamarine.css
-                    hotline.css
-                    plex.css
-                    dark.css
-                    space-gray.css
-                    organizr-dark.css
-                    dracula.css
+                    ... voir ici la liste -> https://github.com/GilbN/theme.park/tree/master/css/community-theme-options
 */

-/* NEW METHOD
-@import "https://theme-park.dev/CSS/themes/gitea/gitea-base.css";
-@import "https://theme-park.dev/CSS/themes/gitea/chroma.css";
-@import "https://theme-park.dev/CSS/variables/soul.css";
-*/
-@import "https://theme-park.dev/CSS/themes/gitea/gitea-base.css";
-@import "https://theme-park.dev/CSS/themes/gitea/chroma.css";
-@import "https://theme-park.dev/CSS/variables/soul.css";
+@import "https://theme-park.dev/css/base/gitea/gitea-base.css";
+@import "https://theme-park.dev/css/base/gitea/chroma.css";
+@import "https://theme-park.dev/css/theme-options/organizr.css";
--- a/docker-compose/gitea/data--gitea/public/css/overseer.css
+++ b/docker-compose/gitea/data--gitea/public/css/overseer.css
@ -1,55 +0,0 @@
-/*    dP   dP                                                                  dP        */
-/*    88   88                                                                  88        */
-/*  d8888P 88d888b. .d8888b. 88d8b.d8b. .d8888b.    88d888b. .d8888b. 88d888b. 88  .dP   */
-/*    88   88'  `88 88ooood8 88'`88'`88 88ooood8    88'  `88 88'  `88 88'  `88 88888"    */
-/*    88   88    88 88.  ... 88  88  88 88.  ...    88.  .88 88.  .88 88       88  `8b.  */
-/*    dP   dP    dP `88888P' dP  dP  dP `88888P' 88 88Y888P' `88888P8 dP       dP   `YP  */
-/*                                                  88                                   */
-/*                                                  dP					                 */
-
-/*		   		        Made by @gilbN					         */
-/*			      https://github.com/gilbN/theme.park			 */
-
-/*  https://docs.theme-park.dev/setup/#stylus-method
-
-    @import "https://theme-park.dev/CSS/themes/<APP_NAME>/<APP_NAME>-base.css";
-    @import "https://theme-park.dev/CSS/variables/THEME.css";
-    
-    Anciens thèmes avec :
-        @import url("https://theme-park.dev/CSS/themes/<APP_NAME>/THEME.css");
-                    aquamarine.css
-                    hotline.css
-                    plex.css
-                    dark.css
-                    space-gray.css
-                    organizr-dark.css
-                    dracula.css
-    Nouveaux thèmes avec :
-        @import "https://theme-park.dev/CSS/themes/<APP_NAME>/<APP_NAME>-base.css";
-        @import "https://theme-park.dev/CSS/variables/THEME.css";
-                    hotpink.css
-                    mind.css
-                    onedark.css
-                    overseer.css
-                    power.css
-                    reality.css
-                    soul.css
-                    space.css
-                    time.css
-                    aquamarine.css
-                    hotline.css
-                    plex.css
-                    dark.css
-                    space-gray.css
-                    organizr-dark.css
-                    dracula.css
-*/
-
-/* NEW METHOD
-@import "https://theme-park.dev/CSS/themes/gitea/gitea-base.css";
-@import "https://theme-park.dev/CSS/themes/gitea/chroma.css";
-@import "https://theme-park.dev/CSS/variables/overseer.css";
-*/
-@import "https://theme-park.dev/CSS/themes/gitea/gitea-base.css";
-@import "https://theme-park.dev/CSS/themes/gitea/chroma.css";
-@import "https://theme-park.dev/CSS/variables/overseer.css";
--- a/docker-compose/gitea/data--gitea/public/css/overseerr.css
+++ b/docker-compose/gitea/data--gitea/public/css/overseerr.css
@ -12,44 +12,36 @@

 /*  https://docs.theme-park.dev/setup/#stylus-method

-    @import "https://theme-park.dev/CSS/themes/<APP_NAME>/<APP_NAME>-base.css";
-    @import "https://theme-park.dev/CSS/variables/THEME.css";
+    @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+    @import "https://theme-park.dev/css/theme-options/THEME.css";
    
-    Anciens thèmes avec :
-        @import url("https://theme-park.dev/CSS/themes/<APP_NAME>/THEME.css");
-                    aquamarine.css
-                    hotline.css
-                    plex.css
-                    dark.css
-                    space-gray.css
-                    organizr-dark.css
-                    dracula.css
    Nouveaux thèmes avec :
-        @import "https://theme-park.dev/CSS/themes/<APP_NAME>/<APP_NAME>-base.css";
-        @import "https://theme-park.dev/CSS/variables/THEME.css";
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/theme-options/THEME.css";
+                    aquamarine.css
+                    dark.css
+                    dracula.css
+                    hotline.css
                    hotpink.css
+                    nord.css
+                    organizr.css
+                    overseerr.css
+                    plex.css
+                    space-gray.css
+
+    Nouveaux thèmes avec :
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/community-theme-options/THEME.css";
                    mind.css
                    onedark.css
-                    overseer.css
                    power.css
                    reality.css
                    soul.css
                    space.css
                    time.css
-                    aquamarine.css
-                    hotline.css
-                    plex.css
-                    dark.css
-                    space-gray.css
-                    organizr-dark.css
-                    dracula.css
+                    ... voir ici la liste -> https://github.com/GilbN/theme.park/tree/master/css/community-theme-options
 */

-/* NEW METHOD
-@import "https://theme-park.dev/CSS/themes/gitea/gitea-base.css";
-@import "https://theme-park.dev/CSS/themes/gitea/chroma.css";
-@import "https://theme-park.dev/CSS/variables/power.css";
-*/
-@import "https://theme-park.dev/CSS/themes/gitea/gitea-base.css";
-@import "https://theme-park.dev/CSS/themes/gitea/chroma.css";
-@import "https://theme-park.dev/CSS/variables/power.css";
+@import "https://theme-park.dev/css/base/gitea/gitea-base.css";
+@import "https://theme-park.dev/css/base/gitea/chroma.css";
+@import "https://theme-park.dev/css/theme-options/overseerr.css";
--- a/docker-compose/gitea/data--gitea/public/css/plex.css
+++ b/docker-compose/gitea/data--gitea/public/css/plex.css
@ -12,47 +12,36 @@

 /*  https://docs.theme-park.dev/setup/#stylus-method

-    @import "https://theme-park.dev/CSS/themes/<APP_NAME>/<APP_NAME>-base.css";
-    @import "https://theme-park.dev/CSS/variables/THEME.css";
+    @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+    @import "https://theme-park.dev/css/theme-options/THEME.css";
    
-    Anciens thèmes avec :
-        @import url("https://theme-park.dev/CSS/themes/<APP_NAME>/THEME.css");
-                    aquamarine.css
-                    hotline.css
-                    plex.css
-                    dark.css
-                    space-gray.css
-                    organizr-dark.css
-                    dracula.css
    Nouveaux thèmes avec :
-        @import "https://theme-park.dev/CSS/themes/<APP_NAME>/<APP_NAME>-base.css";
-        @import "https://theme-park.dev/CSS/variables/THEME.css";
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/theme-options/THEME.css";
+                    aquamarine.css
+                    dark.css
+                    dracula.css
+                    hotline.css
                    hotpink.css
+                    nord.css
+                    organizr.css
+                    overseerr.css
+                    plex.css
+                    space-gray.css
+
+    Nouveaux thèmes avec :
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/community-theme-options/THEME.css";
                    mind.css
                    onedark.css
-                    overseer.css
                    power.css
                    reality.css
                    soul.css
                    space.css
                    time.css
-                    aquamarine.css
-                    hotline.css
-                    plex.css
-                    dark.css
-                    space-gray.css
-                    organizr-dark.css
-                    dracula.css
+                    ... voir ici la liste -> https://github.com/GilbN/theme.park/tree/master/css/community-theme-options
 */

-/* OLD METHOD
-@import url("https://theme-park.dev/CSS/themes/gitea/plex.css");
-*/
-/* NEW METHOD
-@import "https://theme-park.dev/CSS/themes/gitea/gitea-base.css";
-@import "https://theme-park.dev/CSS/themes/gitea/chroma.css";
-@import "https://theme-park.dev/CSS/variables/plex.css";
-*/
-@import "https://theme-park.dev/CSS/themes/gitea/gitea-base.css";
-@import "https://theme-park.dev/CSS/themes/gitea/chroma.css";
-@import "https://theme-park.dev/CSS/variables/plex.css";
+@import "https://theme-park.dev/css/base/gitea/gitea-base.css";
+@import "https://theme-park.dev/css/base/gitea/chroma.css";
+@import "https://theme-park.dev/css/theme-options/plex.css";
--- a/docker-compose/gitea/data--gitea/public/css/reality.css
+++ b/docker-compose/gitea/data--gitea/public/css/reality.css
@ -1,55 +0,0 @@
-/*    dP   dP                                                                  dP        */
-/*    88   88                                                                  88        */
-/*  d8888P 88d888b. .d8888b. 88d8b.d8b. .d8888b.    88d888b. .d8888b. 88d888b. 88  .dP   */
-/*    88   88'  `88 88ooood8 88'`88'`88 88ooood8    88'  `88 88'  `88 88'  `88 88888"    */
-/*    88   88    88 88.  ... 88  88  88 88.  ...    88.  .88 88.  .88 88       88  `8b.  */
-/*    dP   dP    dP `88888P' dP  dP  dP `88888P' 88 88Y888P' `88888P8 dP       dP   `YP  */
-/*                                                  88                                   */
-/*                                                  dP					                 */
-
-/*		   		        Made by @gilbN					         */
-/*			      https://github.com/gilbN/theme.park			 */
-
-/*  https://docs.theme-park.dev/setup/#stylus-method
-
-    @import "https://theme-park.dev/CSS/themes/<APP_NAME>/<APP_NAME>-base.css";
-    @import "https://theme-park.dev/CSS/variables/THEME.css";
-    
-    Anciens thèmes avec :
-        @import url("https://theme-park.dev/CSS/themes/<APP_NAME>/THEME.css");
-                    aquamarine.css
-                    hotline.css
-                    plex.css
-                    dark.css
-                    space-gray.css
-                    organizr-dark.css
-                    dracula.css
-    Nouveaux thèmes avec :
-        @import "https://theme-park.dev/CSS/themes/<APP_NAME>/<APP_NAME>-base.css";
-        @import "https://theme-park.dev/CSS/variables/THEME.css";
-                    hotpink.css
-                    mind.css
-                    onedark.css
-                    overseer.css
-                    power.css
-                    reality.css
-                    soul.css
-                    space.css
-                    time.css
-                    aquamarine.css
-                    hotline.css
-                    plex.css
-                    dark.css
-                    space-gray.css
-                    organizr-dark.css
-                    dracula.css
-*/
-
-/* NEW METHOD
-@import "https://theme-park.dev/CSS/themes/gitea/gitea-base.css";
-@import "https://theme-park.dev/CSS/themes/gitea/chroma.css";
-@import "https://theme-park.dev/CSS/variables/reality.css";
-*/
-@import "https://theme-park.dev/CSS/themes/gitea/gitea-base.css";
-@import "https://theme-park.dev/CSS/themes/gitea/chroma.css";
-@import "https://theme-park.dev/CSS/variables/reality.css";
--- a/docker-compose/gitea/data--gitea/public/css/space-gray.css
+++ b/docker-compose/gitea/data--gitea/public/css/space-gray.css
@ -12,47 +12,36 @@

 /*  https://docs.theme-park.dev/setup/#stylus-method

-    @import "https://theme-park.dev/CSS/themes/<APP_NAME>/<APP_NAME>-base.css";
-    @import "https://theme-park.dev/CSS/variables/THEME.css";
+    @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+    @import "https://theme-park.dev/css/theme-options/THEME.css";
    
-    Anciens thèmes avec :
-        @import url("https://theme-park.dev/CSS/themes/<APP_NAME>/THEME.css");
-                    aquamarine.css
-                    hotline.css
-                    plex.css
-                    dark.css
-                    space-gray.css
-                    organizr-dark.css
-                    dracula.css
    Nouveaux thèmes avec :
-        @import "https://theme-park.dev/CSS/themes/<APP_NAME>/<APP_NAME>-base.css";
-        @import "https://theme-park.dev/CSS/variables/THEME.css";
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/theme-options/THEME.css";
+                    aquamarine.css
+                    dark.css
+                    dracula.css
+                    hotline.css
                    hotpink.css
+                    nord.css
+                    organizr.css
+                    overseerr.css
+                    plex.css
+                    space-gray.css
+
+    Nouveaux thèmes avec :
+        @import "https://theme-park.dev/css/base/<APP_NAME>/<APP_NAME>-base.css";
+        @import "https://theme-park.dev/css/community-theme-options/THEME.css";
                    mind.css
                    onedark.css
-                    overseer.css
                    power.css
                    reality.css
                    soul.css
                    space.css
                    time.css
-                    aquamarine.css
-                    hotline.css
-                    plex.css
-                    dark.css
-                    space-gray.css
-                    organizr-dark.css
-                    dracula.css
+                    ... voir ici la liste -> https://github.com/GilbN/theme.park/tree/master/css/community-theme-options
 */

-/* OLD METHOD
-@import url("https://theme-park.dev/CSS/themes/gitea/space-gray.css");
-*/
-/* NEW METHOD
-@import "https://theme-park.dev/CSS/themes/gitea/gitea-base.css";
-@import "https://theme-park.dev/CSS/themes/gitea/chroma.css";
-@import "https://theme-park.dev/CSS/variables/space-gray.css";
-*/
-@import "https://theme-park.dev/CSS/themes/gitea/gitea-base.css";
-@import "https://theme-park.dev/CSS/themes/gitea/chroma.css";
-@import "https://theme-park.dev/CSS/variables/space-gray.css";
+@import "https://theme-park.dev/css/base/gitea/gitea-base.css";
+@import "https://theme-park.dev/css/base/gitea/chroma.css";
+@import "https://theme-park.dev/css/theme-options/space-gray.css";
--- a/docker-compose/gitea/data--gitea/public/css/space.css
+++ b/docker-compose/gitea/data--gitea/public/css/space.css
@ -1,55 +0,0 @@
-/*    dP   dP                                                                  dP        */
-/*    88   88                                                                  88        */
-/*  d8888P 88d888b. .d8888b. 88d8b.d8b. .d8888b.    88d888b. .d8888b. 88d888b. 88  .dP   */
-/*    88   88'  `88 88ooood8 88'`88'`88 88ooood8    88'  `88 88'  `88 88'  `88 88888"    */
-/*    88   88    88 88.  ... 88  88  88 88.  ...    88.  .88 88.  .88 88       88  `8b.  */
-/*    dP   dP    dP `88888P' dP  dP  dP `88888P' 88 88Y888P' `88888P8 dP       dP   `YP  */
-/*                                                  88                                   */
-/*                                                  dP					                 */
-
-/*		   		        Made by @gilbN					         */
-/*			      https://github.com/gilbN/theme.park			 */
-
-/*  https://docs.theme-park.dev/setup/#stylus-method
-
-    @import "https://theme-park.dev/CSS/themes/<APP_NAME>/<APP_NAME>-base.css";
-    @import "https://theme-park.dev/CSS/variables/THEME.css";
-    
-    Anciens thèmes avec :
-        @import url("https://theme-park.dev/CSS/themes/<APP_NAME>/THEME.css");
-                    aquamarine.css
-                    hotline.css
-                    plex.css
-                    dark.css
-                    space-gray.css
-                    organizr-dark.css
-                    dracula.css
-    Nouveaux thèmes avec :
-        @import "https://theme-park.dev/CSS/themes/<APP_NAME>/<APP_NAME>-base.css";
-        @import "https://theme-park.dev/CSS/variables/THEME.css";
-                    hotpink.css
-                    mind.css
-                    onedark.css
-                    overseer.css
-                    power.css
-                    reality.css
-                    soul.css
-                    space.css
-                    time.css
-                    aquamarine.css
-                    hotline.css
-                    plex.css
-                    dark.css
-                    space-gray.css
-                    organizr-dark.css
-                    dracula.css
-*/
-
-/* NEW METHOD
-@import "https://theme-park.dev/CSS/themes/gitea/gitea-base.css";
-@import "https://theme-park.dev/CSS/themes/gitea/chroma.css";
-@import "https://theme-park.dev/CSS/variables/space.css";
-*/
-@import "https://theme-park.dev/CSS/themes/gitea/gitea-base.css";
-@import "https://theme-park.dev/CSS/themes/gitea/chroma.css";
-@import "https://theme-park.dev/CSS/variables/space.css";
--- a/docker-compose/gitea/data--gitea/templates/custom/body_outer_pre.tmpl
+++ b/docker-compose/gitea/data--gitea/templates/custom/body_outer_pre.tmpl
@ -0,0 +1,16 @@
+<!-- Voir : https://docs.theme-park.dev/themes/gitea/#adding-the-themes-in-gitea  -->
+<!-- Pensez à supprimer le fichier header.tmpl du serveur Gitea !                 -->
+
+{{ if .IsSigned }}
+  {{ if and (ne .SignedUser.Theme "gitea") (ne .SignedUser.Theme "arc-green") }}
+    {{ if (eq .SignedUser.Theme "dracula-test") }}
+      <link rel="stylesheet" href="https://theme-park.dev/css/base/gitea/gitea-base.css">
+      <link rel="stylesheet" href="https://theme-park.dev/css/base/gitea/chroma.css">  
+      <link rel="stylesheet" href="https://theme-park.dev/css/theme-options/dracula.css">
+    {{else}}
+      <link rel="stylesheet" href="https://theme-park.dev/css/base/gitea/{{.SignedUser.Theme}}.css">
+    {{end}}
+  {{end}}
+{{ else if and (ne DefaultTheme "gitea") (ne DefaultTheme "arc-green") }}
+  <link rel="stylesheet" href="https://theme-park.dev/css/base/gitea/{{DefaultTheme}}.css">
+{{end}}
--- a/docker-compose/gitea/data--gitea/templates/custom/header.tmpl
+++ b/docker-compose/gitea/data--gitea/templates/custom/header.tmpl
@ -1,11 +1,23 @@
-<!-- /*
-// Voir ici pour la nouvelle manière : https://github.com/go-gitea/gitea/blob/master/templates/base/head.tmpl
-*/
- -->
-{{if .IsSigned }}
-	{{ if ne .SignedUser.Theme "gitea" }}
-		<link rel="stylesheet" href="{{AssetUrlPrefix}}/css/{{.SignedUser.Theme}}.css?v={{MD5 AppVer}}">
-	{{end}}
-{{else if ne DefaultTheme "gitea"}}
-	<link rel="stylesheet" href="{{AssetUrlPrefix}}/css/theme-{{DefaultTheme}}.css?v={{MD5 AppVer}}">
+<!-- NE PLUS UTILISER CE FICHIER, voir tuto pour utiliser body_outer_pre.tmpl        -->
+<!-- IL FAUT SUPPRIMER CE FICHIER du serveur Gitea... (il peut rester dans le dépôt) -->
+
+<!-- Voir : https://docs.theme-park.dev/themes/gitea/#adding-the-themes-in-gitea -->
+
+{{ if .IsSigned }}
+  {{ if and (ne .SignedUser.Theme "gitea") (ne .SignedUser.Theme "arc-green") }}
+    <!-- <link rel="stylesheet" href="/styles.css"> -->
+    <!-- <link rel="stylesheet" href="/css/gitea.css"> -->
+    <link rel="stylesheet" href="https://theme-park.dev/css/base/gitea/gitea-base.css">
+    <link rel="stylesheet" href="https://theme-park.dev/css/base/gitea/chroma.css">    
+    
+		<!-- <link rel="stylesheet" href="https://theme-park.dev/css/theme-options/{{.SignedUser.Theme}}.css"> -->
+  	<link rel="stylesheet" href="https://theme-park.dev/css/base/gitea/{{.SignedUser.Theme}}.css">
+  {{end}}
+
+{{ else if and (ne DefaultTheme "gitea") (ne DefaultTheme "arc-green") }}
+	<!-- <link rel="stylesheet" href="/styles.css"> -->
+	<!-- <link rel="stylesheet" href="/css/gitea.css"> -->
+	<link rel="stylesheet" href="https://theme-park.dev/css/base/gitea/gitea-base.css">
+	<link rel="stylesheet" href="https://theme-park.dev/css/base/gitea/chroma.css">
+  <link rel="stylesheet" href="https://theme-park.dev/css/base/gitea/{{DefaultTheme}}.css">
 {{end}}
--- a/docker-compose/grocy/docker-compose.yml
+++ b/docker-compose/grocy/docker-compose.yml
@ -0,0 +1,29 @@
+## Discord Plex FR : https://discord.gg/3gtABCH
+## Version 2021-09-18
+##
+## Pour une aide à l'installation, consulter le README
+##
+version: "2.1"
+
+services:
+  grocy:
+    image: ghcr.io/linuxserver/grocy
+    container_name: grocy
+#    labels:
+#      - com.centurylinklabs.watchtower.enable=true
+    networks:
+     - grocy-network
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=Europe/Paris
+    volumes:
+      - /volume1/docker/grocy/config:/config
+    ports:
+      - 9283:80
+    restart: unless-stopped
+
+networks:
+  grocy-network:
+    external:
+      name: grocy-network
--- a/docker-compose/grocy/readme.md
+++ b/docker-compose/grocy/readme.md
@ -0,0 +1,97 @@
+Installation de Grocy
+============
+
+Bienvenue sur mon nouveau tutoriel. Celui-ci, je l'espere va vous apprendre à installer Grocy.
+
+**Grocy, c'est quoi ?**
+Grocy est une solution de gestion d'épicerie et de ménage auto-hébergée sur le Web pour votre maison.
+
+## Table des matières 
+- 1. [Prérequis](#1-prérequis)
+  - 1.a [Création des dossiers](#1-a-création-des-dossiers)
+  - 1.b [Modifications du .env](#1-b-modifications-du-env)
+  - 1.c [Transfert des fichiers dans /edition-videos](#1-c-transfert-des-fichiers-dans-edition-videos)
+- 2. [Création des conteneurs](#2-création-des-conteneurs)
+  - 2.a [Création du réseau](#2-a-création-du-réseau)
+  - 2.b [Création des conteneurs](#2-b-création-des-conteneurs)
+- 3. [Les Bases](#3-les-bases)
+  - 3.a [Commandes de bases ( Docker )](#3-a-commandes-de-bases-docker)
+  - 3.b [Accès aux interfaces ( WebUI )](#3-b-accès-aux-interfaces-webui)
+- 4. Dépannage ( Ce construira au fur et a mesure des questions )
+
+## 1. Prérequis
+
+- Dans le paragraphe 1.a nous allons les créer avec une ligne de commande, et dans le paragraphe 1.b nous allons modifier le .env afin qu'il utilise bien ces dossiers ( en fonction de leurs localisation sur votre machine ).
+
+### 1.a. Création des dossiers
+
+- Avec `cd` aller dans le dossier de votre choix, par exemple "docker".
+Exemple : Si votre dossier "docker" ce trouve dans /volume1, alors la commande sera :
+`cd /volume1/docker`
+
+- Maintenant que nous sommes dans le bon dossier, nous allons executer la commande suivante pour créer le dossier grocy qui contiendra la configuration de grocy :
+
+`mkdir -p grocy/config`
+
+### 1.b. Modifications des .env
+- Récupérer sur votre machine le fichier [docker-compose.yml](https://gitea.zoz-serv.org/Zoz/plex_fr_discord_repo/src/branch/master/docker-compose/grocy/docker-compose.yml).
+
+> Vous pouvez faire un clic droit - Enregistrer sous ... sur les liens ci-dessus pour télécharger les fichiers.
+
+- Dans le fichier `docker-compose.yml` vous allez devoir modifier plusieurs chose :
+
+**PUID et PGID** devront correspondre aux ID de votre utilisateurs, plus d'info ici : [Connaitre le PUID / PGID d'un utilisateur](https://www.forum-nas.fr/viewtopic.php?f=56&t=13213)
+
+Dans la ligne `/volume1/docker/grocy/config:/config`, la partie `/volume1/docker/grocy/config` doit correspondre au chemin vers le dossier grocy/config créé a l'étape 1.a.
+Dans ce cas, c'est : `/volume1/docker/grocy/config`
+
+### 1.c Transfert des fichiers dans /edition-videos
+- Une fois les modifications effectuées, il faut transfert le fichier ( docker-compose.yml ) dans le dossier `/grocy` précédemment créé ! Par exemple, avec FileZilla.
+
+## 2. Création des conteneurs
+### 2.a Création du réseau
+- On créé le reseau `grocy-network` necesaire au fonctionnement du conteneur :
+
+```
+docker network create grocy-network
+```
+
+### 2.b Création des conteneurs
+Maintenant que votre "stack" est prete rendez-vous dans le dossier `grocy`, dans mon cas `/volume1/docker/grocy` :
+```
+cd /volume1/docker/grocy/config
+```
+
+## 3. Les Bases
+Il est possible d'utilise n'importe qu'elle interface de gestion de conteneur*, ou SSH.
+
+Voici quelques commandes de base :
+
+**[Portainer](https://www.forum-nas.fr/viewtopic.php?f=56&t=14030) par exemple.*
+
+### 3.a Commandes de bases ( Docker )
+- Arreter un conteneur : `docker stop <nom_du_conteneur>`
+Exemple pour le conteneur **grocy** : `docker stop grocy`
+
+- Redémarrer un conteneur : `docker restart <nom_du_conteneur>`
+Exemple pour le conteneur **grocy** : `docker restart grocy`
+
+- Démarrer un conteneur : `docker start <nom_du_conteneur>`
+Exemple pour le conteneur **grocy** : `docker start grocy`
+
+- Supprimer un conteneur : `docker rm <nom_du_conteneur>`
+Exemple pour le conteneur **grocy** : `docker rm grocy`
+
+- Créer le conteneur : `docker-compose up -d`
+Cette commande permet de créer ou re-créer le conteneur présent dans le fichier docker-compose.yml.
+> Note : Vous devez etre dans la dossier contenant le fichier docker-compose.yml pour que cette commande fonctionne.
+
+### 3.b Accès aux interfaces ( WebUI )
+
+- L'acces à chaque service se fait via une WebUI ( Interface Web ), sur un port quil lui est propre.
+- Pour Grocy, c'est le port `9283`. Donc l'adresse sera sous la forme : `http://IP_DE_LA_MACHINE:9283`
+Exemple : Si l'adresse IP de votre machine est `192.168.1.10`, alors l'adresse d'accès sera : `http://192.168.1.10:9283`
+
+## 4. Aller plus loin
+
+A VENIR ...
--- a/docker-compose/hasty-paste/docker-compose.yml
+++ b/docker-compose/hasty-paste/docker-compose.yml
@ -0,0 +1,21 @@
+## Discord Plex FR : https://discord.gg/3gtABCH
+## Version 2022-09-25
+version: "3"
+
+services:
+  paste-bin:
+    container_name: paste-bin
+    image: ghcr.io/enchant97/hasty-paste:1
+    restart: unless-stopped
+    environment:
+      - "NEW_AT_INDEX=True"
+      - "UI_DEFAULT__USE_LONG_ID=True"
+      - "UI_DEFAULT__EXPIRE_TIME__ENABLE=True"
+      - "UI_DEFAULT__EXPIRE_TIME__MINUTES=0"
+      - "UI_DEFAULT__EXPIRE_TIME__HOURS=0"
+      - "UI_DEFAULT__EXPIRE_TIME__DAYS=31"
+    volumes:
+      - ./data:/app/data
+    ports:
+      - 8000:8000
+
--- a/docker-compose/openvpn-rutorrent-prowlarr-jackett-flaresolver-radarr-sonarr/readme.md
+++ b/docker-compose/openvpn-rutorrent-prowlarr-jackett-flaresolver-radarr-sonarr/readme.md
@ -34,7 +34,8 @@ Elle permet d'installer rapidement ces logiciels et de s'assurer que ces dernier
  - 3.b [Accès aux interfaces ( WebUI )](#3-b-accès-aux-interfaces-webui)
 - 4. [Configuration de rutorrent](#4-configuration-de-rutorrent)
  - 4.a [Réactiver la fonction Effacer / Effacer et Supprimer les données](#4-a-réactiver-la-fonction-effacer-effacer-et-supprimer-les-données)
-  - 4.b [Sécuriser l’accès à l'interface](#4-b-sécuriser-l-accès-à-l-interface)
+  - 4.b [Désactiver la fonction de déplacement automatique des téléchargements terminés](#4-b-désactivation-la-fonction-de-déplacement-automatique-des-téléchargements-terminés)
+  - 4.c [Sécuriser l’accès à l'interface](#4-c-sécuriser-l-accès-à-l-interface)
 - 5. [Configuration de jackett](#5-configuration-de-jackett)
  - 5.a [Configurer Flaresolverr](#5-a-configurer-flaresolverr)
 - 6. [Aller plus loin](#6-aller-plus-loin)
@ -262,7 +263,42 @@ Enregistrer, et quitter.

 Nous allons re-créer le conteneur rutorrent, avec cette nouvelle configuration, pour cela nous executons simplement la commande : `docker-compose up -d`.

-### 4.b Sécuriser l’accès à l'interface
+### 4.b Désactiver la fonction de déplacement automatique des téléchargements terminés
+- L'image crazymax de rtorrent/rutorrent contient une fonction automatique de déplacement des fichiers téléchargés une fois le téléchargement complété. En effet, un téléchargement terminé ira automatiquement ce placer dans le dossier `/downloads/complete`, pour éviter cela, il faut désactiver cette fonction en suivent ces étapes :
+
+Arreter le conteneur :
+```
+docker stop rutorrent
+```
+
+On edit le fichier `.rtorrent.rc` :
+```
+nano rutorrent/data/rtorrent/.rtorrent.rc
+```
+
+A la ligne 61 - 62 - 63 - 64 nous avons :
+```
+# Move finished (no need Autotools/Automove plugin on ruTorrent)
+method.insert = d.get_finished_dir, simple, "cat=$cfg.download_complete=,$d.custom1="
+method.insert = d.move_to_complete, simple, "d.directory.set=$argument.1=; execute=mkdir,-p,$argument.1=; execute=mv,-u,$argument.0=,$argument.1=; d.save_full_session="
+method.set_key = event.download.finished,move_complete,"d.move_to_complete=$d.data_path=,$d.get_finished_dir="
+```
+
+Nous allons rajouter un diese `#` devant les 3 lignes commencant par `method...`, de cette façon :
+```
+# Move finished (no need Autotools/Automove plugin on ruTorrent)
+#method.insert = d.get_finished_dir, simple, "cat=$cfg.download_complete=,$d.custom1="
+#method.insert = d.move_to_complete, simple, "d.directory.set=$argument.1=; execute=mkdir,-p,$argument.1=; execute=mv,-u,$argument.0=,$argument.1=; d.save_full_session="
+#method.set_key = event.download.finished,move_complete,"d.move_to_complete=$d.data_path=,$d.get_finished_dir="
+```
+
+Une fois les modifications effectuées, on enregistre et on quitte le fichier.
+Puis on relance rutorrent :
+```
+docker start rutorrent
+```
+
+### 4.c Sécuriser l’accès à l'interface
 - La création du fichier htaccess afin de sécuriser l'acces a l'interface de rutorrent est très simple.

 Arreter le conteneur :
--- a/docker-compose/picsur-postgresql-adminer/docker-compose.yml
+++ b/docker-compose/picsur-postgresql-adminer/docker-compose.yml
@ -0,0 +1,48 @@
+## Discord Plex FR : https://discord.gg/3gtABCH
+## Version 2022-09-25
+version: '3'
+
+services:
+  picsur:
+    image: ghcr.io/rubikscraft/picsur:latest
+    container_name: picsur
+    ports:
+      - '8080:8080'
+    depends_on:
+      - picsur_postgres
+    environment:
+      PICSUR_DB_HOST: picsur_postgres
+      PICSUR_DB_PORT: 5432
+      PICSUR_DB_USERNAME: picsur
+      PICSUR_DB_PASSWORD: PASS_DE_MA_DB
+      PICSUR_DB_DATABASE: picsur
+      PICSUR_ADMIN_PASSWORD: MON_SUPER_PASS_ADMIN
+    restart: unless-stopped
+
+  picsur_postgres:
+    image: postgres:14
+    container_name: picsur_postgres
+#    user: 9999:111
+    labels:
+      - com.centurylinklabs.watchtower.enable=true
+      - deunhealth.restart.on.unhealthy=true
+    environment:
+      POSTGRES_DB: picsur
+      POSTGRES_PASSWORD: PASS_DE_MA_DB
+      POSTGRES_USER: picsur
+    restart: unless-stopped
+    volumes:
+#      - /etc/passwd:/etc/passwd:ro
+#      - /etc/localtime:/etc/localtime:ro
+      - ./data:/var/lib/postgresql/data
+
+  adminer:
+    container_name: picsur_adminer
+    image: adminer
+    restart: unless-stopped
+    depends_on:
+      - picsur_postgres
+    ports:
+      - 8081:8080
+    mem_limit: 64m
+    mem_reservation: 16m
--- a/docker-compose/readme.md
+++ b/docker-compose/readme.md
@ -0,0 +1,91 @@
+Installation de Unifi-controller
+============
+
+Bienvenue sur mon nouveau tutoriel. Celui-ci, je l'espere va vous apprendre à installer Unifi-controller.
+
+## Table des matières 
+- 1. [Prérequis](#1-prérequis)
+  - 1.a [Création des dossiers](#1-a-création-des-dossiers)
+  - 1.b [Modification du fichier docker-compose](#1-b-modification-du-fichier-docker-compose)
+  - 1.c [Transfert des fichiers dans /unifi](#1-c-transfert-des-fichiers-dans-unifi)
+- 2. [Création des conteneurs](#2-création-des-conteneurs)
+  - 2.a [Création du réseau](#2-a-création-du-réseau)
+  - 2.b [Création des conteneurs](#2-b-création-des-conteneurs)
+- 3. [Les Bases](#3-les-bases)
+  - 3.a [Commandes de bases ( Docker )](#3-a-commandes-de-bases-docker)
+  - 3.b [Accès aux interfaces ( WebUI )](#3-b-accès-aux-interfaces-webui)
+- 4. Dépannage ( Ce construira au fur et a mesure des questions )
+
+## 1. Prérequis
+
+- Dans le paragraphe 1.a nous allons les créer avec une ligne de commande, et dans le paragraphe 1.b nous allons modifier le .env afin qu'il utilise bien ces dossiers ( en fonction de leurs localisation sur votre machine ).
+
+### 1.a. Création des dossiers
+
+- Avec `cd` aller dans le dossier de votre choix, par exemple "docker".
+Exemple : Si votre dossier "docker" ce trouve dans /volume1, alors la commande sera :
+`cd /volume1/docker`
+
+- Maintenant que nous sommes dans le bon dossier, nous allons executer la commande suivante pour créer le dossier unifi qui contiendra la configuration de unifi :
+
+`mkdir -p unifi/config`
+
+### 1.b. Modification du fichier docker-compose
+- Récupérer sur votre machine le fichier [docker-compose.yml](https://gitea.zoz-serv.org/Zoz/plex_fr_discord_repo/src/branch/master/docker-compose/unifi/docker-compose.yml).
+
+- Dans le fichier `docker-compose.yml` vous allez devoir modifier plusieurs chose :
+
+**PUID et PGID** devront correspondre aux ID de votre utilisateurs, plus d'info ici : [Connaitre le PUID / PGID d'un utilisateur](https://www.forum-nas.fr/viewtopic.php?f=56&t=13213)
+
+Dans la ligne `/volume1/docker/unifi/config:/config`, la partie `/volume1/docker/unifi/config` doit correspondre au chemin vers le dossier unifi/config créé a l'étape 1.a.
+Dans ce cas, c'est : `/volume1/docker/unifi/config`
+
+### 1.c Transfert des fichiers dans /edition-videos
+- Une fois les modifications effectuées, il faut transfert le fichier ( docker-compose.yml ) dans le dossier `/unifi` précédemment créé ! Par exemple, avec FileZilla.
+
+## 2. Création du conteneur
+
+Placez-vous dans votre dossier unifi, ( dans mon cas `/volume1/docker/unifi` ) :
+```
+cd /volume1/docker/unifi/config
+```
+
+Puis lancer la création du conteneur :
+```
+docker-compose up -d
+```
+
+## 3. Les Bases
+Il est possible d'utilise n'importe qu'elle interface de gestion de conteneur*, ou SSH.
+
+Voici quelques commandes de base :
+
+**[Portainer](https://www.forum-nas.fr/viewtopic.php?f=56&t=14030) par exemple.*
+
+### 3.a Commandes de bases ( Docker )
+- Arreter un conteneur : `docker stop <nom_du_conteneur>`
+Exemple pour le conteneur **unifi-controller** : `docker stop unifi-controller`
+
+- Redémarrer un conteneur : `docker restart <nom_du_conteneur>`
+Exemple pour le conteneur **unifi-controller** : `docker restart unifi-controller`
+
+- Démarrer un conteneur : `docker start <nom_du_conteneur>`
+Exemple pour le conteneur **unifi-controller** : `docker start unifi-controller`
+
+- Supprimer un conteneur : `docker rm <nom_du_conteneur>`
+Exemple pour le conteneur **unifi-controller** : `docker rm unifi-controller`
+
+- Créer le conteneur : `docker-compose up -d`
+Cette commande permet de créer ou re-créer le conteneur présent dans le fichier docker-compose.yml.
+> Note : Vous devez etre dans la dossier contenant le fichier docker-compose.yml pour que cette commande fonctionne.
+
+### 3.b Accès aux interfaces ( WebUI )
+
+- L'acces à chaque service se fait via une WebUI ( Interface Web ), sur un port quil lui est propre.
+- Pour unifi, c'est le port `8443`. Donc l'adresse sera sous la forme : `http://IP_DE_LA_MACHINE:8443`
+Exemple : Si l'adresse IP de votre machine est `192.168.1.10`, alors l'adresse d'accès sera : `http://192.168.1.10:8443`
+
+## 4. Aller plus loin
+
+A VENIR ...
+
--- a/wiki/la_casa_de_papel.md
+++ b/wiki/la_casa_de_papel.md
@ -1,5 +1,5 @@
 *Discord Plex FR : https://discord.gg/3gtABCH*
-*Version 2021-08-23*
+*Version 2022-09-13*

 # Association La Casa De Papel

@ -47,7 +47,7 @@ Cliquer sur le logo Paramètres à côté de XBMCnfoTqvImporter puis cocher `dis

 Ensuite, télécharger le pack de données de la série, j'ai fais un repack de plusieurs données que j'ai trouver sur le net, il contient les .nfo, les cover et les fanart, tout en français !

-Télécharger ici : https://uptobox.com/8fajowr00h0w
+Télécharger ici : https://nextcloud.zoz-serv.org/s/ZKw9AaomF8HxDca

 Maintenant, il faut extraire les fichiers dans votre dossier "La Casa de papel", l'arborescence est déjà faite, attention, le nom des fichier NFO et JPG doivent correpondre au nom de l'épisode en question ! S'ils ne sont pas nommé de la même manière chez vous pensez à les renommer pour qu'ils correspondent !

@ -70,3 +70,4 @@ Le seul problème restant, qui ne peux malheureusement pas être règlé, est po
 - Fanart (BenMitnicK)
 - Cover a (XDM)
 - Cover b (Razor_AMG)
+- Maj lien de téléchargement (Zoz)
Author	SHA1	Message	Date
ToTo	ed8ff47e31	Mise à jour de 'dns-blacklists/adguard-home/liste.md'	2022-10-17 22:48:23 +02:00
Zoz	82df1c9412	Merge pull request 'Ajout + correction emplacement ghost' (#143 ) from pump into master Reviewed-on: #143	2022-09-26 00:07:41 +02:00
NightPumpkin	688d87bb66	picsur-postgresql-adminer	2022-09-25 22:09:51 +02:00
NightPumpkin	74a695d65c	hasty-paste	2022-09-25 22:08:46 +02:00
NightPumpkin	c267d62e62	ghost-mysql	2022-09-25 22:07:46 +02:00
NightPumpkin	386c58e40b	Supprimer 'docker-compose/ghost-mysql'	2022-09-25 22:07:08 +02:00
Zoz	4c7b6a2bd7	Merge pull request 'Mise à jour de 'wiki/la_casa_de_papel.md'' (#142 ) from zozo into master Reviewed-on: #142	2022-09-13 19:12:21 +02:00
Zoz	4940fee1cc	Merge branch 'master' into zozo	2022-09-13 12:46:41 +02:00
Zoz	c5ee1be726	Merge pull request 'ghost et mysql' (#141 ) from nightpumpkin-ghost-mysql into master Reviewed-on: #141	2022-09-13 12:46:27 +02:00
Zoz	7f7dfd1838	Merge branch 'master' into nightpumpkin-ghost-mysql	2022-09-13 12:45:57 +02:00
Zoz	af4106b1f6	Mise à jour de 'wiki/la_casa_de_papel.md'	2022-09-13 12:35:58 +02:00
NightPumpkin	d9629d8817	Merge pull request 'Mise à jour de 'dns-blacklists/pihole/liste'' (#140 ) from nightpumpkin-maj-dns-pihole into master Reviewed-on: #140	2022-08-27 23:57:17 +02:00
NightPumpkin	e52e16df93	ghost et mysql	2022-08-21 22:12:32 +02:00
NightPumpkin	8d868cfeb5	Mise à jour de 'dns-blacklists/pihole/liste'	2022-08-21 21:40:26 +02:00
MilesTEG	4093afc78d	Merge pull request 'See changelog :' (#139 ) from Scripts-MKVMerge into master Reviewed-on: #139	2022-01-05 08:14:51 +01:00
MilesTEG	d6023ef851	Merge branch 'master' into Scripts-MKVMerge	2022-01-05 08:14:38 +01:00
MilesTEG	4259f74718	See changelog : - Done Internal Subtitles part - Ajout d'une variable pour préciser le type de média (avec séparation du renommage année, et dots) - Ajout de texte récapitulatif des langues inscrites (et des noms de piste) dans le fichier final - Fix sur la détection des sous-titres internes - Ajout de la gestion d'une recherche dans le titre des sous-titres pour identifier une piste SDH quand il y a plusieurs pistes de la même langue. - Amélioration de l'affichage du récapitulatif des langues détectées et récupérées. - Petites modifications/corrections	2022-01-05 08:13:03 +01:00
MilesTEG	46a3a8722b	Merge pull request 'Scripts-MKVMerge' (#138 ) from Scripts-MKVMerge into master Reviewed-on: #138	2021-12-28 09:38:29 +01:00
MilesTEG	3c6d970681	Nouveau script qui fusionne plusieurs autres en un seul. Reste à faire : finaliser le code de la partie sous-titres internes à conserver.	2021-12-28 09:37:13 +01:00
MilesTEG	f11ed91101	Petits scripts pas forcément méga utile, mais peut simplifier ces actions longues à faire manuellement	2021-12-28 09:36:22 +01:00
MilesTEG	b812d7f769	Quelques correctifs	2021-12-28 09:35:45 +01:00
MilesTEG	62fa973e4e	Merge pull request 'Erreur de fusion corrigée :)' (#136 ) from gitea into master Reviewed-on: #136	2021-11-18 11:10:31 +01:00
MilesTEG	be538f720d	Merge branch 'master' into gitea	2021-11-18 11:10:25 +01:00
MilesTEG	ea33b5cd95	Erreur de fusion corrigée :)	2021-11-18 11:09:49 +01:00
MilesTEG	80354312f6	Merge pull request 'Nouvelle méthode avec `body_outer_pre.tmpl` à la place de `header.tmpl` + MAJ Tuto' (#135 ) from gitea into master Reviewed-on: #135	2021-11-18 11:09:03 +01:00
MilesTEG	e359be76a5	Merge branch 'master' into gitea # Conflicts: # docker-compose/gitea/Changer-Theme-Gitea.md # docker-compose/gitea/data--gitea/templates/custom/header.tmpl	2021-11-18 10:51:37 +01:00
MilesTEG	a9aa5070fc	Essai de fix de fusion impossible	2021-11-18 10:46:11 +01:00
MilesTEG	f40ce88f64	Nouvelle méthode avec `body_outer_pre.tmpl` à la place de `header.tmpl` + MAJ Tuto	2021-11-18 07:23:24 +01:00
MilesTEG	1285b8b659	Merge pull request 'gitea' (#134 ) from gitea into master Reviewed-on: #134	2021-11-17 17:14:25 +01:00
MilesTEG	ef31ea82be	MAJ du tuto :)	2021-11-17 17:10:45 +01:00
MilesTEG	9f459ad8fe	Modification de l'application des thèmes : c'est désormais plus simple.	2021-11-17 09:05:54 +01:00
MilesTEG	9a134d0118	Merge pull request 'De quoi supprimer des sous-titres d'un MKV et ajouter au max 2 SRT externes' (#133 ) from BatchMergeSubtitleswithMKVMerge into master Reviewed-on: #133	2021-11-16 23:17:37 +01:00
MilesTEG	88bebb510e	Merge branch 'master' into BatchMergeSubtitleswithMKVMerge	2021-11-16 23:17:31 +01:00
MilesTEG	43f47b8fbf	De quoi supprimer des sous-titres d'un MKV et ajouter au max 2 SRT externes	2021-11-16 23:15:16 +01:00
MilesTEG	a0a69b31b6	Merge pull request 'Fix : faute de frappe...' (#132 ) from BatchMergeSubtitleswithMKVMerge into master Reviewed-on: #132	2021-11-09 23:23:27 +01:00
MilesTEG	d0bb8252a6	Merge branch 'master' into BatchMergeSubtitleswithMKVMerge	2021-11-09 23:23:22 +01:00
MilesTEG	2412b203ed	Fix : faute de frappe...	2021-11-09 23:22:44 +01:00
MilesTEG	0f0f2b2a47	Merge pull request 'Correctif sur la chaine ExtSubTrackName_ : les " " forcées ne sont plus indispensables car mis ailleurs.' (#131 ) from BatchMergeSubtitleswithMKVMerge into master Reviewed-on: #131	2021-11-08 13:14:39 +01:00
MilesTEG	fb153caa2b	Merge branch 'master' into BatchMergeSubtitleswithMKVMerge	2021-11-08 13:14:31 +01:00
MilesTEG	ea380d551c	Correctif sur la chaine ExtSubTrackName_ : les " " forcées ne sont plus indispensables car mis ailleurs.	2021-11-08 13:13:19 +01:00
MilesTEG	46b0987e86	Merge pull request 'Correction d'une petite erreur sur un test conditionnel...' (#130 ) from BatchMergeSubtitleswithMKVMerge into master Reviewed-on: #130	2021-11-05 22:23:48 +01:00
MilesTEG	fb6760ec63	Merge branch 'master' into BatchMergeSubtitleswithMKVMerge	2021-11-05 22:23:33 +01:00
MilesTEG	28eb756ab0	Correction d'une petite erreur sur un test conditionnel...	2021-11-05 22:22:31 +01:00
MilesTEG	046b5bcd42	Merge pull request 'Petites améliorations' (#129 ) from BatchMergeSubtitleswithMKVMerge into master Reviewed-on: #129	2021-11-04 17:55:10 +01:00
MilesTEG	119c56656c	Merge branch 'master' into BatchMergeSubtitleswithMKVMerge	2021-11-04 17:54:53 +01:00
MilesTEG	c8eca5736e	Petites améliorations Déplacement paramétrable des fichiers mergés	2021-11-04 17:53:15 +01:00
MilesTEG	6fb044e248	Merge pull request 'Gros changements : automatisation du processus , plus besoin de modifier les commandes manuellement. Il suffit de choisir le nb de SRT externes ou internes au début du script et de bien remplir les champs.' (#128 ) from BatchMergeSubtitleswithMKVMerge into master Reviewed-on: #128	2021-11-03 20:34:48 +01:00
MilesTEG	d88a51819a	Merge branch 'master' into BatchMergeSubtitleswithMKVMerge	2021-11-03 20:34:33 +01:00
MilesTEG	f96f299e97	Gros changements : automatisation du processus , plus besoin de modifier les commandes manuellement. Il suffit de choisir le nb de SRT externes ou internes au début du script et de bien remplir les champs. Modification du chemin d'accès avec des `" `" pour encadrer le chemin au cas-où il y est des espaces.	2021-11-03 20:33:22 +01:00
MilesTEG	48b5c5336a	Merge pull request 'Mise à jour des CSS pour correspondre aux nouvelles URLs de theme-park.dev et aussi ...' (#126 ) from gitea into master Reviewed-on: #126	2021-11-03 08:27:31 +01:00
MilesTEG	5d5d3be702	Merge branch 'master' into gitea	2021-11-03 08:27:17 +01:00
MilesTEG	983fcc3d6b	Merge pull request 'Ajoute de petites modifications pour simplifier la gestion des modifications de sous-titres, et langues' (#127 ) from BatchMergeSubtitleswithMKVMerge into master Reviewed-on: #127	2021-11-03 08:26:40 +01:00
MilesTEG	ebe9dd0e72	Merge branch 'master' into BatchMergeSubtitleswithMKVMerge	2021-11-03 08:26:19 +01:00
MilesTEG	16b9e2cfbb	Ajoute de petites modifications pour simplifier la gestion des modifications de sous-titres, et langues (en prévision d'une automatisation plus poussée de la commande de merge)	2021-11-03 08:24:55 +01:00
MilesTEG	b29617d025	Mise à jour des CSS pour correspondre aux nouvelles URLs de theme-park.dev ( voir dernier changelog : https://github.com/GilbN/theme.park/releases/tag/1.6.0 ) Plus : * Modification du nom de certains themes * Suppression de certains themes communautaires pas top * Ajouts des themes communautaires Blackberry * Modification de la liste des thèmes dans le app.ini (mise à jour du tuto)	2021-11-01 15:11:48 +01:00
MilesTEG	96c8de2a0e	Merge pull request 'BatchMergeSubtitleswithMKVMerge' (#125 ) from BatchMergeSubtitleswithMKVMerge into master Reviewed-on: #125	2021-10-31 11:09:19 +01:00
MilesTEG	929caae93f	Merge branch 'master' into BatchMergeSubtitleswithMKVMerge	2021-10-31 11:09:10 +01:00
MilesTEG	bb32617942	Oubli d'incrémentation du compteur... :D	2021-10-31 11:06:42 +01:00
MilesTEG	e0bddb9890	Petites corrections mineures, et ajour de messages de début et de fin de traitement de fichier.	2021-10-31 11:02:17 +01:00
MilesTEG	b319a77da2	Petites correction d'erreurs de frappe...	2021-10-31 10:50:41 +01:00
MilesTEG	f25e85fb52	Merge pull request 'Amélioration du script en ajoutant une variable pour définir si utilisation de SRT externe ou pas.' (#124 ) from BatchMergeSubtitleswithMKVMerge into master Reviewed-on: #124	2021-10-30 16:04:16 +02:00
MilesTEG	f4638be665	Merge branch 'master' into BatchMergeSubtitleswithMKVMerge	2021-10-30 15:57:24 +02:00
MilesTEG	414b7f4ab4	Amélioration du script en ajoutant une variable pour définir si utilisation de SRT externe ou pas. Ajout de variables pour le renommage du fichier output.	2021-10-30 15:48:38 +02:00
MilesTEG	35a34a0803	Merge pull request 'MAJ du script de fusion avec un peu plus d'automatisme.' (#123 ) from BatchMergeSubtitleswithMKVMerge into master Reviewed-on: #123	2021-10-23 10:52:22 +02:00
MilesTEG	a3602f3b28	Merge branch 'master' into BatchMergeSubtitleswithMKVMerge	2021-10-23 10:52:12 +02:00
MilesTEG	26f4f29ea8	MAJ du script de fusion avec un peu plus d'automatisme.	2021-10-23 10:50:10 +02:00
NightPumpkin	b392fd8cb3	Merge pull request 'unifi-controller' (#122 ) from evo-unifi into master Reviewed-on: #122	2021-09-18 20:59:56 +02:00
NightPumpkin	af2731bc03	unifi-controller	2021-09-18 20:59:41 +02:00
NightPumpkin	cde63519b6	Merge pull request 'Grocy' (#121 ) from evo-grocy into master Reviewed-on: #121	2021-09-18 19:40:56 +02:00
NightPumpkin	8036adcfbe	Grocy	2021-09-18 18:07:35 +02:00
NightPumpkin	eb271bd389	Merge pull request 'MAJ stackdl déplacement auto' (#120 ) from nightpumpkin-deplacement-auto into master Reviewed-on: #120	2021-09-06 19:24:29 +02:00
NightPumpkin	7b7dc31eff	MAJ stackdl déplacement auto 4.b Désactiver la fonction de déplacement automatique des téléchargements terminés	2021-09-05 23:27:16 +02:00