diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 551a6c2..a31a150 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -4,6 +4,8 @@ Changelog
 v (next)
 --------
 
+- Spaces in filenames are no longer replaced by underscores when files are
+  extracted from archives.
 
 v21.6.2
 -------
diff --git a/src/extractcode/libarchive2.py b/src/extractcode/libarchive2.py
index 6402e4d..988cd3e 100644
--- a/src/extractcode/libarchive2.py
+++ b/src/extractcode/libarchive2.py
@@ -203,7 +203,7 @@ def extract(location, target_dir, skip_symlinks=True):
         if TRACE:
             logger.debug('  writing.....')
 
-        _target_path = entry.write(abs_target_dir, transform_path=paths.safe_path)
+        _target_path = entry.write(abs_target_dir, transform_path=partial(paths.safe_path, preserve_spaces=True))
 
     return warnings
 
diff --git a/src/extractcode/patch.py b/src/extractcode/patch.py
index 47fbf28..0225e45 100644
--- a/src/extractcode/patch.py
+++ b/src/extractcode/patch.py
@@ -54,7 +54,7 @@ def extract(location, target_dir):
 
         # make the path safe to use as a subfile path
         # ensure this a good and clean posix relative path
-        patch_subfile_path = paths.safe_path(patch_subfile_path)
+        patch_subfile_path = paths.safe_path(patch_subfile_path, preserve_spaces=True)
 
         # create directories
         parent_dir = posixpath.dirname(patch_subfile_path)
diff --git a/src/extractcode/sevenzip.py b/src/extractcode/sevenzip.py
index be58754..4ecc782 100644
--- a/src/extractcode/sevenzip.py
+++ b/src/extractcode/sevenzip.py
@@ -467,7 +467,7 @@ def extract_file_by_file(
                 errors[entry.path] = 'No file name extracted.'
             continue
 
-        safe_path = paths.safe_path(entry.path, posix=True)
+        safe_path = paths.safe_path(entry.path, posix=True, preserve_spaces=True)
         target_file_loc = os.path.join(target_dir, safe_path)
         target_file_dir = os.path.dirname(target_file_loc)
         fileutils.create_dir(target_file_dir)
diff --git a/tests/data/archive/tgz/mixed_case_and_symlink.tgz.expected b/tests/data/archive/tgz/mixed_case_and_symlink.tgz.expected
deleted file mode 100644
index 549ab43..0000000
--- a/tests/data/archive/tgz/mixed_case_and_symlink.tgz.expected
+++ /dev/null
@@ -1,621 +0,0 @@
-["skinenigmang/COPYING",
-"skinenigmang/README",
-"skinenigmang/flags/deu.xpm",
-"skinenigmang/flags/deuDD.xpm",
-"skinenigmang/flags/deuDUAL.xpm",
-"skinenigmang/flags/deuMONO.xpm",
-"skinenigmang/flags/dut.xpm",
-"skinenigmang/flags/dutDD.xpm",
-"skinenigmang/flags/dutDUAL.xpm",
-"skinenigmang/flags/dutMONO.xpm",
-"skinenigmang/flags/eng.xpm",
-"skinenigmang/flags/engDD.xpm",
-"skinenigmang/flags/engDUAL.xpm",
-"skinenigmang/flags/engMONO.xpm",
-"skinenigmang/flags/fra.xpm",
-"skinenigmang/flags/fraDD.xpm",
-"skinenigmang/flags/fraDUAL.xpm",
-"skinenigmang/flags/fraMONO.xpm",
-"skinenigmang/hqlogos/2M_Maroc.xpm",
-"skinenigmang/hqlogos/3sat.xpm",
-"skinenigmang/hqlogos/AB_1.xpm",
-"skinenigmang/hqlogos/AB_Moteurs.xpm",
-"skinenigmang/hqlogos/ANTENNE_BAYERN.xpm",
-"skinenigmang/hqlogos/ATV+.xpm",
-"skinenigmang/hqlogos/Action.xpm",
-"skinenigmang/hqlogos/Animaux.xpm",
-"skinenigmang/hqlogos/Arte.xpm",
-"skinenigmang/hqlogos/BBC_Prime.xpm",
-"skinenigmang/hqlogos/BBC_World.xpm",
-"skinenigmang/hqlogos/BR-alpha.xpm",
-"skinenigmang/hqlogos/Bayerisches_FS.xpm",
-"skinenigmang/hqlogos/Beur_Tv.xpm",
-"skinenigmang/hqlogos/Bloomberg.xpm",
-"skinenigmang/hqlogos/Boomerang.xpm",
-"skinenigmang/hqlogos/CCTV4.xpm",
-"skinenigmang/hqlogos/CNBC_Europe.xpm",
-"skinenigmang/hqlogos/CNN.xpm",
-"skinenigmang/hqlogos/COMEDY_CENTRAL.xpm",
-"skinenigmang/hqlogos/Canal_J.xpm",
-"skinenigmang/hqlogos/Canal+_Cinema.xpm",
-"skinenigmang/hqlogos/Canal+_Hi-Tech.xpm",
-"skinenigmang/hqlogos/Canal+_Sport.xpm",
-"skinenigmang/hqlogos/Canal+.xpm",
-"skinenigmang/hqlogos/Cartoon_Network.xpm",
-"skinenigmang/hqlogos/Cine_FX.xpm",
-"skinenigmang/hqlogos/Cuisine.TV.xpm",
-"skinenigmang/hqlogos/DAS_VIERTE.xpm",
-"skinenigmang/hqlogos/DELUXE_MUSIC.xpm",
-"skinenigmang/hqlogos/DIRECT-8.xpm",
-"skinenigmang/hqlogos/DSF.xpm",
-"skinenigmang/hqlogos/Das_Erste.xpm",
-"skinenigmang/hqlogos/Deutsche_Welle.xpm",
-"skinenigmang/hqlogos/Disney_Channel_+1.xpm",
-"skinenigmang/hqlogos/Disney_Channel.xpm",
-"skinenigmang/hqlogos/ENGLISH_PREMIER_LEAGUE.xpm",
-"skinenigmang/hqlogos/ESPN_Classic_Sport.xpm",
-"skinenigmang/hqlogos/EURONEWS.xpm",
-"skinenigmang/hqlogos/EinsExtra.xpm",
-"skinenigmang/hqlogos/EinsFestival.xpm",
-"skinenigmang/hqlogos/EinsMuXx.xpm",
-"skinenigmang/hqlogos/EinsPlus.xpm",
-"skinenigmang/hqlogos/Encyclopedia.xpm",
-"skinenigmang/hqlogos/Equidia.xpm",
-"skinenigmang/hqlogos/Escales.xpm",
-"skinenigmang/hqlogos/EuroNews_1.xpm",
-"skinenigmang/hqlogos/Eurosport.xpm",
-"skinenigmang/hqlogos/Extreme_Sports.xpm",
-"skinenigmang/hqlogos/FM4.xpm",
-"skinenigmang/hqlogos/Fashion_TV.xpm",
-"skinenigmang/hqlogos/Festival.xpm",
-"skinenigmang/hqlogos/Filles_Tv.xpm",
-"skinenigmang/hqlogos/Fit_Toute_l_Histoire.xpm",
-"skinenigmang/hqlogos/France_2.xpm",
-"skinenigmang/hqlogos/France_3.xpm",
-"skinenigmang/hqlogos/France_5.xpm",
-"skinenigmang/hqlogos/France-4.xpm",
-"skinenigmang/hqlogos/Fun_TV.xpm",
-"skinenigmang/hqlogos/Game_One.xpm",
-"skinenigmang/hqlogos/GigaTV.xpm",
-"skinenigmang/hqlogos/GoTV.xpm",
-"skinenigmang/hqlogos/Gourmet_Tv.xpm",
-"skinenigmang/hqlogos/HSE24.xpm",
-"skinenigmang/hqlogos/Histoire.xpm",
-"skinenigmang/hqlogos/IG3XEX~2.xpm",
-"skinenigmang/hqlogos/Infosport.xpm",
-"skinenigmang/hqlogos/Jetix.xpm",
-"skinenigmang/hqlogos/Jimmy.xpm",
-"skinenigmang/hqlogos/KABEL1.xpm",
-"skinenigmang/hqlogos/KTO.xpm",
-"skinenigmang/hqlogos/KiKa.xpm",
-"skinenigmang/hqlogos/L_Equipe_TV.xpm",
-"skinenigmang/hqlogos/LCI.xpm",
-"skinenigmang/hqlogos/Live_1.xpm",
-"skinenigmang/hqlogos/M6_Music.xpm",
-"skinenigmang/hqlogos/M6.xpm",
-"skinenigmang/hqlogos/MCM_Pop.xpm",
-"skinenigmang/hqlogos/MCM_Top.xpm",
-"skinenigmang/hqlogos/MCM.xpm",
-"skinenigmang/hqlogos/MDR_FERNSEHEN.xpm",
-"skinenigmang/hqlogos/MDR_JUMP.xpm",
-"skinenigmang/hqlogos/MTV_2.xpm",
-"skinenigmang/hqlogos/MTV_Central.xpm",
-"skinenigmang/hqlogos/MTV_Hits.xpm",
-"skinenigmang/hqlogos/MTV.xpm",
-"skinenigmang/hqlogos/Mangas.xpm",
-"skinenigmang/hqlogos/Match_TV.xpm",
-"skinenigmang/hqlogos/Mezzo.xpm",
-"skinenigmang/hqlogos/Motors_TV.xpm",
-"skinenigmang/hqlogos/Multivision_1.xpm",
-"skinenigmang/hqlogos/Multivision_2.xpm",
-"skinenigmang/hqlogos/Multivision_3.xpm",
-"skinenigmang/hqlogos/Multivision_4.xpm",
-"skinenigmang/hqlogos/Multivision_5.xpm",
-"skinenigmang/hqlogos/Multivision_6.xpm",
-"skinenigmang/hqlogos/Multivision_7.xpm",
-"skinenigmang/hqlogos/Multivision.xpm",
-"skinenigmang/hqlogos/Musique_Classique.xpm",
-"skinenigmang/hqlogos/N24.xpm",
-"skinenigmang/hqlogos/NBA+.xpm",
-"skinenigmang/hqlogos/NBC.xpm",
-"skinenigmang/hqlogos/NDR_FS_HH.xpm",
-"skinenigmang/hqlogos/NEUN_LIVE_Television.xpm",
-"skinenigmang/hqlogos/NICK.xpm",
-"skinenigmang/hqlogos/NRJ-12.xpm",
-"skinenigmang/hqlogos/NT1.xpm",
-"skinenigmang/hqlogos/Nat_Geographic.xpm",
-"skinenigmang/hqlogos/ORF1.xpm",
-"skinenigmang/hqlogos/ORF2.xpm",
-"skinenigmang/hqlogos/PREMIERE_1.xpm",
-"skinenigmang/hqlogos/PREMIERE_2.xpm",
-"skinenigmang/hqlogos/PREMIERE_3.xpm",
-"skinenigmang/hqlogos/PREMIERE_4.xpm",
-"skinenigmang/hqlogos/PREMIERE_5.xpm",
-"skinenigmang/hqlogos/PREMIERE_6.xpm",
-"skinenigmang/hqlogos/PREMIERE_7.xpm",
-"skinenigmang/hqlogos/PREMIERE_DIREKT.xpm",
-"skinenigmang/hqlogos/PREMIERE_SPORT_1.xpm",
-"skinenigmang/hqlogos/PREMIERE_SPORT_2.xpm",
-"skinenigmang/hqlogos/PREMIERE_SPORT_PORTAL.xpm",
-"skinenigmang/hqlogos/PREMIERE.xpm",
-"skinenigmang/hqlogos/PRIVATE_GOLD.xpm",
-"skinenigmang/hqlogos/Paris_Premiere.xpm",
-"skinenigmang/hqlogos/Pink_TV.xpm",
-"skinenigmang/hqlogos/Piwi.xpm",
-"skinenigmang/hqlogos/Playhouse_Disney.xpm",
-"skinenigmang/hqlogos/ProSieben.xpm",
-"skinenigmang/hqlogos/RAI_1.xpm",
-"skinenigmang/hqlogos/RBB.xpm",
-"skinenigmang/hqlogos/RFM-TV.xpm",
-"skinenigmang/hqlogos/RFO_Sat.xpm",
-"skinenigmang/hqlogos/ROCK_ANTENNE.xpm",
-"skinenigmang/hqlogos/RTL_Television.xpm",
-"skinenigmang/hqlogos/RTL2.xpm",
-"skinenigmang/hqlogos/RTL9.xpm",
-"skinenigmang/hqlogos/RTPI.xpm",
-"skinenigmang/hqlogos/SAT.1.xpm",
-"skinenigmang/hqlogos/SF1.xpm",
-"skinenigmang/hqlogos/SF2.xpm",
-"skinenigmang/hqlogos/SIC.xpm",
-"skinenigmang/hqlogos/Seasons.xpm",
-"skinenigmang/hqlogos/Sport+.xpm",
-"skinenigmang/hqlogos/Super_RTL.xpm",
-"skinenigmang/hqlogos/TCM.xpm",
-"skinenigmang/hqlogos/TELE_5.xpm",
-"skinenigmang/hqlogos/TERRA_NOVA.xpm",
-"skinenigmang/hqlogos/TF1.xpm",
-"skinenigmang/hqlogos/TF6.xpm",
-"skinenigmang/hqlogos/TFJ.xpm",
-"skinenigmang/hqlogos/TMC.xpm",
-"skinenigmang/hqlogos/TPS_CINECULTE.xpm",
-"skinenigmang/hqlogos/TPS_CINEFAMILY.xpm",
-"skinenigmang/hqlogos/TPS_CINESTAR.xpm",
-"skinenigmang/hqlogos/TPS_CINETOILE.xpm",
-"skinenigmang/hqlogos/TPS_CINEXTREME.xpm",
-"skinenigmang/hqlogos/TPS_HOMECINEMA.xpm",
-"skinenigmang/hqlogos/TPS_Star.xpm",
-"skinenigmang/hqlogos/TV_Breizh.xpm",
-"skinenigmang/hqlogos/TV_POLONIA.xpm",
-"skinenigmang/hqlogos/TV5.xpm",
-"skinenigmang/hqlogos/TVEI.xpm",
-"skinenigmang/hqlogos/TW1.xpm",
-"skinenigmang/hqlogos/Tiji.xpm",
-"skinenigmang/hqlogos/Toon_Disney.xpm",
-"skinenigmang/hqlogos/Trace_Tv.xpm",
-"skinenigmang/hqlogos/VH1_Classic.xpm",
-"skinenigmang/hqlogos/VH1.xpm",
-"skinenigmang/hqlogos/VIVA_PLUS.xpm",
-"skinenigmang/hqlogos/VIVA.xpm",
-"skinenigmang/hqlogos/VOX.xpm",
-"skinenigmang/hqlogos/Voyage.xpm",
-"skinenigmang/hqlogos/W9.xpm",
-"skinenigmang/hqlogos/XXL.xpm",
-"skinenigmang/hqlogos/ZDF.xpm",
-"skinenigmang/hqlogos/ZDFdokukanal.xpm",
-"skinenigmang/hqlogos/ZDFinfokanal.xpm",
-"skinenigmang/hqlogos/ZDFtheaterkanal.xpm",
-"skinenigmang/hqlogos/arte_1.xpm",
-"skinenigmang/hqlogos/bayern3.xpm",
-"skinenigmang/hqlogos/hr-fernsehen.xpm",
-"skinenigmang/hqlogos/n-tv.xpm",
-"skinenigmang/hqlogos/no_logo.xpm",
-"skinenigmang/icons/audio/audioLeft.xpm",
-"skinenigmang/icons/audio/audioRight.xpm",
-"skinenigmang/icons/audio/audioStereo.xpm",
-"skinenigmang/icons/menu/audiorecorder.xpm",
-"skinenigmang/icons/menu/blank.xpm",
-"skinenigmang/icons/menu/burn.xpm",
-"skinenigmang/icons/menu/cancel.xpm",
-"skinenigmang/icons/menu/cdda.xpm",
-"skinenigmang/icons/menu/channels.xpm",
-"skinenigmang/icons/menu/channelscan.xpm",
-"skinenigmang/icons/menu/chanorg.xpm",
-"skinenigmang/icons/menu/commands.xpm",
-"skinenigmang/icons/menu/device.xpm",
-"skinenigmang/icons/menu/digicam.xpm",
-"skinenigmang/icons/menu/director.xpm",
-"skinenigmang/icons/menu/dvd.xpm",
-"skinenigmang/icons/menu/dvdselect.xpm",
-"skinenigmang/icons/menu/epgsearch.xpm",
-"skinenigmang/icons/menu/externalplayer.xpm",
-"skinenigmang/icons/menu/femon.xpm",
-"skinenigmang/icons/menu/filebrowser.xpm",
-"skinenigmang/icons/menu/fussball.xpm",
-"skinenigmang/icons/menu/games.xpm",
-"skinenigmang/icons/menu/image.xpm",
-"skinenigmang/icons/menu/mp3.xpm",
-"skinenigmang/icons/menu/mplayer.xpm",
-"skinenigmang/icons/menu/newsticker.xpm",
-"skinenigmang/icons/menu/osdpip.xpm",
-"skinenigmang/icons/menu/pin.xpm",
-"skinenigmang/icons/menu/radio.xpm",
-"skinenigmang/icons/menu/recordings.xpm",
-"skinenigmang/icons/menu/rotor.xpm",
-"skinenigmang/icons/menu/schedule.xpm",
-"skinenigmang/icons/menu/setup.xpm",
-"skinenigmang/icons/menu/soccer.xpm",
-"skinenigmang/icons/menu/solitaire.xpm",
-"skinenigmang/icons/menu/solitaire2.xpm",
-"skinenigmang/icons/menu/stop.xpm",
-"skinenigmang/icons/menu/streamdev.xpm",
-"skinenigmang/icons/menu/sudoku.xpm",
-"skinenigmang/icons/menu/summary.xpm",
-"skinenigmang/icons/menu/teletext.xpm",
-"skinenigmang/icons/menu/timers.xpm",
-"skinenigmang/icons/menu/tvonscreen.xpm",
-"skinenigmang/icons/menu/vcd.xpm",
-"skinenigmang/icons/menu/vdr.xpm",
-"skinenigmang/icons/menu/vdrc.xpm",
-"skinenigmang/icons/menu/vdrcd.xpm",
-"skinenigmang/icons/menu/vdrrip.xpm",
-"skinenigmang/icons/menu/weather.xpm",
-"skinenigmang/icons/menu/webepg.xpm",
-"skinenigmang/icons/menu/xineliboutput.xpm",
-"skinenigmang/icons/message/info.xpm",
-"skinenigmang/icons/replay/fastForward.xpm",
-"skinenigmang/icons/replay/fastForward1.xpm",
-"skinenigmang/icons/replay/fastForward2.xpm",
-"skinenigmang/icons/replay/fastForward3.xpm",
-"skinenigmang/icons/replay/fastForward4.xpm",
-"skinenigmang/icons/replay/fastForward5.xpm",
-"skinenigmang/icons/replay/fastForward6.xpm",
-"skinenigmang/icons/replay/fastForward7.xpm",
-"skinenigmang/icons/replay/fastForward8.xpm",
-"skinenigmang/icons/replay/fastForward9.xpm",
-"skinenigmang/icons/replay/fastRewind.xpm",
-"skinenigmang/icons/replay/fastRewind1.xpm",
-"skinenigmang/icons/replay/fastRewind2.xpm",
-"skinenigmang/icons/replay/fastRewind3.xpm",
-"skinenigmang/icons/replay/fastRewind4.xpm",
-"skinenigmang/icons/replay/fastRewind5.xpm",
-"skinenigmang/icons/replay/fastRewind6.xpm",
-"skinenigmang/icons/replay/fastRewind7.xpm",
-"skinenigmang/icons/replay/fastRewind8.xpm",
-"skinenigmang/icons/replay/fastRewind9.xpm",
-"skinenigmang/icons/replay/pause.xpm",
-"skinenigmang/icons/replay/play.xpm",
-"skinenigmang/icons/replay/slowForward.xpm",
-"skinenigmang/icons/replay/slowForward1.xpm",
-"skinenigmang/icons/replay/slowForward2.xpm",
-"skinenigmang/icons/replay/slowForward3.xpm",
-"skinenigmang/icons/replay/slowRewind.xpm",
-"skinenigmang/icons/replay/slowRewind1.xpm",
-"skinenigmang/icons/replay/slowRewind2.xpm",
-"skinenigmang/icons/replay/slowRewind3.xpm",
-"skinenigmang/icons/volume/muteOff.xpm",
-"skinenigmang/icons/volume/muteOn.xpm",
-"skinenigmang/logos/1-2-3.tv.xpm",
-"skinenigmang/logos/102.5_HIT_CH.xpm",
-"skinenigmang/logos/24_HORAS.xpm",
-"skinenigmang/logos/2M_Maroc.xpm",
-"skinenigmang/logos/40_LATINO.xpm",
-"skinenigmang/logos/40_PRINCIPALES.xpm",
-"skinenigmang/logos/40_TV.xpm",
-"skinenigmang/logos/AB_1.xpm",
-"skinenigmang/logos/AB_Moteurs.xpm",
-"skinenigmang/logos/ADO.xpm",
-"skinenigmang/logos/ALEGRIA-.xpm",
-"skinenigmang/logos/ALOUETTE.xpm",
-"skinenigmang/logos/AXN.xpm",
-"skinenigmang/logos/Action.xpm",
-"skinenigmang/logos/Animaux.xpm",
-"skinenigmang/logos/Arte.xpm",
-"skinenigmang/logos/BBC_Prime.xpm",
-"skinenigmang/logos/BBC_World.xpm",
-"skinenigmang/logos/BFM_TV.xpm",
-"skinenigmang/logos/BFM.xpm",
-"skinenigmang/logos/Best_of_Shopping.xpm",
-"skinenigmang/logos/Beur_FM.xpm",
-"skinenigmang/logos/Beur_Tv.xpm",
-"skinenigmang/logos/Bloomberg.xpm",
-"skinenigmang/logos/Boomerang.xpm",
-"skinenigmang/logos/C+_CINE_1.xpm",
-"skinenigmang/logos/C+_CINE_2.xpm",
-"skinenigmang/logos/C+_CINE_3.xpm",
-"skinenigmang/logos/C+_DEPORTE_1.xpm",
-"skinenigmang/logos/C+_DEPORTE_2.xpm",
-"skinenigmang/logos/C+_DEPORTE_3.xpm",
-"skinenigmang/logos/C-Cinema-16-9.xpm",
-"skinenigmang/logos/CADENA_DIAL.xpm",
-"skinenigmang/logos/CADENA_SER.xpm",
-"skinenigmang/logos/CALLE_13.xpm",
-"skinenigmang/logos/CANAL_ALGERIE.xpm",
-"skinenigmang/logos/CANAL_COCINA.xpm",
-"skinenigmang/logos/CANAL_HISTORIA.xpm",
-"skinenigmang/logos/CANAL+_2.xpm",
-"skinenigmang/logos/CANAL+...30.xpm",
-"skinenigmang/logos/CARTELERA.xpm",
-"skinenigmang/logos/CARTOON_NET..xpm",
-"skinenigmang/logos/CAZA_Y_PESCA.xpm",
-"skinenigmang/logos/CCTV4.xpm",
-"skinenigmang/logos/CCTV9.xpm",
-"skinenigmang/logos/CFI_PECO_PRO.xpm",
-"skinenigmang/logos/CHERIE_FM.xpm",
-"skinenigmang/logos/CNBC_Europe.xpm",
-"skinenigmang/logos/CNN+.xpm",
-"skinenigmang/logos/CNN.xpm",
-"skinenigmang/logos/COSMOPOLITAN.xpm",
-"skinenigmang/logos/COULEUR_3.xpm",
-"skinenigmang/logos/Canal_24_Horas.xpm",
-"skinenigmang/logos/Canal_J.xpm",
-"skinenigmang/logos/Canal+_Cinema.xpm",
-"skinenigmang/logos/Canal+_Hi-Tech.xpm",
-"skinenigmang/logos/Canal+_Sport.xpm",
-"skinenigmang/logos/Canal+.xpm",
-"skinenigmang/logos/Cartoon_Network.xpm",
-"skinenigmang/logos/Cine_FX.xpm",
-"skinenigmang/logos/Contact_FM.xpm",
-"skinenigmang/logos/Cuisine.TV.xpm",
-"skinenigmang/logos/DELUXE_MUSIC.xpm",
-"skinenigmang/logos/DEMAIN.xpm",
-"skinenigmang/logos/DIRECT_8.xpm",
-"skinenigmang/logos/DISCOVERY.xpm",
-"skinenigmang/logos/DISNEY_CH._+1.xpm",
-"skinenigmang/logos/DMAX.xpm",
-"skinenigmang/logos/Deutsche_Welle.xpm",
-"skinenigmang/logos/Disney_Channel_+1.xpm",
-"skinenigmang/logos/Disney_Channel.xpm",
-"skinenigmang/logos/E!_ENTERTAINMENT.xpm",
-"skinenigmang/logos/ENGLISH_PREMIER_LEAGUE.xpm",
-"skinenigmang/logos/ESPN_Classic_Sport.xpm",
-"skinenigmang/logos/EURONEWS.xpm",
-"skinenigmang/logos/EUROPE_2_TV.xpm",
-"skinenigmang/logos/EUROSPORT_2.xpm",
-"skinenigmang/logos/EUSKADI_TV.xpm",
-"skinenigmang/logos/EUSKADIRRATIA.xpm",
-"skinenigmang/logos/Encyclopedia.xpm",
-"skinenigmang/logos/Equidia.xpm",
-"skinenigmang/logos/Escales.xpm",
-"skinenigmang/logos/Europe_1.xpm",
-"skinenigmang/logos/Europe_2.xpm",
-"skinenigmang/logos/Europe2.xpm",
-"skinenigmang/logos/Eurosport.xpm",
-"skinenigmang/logos/Extreme_Sports.xpm",
-"skinenigmang/logos/FDF.xpm",
-"skinenigmang/logos/FIP_old.xpm",
-"skinenigmang/logos/FIP.xpm",
-"skinenigmang/logos/FOX_NEWS.xpm",
-"skinenigmang/logos/FOX.xpm",
-"skinenigmang/logos/FREE-X_LIGHT.xpm",
-"skinenigmang/logos/FREE-XTV_2.xpm",
-"skinenigmang/logos/FREQUENCE_JAZZ.xpm",
-"skinenigmang/logos/Fashion_TV.xpm",
-"skinenigmang/logos/Festival.xpm",
-"skinenigmang/logos/Filles_Tv.xpm",
-"skinenigmang/logos/Fit_Toute_l_Histoire.xpm",
-"skinenigmang/logos/France_2.xpm",
-"skinenigmang/logos/France_3.xpm",
-"skinenigmang/logos/France_4.xpm",
-"skinenigmang/logos/France_5.xpm",
-"skinenigmang/logos/France_CULTURE.xpm",
-"skinenigmang/logos/France_Culture_old.xpm",
-"skinenigmang/logos/France_INTER.xpm",
-"skinenigmang/logos/France_Info_old.xpm",
-"skinenigmang/logos/France_Info.xpm",
-"skinenigmang/logos/France_Inter_old.xpm",
-"skinenigmang/logos/France_Musiques_old.xpm",
-"skinenigmang/logos/France_Musiques.xpm",
-"skinenigmang/logos/France_O.xpm",
-"skinenigmang/logos/France_bleu_old_.xpm",
-"skinenigmang/logos/France_bleu.xpm",
-"skinenigmang/logos/Free-X_TV.xpm",
-"skinenigmang/logos/Fritz.xpm",
-"skinenigmang/logos/Fun_Radio.xpm",
-"skinenigmang/logos/Fun_TV.xpm",
-"skinenigmang/logos/GOLF+.xpm",
-"skinenigmang/logos/Game_Network.xpm",
-"skinenigmang/logos/Game_One.xpm",
-"skinenigmang/logos/God_TV.xpm",
-"skinenigmang/logos/Gourmet_Tv.xpm",
-"skinenigmang/logos/HITWEST.xpm",
-"skinenigmang/logos/HOLLYWOOD.xpm",
-"skinenigmang/logos/Hector.xpm",
-"skinenigmang/logos/Histoire.xpm",
-"skinenigmang/logos/IBERDROLA.xpm",
-"skinenigmang/logos/Infosport.xpm",
-"skinenigmang/logos/Jetix.xpm",
-"skinenigmang/logos/Jimmy.xpm",
-"skinenigmang/logos/KTO.xpm",
-"skinenigmang/logos/Kiosque_1.xpm",
-"skinenigmang/logos/Kiosque_10.xpm",
-"skinenigmang/logos/Kiosque_11.xpm",
-"skinenigmang/logos/Kiosque_12.xpm",
-"skinenigmang/logos/Kiosque_13.xpm",
-"skinenigmang/logos/Kiosque_14.xpm",
-"skinenigmang/logos/Kiosque_2.xpm",
-"skinenigmang/logos/Kiosque_3.xpm",
-"skinenigmang/logos/Kiosque_4.xpm",
-"skinenigmang/logos/Kiosque_5.xpm",
-"skinenigmang/logos/Kiosque_6.xpm",
-"skinenigmang/logos/Kiosque_7.xpm",
-"skinenigmang/logos/Kiosque_8.xpm",
-"skinenigmang/logos/Kiosque_9.xpm",
-"skinenigmang/logos/L_Equipe_TV.xpm",
-"skinenigmang/logos/LCI.xpm",
-"skinenigmang/logos/LE_MOUV.xpm",
-"skinenigmang/logos/La_Locale.xpm",
-"skinenigmang/logos/LibertyTV_FR.xpm",
-"skinenigmang/logos/Live_1.xpm",
-"skinenigmang/logos/M-80_RADIO.xpm",
-"skinenigmang/logos/M6_Music.xpm",
-"skinenigmang/logos/M6.xpm",
-"skinenigmang/logos/MCM_Pop.xpm",
-"skinenigmang/logos/MCM_Top.xpm",
-"skinenigmang/logos/MCM.xpm",
-"skinenigmang/logos/MDR_FIGARO.xpm",
-"skinenigmang/logos/MDR_INFO.xpm",
-"skinenigmang/logos/MDR1_S-ANHALT.xpm",
-"skinenigmang/logos/MDR1_SACHSEN.xpm",
-"skinenigmang/logos/MEDIA_TROPICAL.xpm",
-"skinenigmang/logos/MFM.xpm",
-"skinenigmang/logos/MOSAIQUE.xpm",
-"skinenigmang/logos/MTV_2.xpm",
-"skinenigmang/logos/MTV_Base.xpm",
-"skinenigmang/logos/MTV_ESP.xpm",
-"skinenigmang/logos/MTV_Hits.xpm",
-"skinenigmang/logos/MTV.xpm",
-"skinenigmang/logos/MTV2_Pop_Channel.xpm",
-"skinenigmang/logos/Mangas.xpm",
-"skinenigmang/logos/Match_TV.xpm",
-"skinenigmang/logos/Mezzo.xpm",
-"skinenigmang/logos/Motors_TV.xpm",
-"skinenigmang/logos/Multivision_1.xpm",
-"skinenigmang/logos/Multivision_2.xpm",
-"skinenigmang/logos/Multivision_3.xpm",
-"skinenigmang/logos/Multivision_4.xpm",
-"skinenigmang/logos/Multivision_5.xpm",
-"skinenigmang/logos/Multivision_6.xpm",
-"skinenigmang/logos/Multivision_7.xpm",
-"skinenigmang/logos/Multivision.xpm",
-"skinenigmang/logos/Musique_Classique.xpm",
-"skinenigmang/logos/N-JOY.xpm",
-"skinenigmang/logos/NBA+.xpm",
-"skinenigmang/logos/NDR_1_Niedersachsen.xpm",
-"skinenigmang/logos/NDR_1_Radio_MV.xpm",
-"skinenigmang/logos/NDR_1_Welle_Nord.xpm",
-"skinenigmang/logos/NDR_1.xpm",
-"skinenigmang/logos/NDR_2.xpm",
-"skinenigmang/logos/NDR_90,3.xpm",
-"skinenigmang/logos/NDR_Info.xpm",
-"skinenigmang/logos/NDR_Kultur.xpm",
-"skinenigmang/logos/NICKELODEON_ESP.xpm",
-"skinenigmang/logos/NRJ_12.xpm",
-"skinenigmang/logos/NRJ.xpm",
-"skinenigmang/logos/NT1.xpm",
-"skinenigmang/logos/Nat_Geographic.xpm",
-"skinenigmang/logos/Nick.xpm",
-"skinenigmang/logos/Nostalgie.xpm",
-"skinenigmang/logos/OLTV.xpm",
-"skinenigmang/logos/OM_TV.xpm",
-"skinenigmang/logos/Ocko_TV.xpm",
-"skinenigmang/logos/Oui_FM.xpm",
-"skinenigmang/logos/PARAMOUNT_COM.xpm",
-"skinenigmang/logos/PARIS_LIVE_RADIO.xpm",
-"skinenigmang/logos/PEOPLE+ARTS.xpm",
-"skinenigmang/logos/PLAYBOY_TV.xpm",
-"skinenigmang/logos/PRIVATE_GOLD.xpm",
-"skinenigmang/logos/Paris_Premiere.xpm",
-"skinenigmang/logos/Pink_TV.xpm",
-"skinenigmang/logos/Piwi.xpm",
-"skinenigmang/logos/Playhouse_Disney.xpm",
-"skinenigmang/logos/RADIO_FG.xpm",
-"skinenigmang/logos/RADIO_LATINA.xpm",
-"skinenigmang/logos/RADIO_NOTRE-DAME.xpm",
-"skinenigmang/logos/RADIO_NOVA.xpm",
-"skinenigmang/logos/RAI_1.xpm",
-"skinenigmang/logos/RCJ.xpm",
-"skinenigmang/logos/REAL_TIME.xpm",
-"skinenigmang/logos/RFI_Multilingues.xpm",
-"skinenigmang/logos/RFI.xpm",
-"skinenigmang/logos/RFM-TV.xpm",
-"skinenigmang/logos/RFM.xpm",
-"skinenigmang/logos/RFO_Sat.xpm",
-"skinenigmang/logos/RMC.xpm",
-"skinenigmang/logos/RTBF_SAT.xpm",
-"skinenigmang/logos/RTL.xpm",
-"skinenigmang/logos/RTL2.xpm",
-"skinenigmang/logos/RTL9.xpm",
-"skinenigmang/logos/RTPI.xpm",
-"skinenigmang/logos/Radio_Classique.xpm",
-"skinenigmang/logos/Radio_Courtoisie.xpm",
-"skinenigmang/logos/Real_Madrid_TV.xpm",
-"skinenigmang/logos/Reality_TV.xpm",
-"skinenigmang/logos/Rire&Chansons.xpm",
-"skinenigmang/logos/SIC.xpm",
-"skinenigmang/logos/SPORT_FM.xpm",
-"skinenigmang/logos/SR1.xpm",
-"skinenigmang/logos/SR2.xpm",
-"skinenigmang/logos/SR3.xpm",
-"skinenigmang/logos/STAR_ACADEMY.xpm",
-"skinenigmang/logos/Sailing_Channel.xpm",
-"skinenigmang/logos/Seasons.xpm",
-"skinenigmang/logos/Skyrock.xpm",
-"skinenigmang/logos/Spice_Platinum.xpm",
-"skinenigmang/logos/Sport+.xpm",
-"skinenigmang/logos/Sud_Radio.xpm",
-"skinenigmang/logos/TAQUILLA_1.xpm",
-"skinenigmang/logos/TAQUILLA_10.xpm",
-"skinenigmang/logos/TAQUILLA_12.xpm",
-"skinenigmang/logos/TAQUILLA_2.xpm",
-"skinenigmang/logos/TAQUILLA_3.xpm",
-"skinenigmang/logos/TAQUILLA_4.xpm",
-"skinenigmang/logos/TAQUILLA_5.xpm",
-"skinenigmang/logos/TAQUILLA_6.xpm",
-"skinenigmang/logos/TAQUILLA_7.xpm",
-"skinenigmang/logos/TAQUILLA_8.xpm",
-"skinenigmang/logos/TAQUILLA_9.xpm",
-"skinenigmang/logos/TAQUILLA_X.xpm",
-"skinenigmang/logos/TAQUILLA_XX.xpm",
-"skinenigmang/logos/TAQUILLA_XY.xpm",
-"skinenigmang/logos/TCHATCHE_TV.xpm",
-"skinenigmang/logos/TCM.xpm",
-"skinenigmang/logos/TELE_5.xpm",
-"skinenigmang/logos/TELEDEPORTE.xpm",
-"skinenigmang/logos/TELENOVELAS.xpm",
-"skinenigmang/logos/TELESUD.xpm",
-"skinenigmang/logos/TERRA_NOVA.xpm",
-"skinenigmang/logos/TF1.xpm",
-"skinenigmang/logos/TF6.xpm",
-"skinenigmang/logos/TFJ.xpm",
-"skinenigmang/logos/TFOU.xpm",
-"skinenigmang/logos/TMC.xpm",
-"skinenigmang/logos/TPS_CINECULTE.xpm",
-"skinenigmang/logos/TPS_CINEFAMILY.xpm",
-"skinenigmang/logos/TPS_CINESTAR.xpm",
-"skinenigmang/logos/TPS_CINETOILE.xpm",
-"skinenigmang/logos/TPS_CINEXTREME.xpm",
-"skinenigmang/logos/TPS_Foot.xpm",
-"skinenigmang/logos/TPS_HOMECINEMA.xpm",
-"skinenigmang/logos/TPS_Star.xpm",
-"skinenigmang/logos/TSF.xpm",
-"skinenigmang/logos/TSR1.xpm",
-"skinenigmang/logos/TSR2.xpm",
-"skinenigmang/logos/TV_Breizh.xpm",
-"skinenigmang/logos/TV_CANARIA.xpm",
-"skinenigmang/logos/TV_GALICIA.xpm",
-"skinenigmang/logos/TV_POLONIA.xpm",
-"skinenigmang/logos/TV5.xpm",
-"skinenigmang/logos/TVC_INT..xpm",
-"skinenigmang/logos/TVEI.xpm",
-"skinenigmang/logos/TVV_INT..xpm",
-"skinenigmang/logos/Teva.xpm",
-"skinenigmang/logos/Tiji.xpm",
-"skinenigmang/logos/Toon_Disney.xpm",
-"skinenigmang/logos/Trace_Tv.xpm",
-"skinenigmang/logos/VH1_Classic.xpm",
-"skinenigmang/logos/VH1.xpm",
-"skinenigmang/logos/VIAJAR.xpm",
-"skinenigmang/logos/VIBRATION.xpm",
-"skinenigmang/logos/VIVA_polska.xpm",
-"skinenigmang/logos/VOLTAGE.xpm",
-"skinenigmang/logos/Voyage.xpm",
-"skinenigmang/logos/W9.xpm",
-"skinenigmang/logos/WORLD_FASHION_CHANNEL.xpm",
-"skinenigmang/logos/Wuerfelzucker.xpm",
-"skinenigmang/logos/XXL.xpm",
-"skinenigmang/logos/YOU_FM.xpm",
-"skinenigmang/logos/ZDF.xpm",
-"skinenigmang/logos/Zi-One.xpm",
-"skinenigmang/logos/eurosport-news.xpm",
-"skinenigmang/logos/hr-info_+.xpm",
-"skinenigmang/logos/hr-info.xpm",
-"skinenigmang/logos/hr1.xpm",
-"skinenigmang/logos/hr2.xpm",
-"skinenigmang/logos/hr3.xpm",
-"skinenigmang/logos/hr4.xpm",
-"skinenigmang/logos/imusic_TV.xpm",
-"skinenigmang/logos/lafermecelebrites2.xpm",
-"skinenigmang/logos/le_Mouv_.xpm",
-"skinenigmang/logos/m6music.xpm",
-"skinenigmang/logos/m6musicblack.xpm",
-"skinenigmang/logos/m6musichits.xpm",
-"skinenigmang/logos/m6musicrock.xpm",
-"skinenigmang/logos/ouifm.xpm",
-"skinenigmang/logos/playboy.xpm",
-"skinenigmang/logos/radioeins.xpm",
-"skinenigmang/logos/telemadrid.xpm",
-"skinenigmang/logos/telif.xpm",
-"skinenigmang/logos/tv5europe.xpm",
-"skinenigmang/logos/tv5fbs.xpm",
-"skinenigmang/logos/tv8montblanc.xpm",
-"skinenigmang/logos/ushuaiatv.xpm"]
\ No newline at end of file
diff --git a/tests/data/archive/tgz/mixed_case_and_symlink.tgz.expected.json b/tests/data/archive/tgz/mixed_case_and_symlink.tgz.expected.json
new file mode 100644
index 0000000..4c2583b
--- /dev/null
+++ b/tests/data/archive/tgz/mixed_case_and_symlink.tgz.expected.json
@@ -0,0 +1,623 @@
+[
+  "skinenigmang/README",
+  "skinenigmang/COPYING",
+  "skinenigmang/logos/Kiosque 1.xpm",
+  "skinenigmang/logos/Histoire.xpm",
+  "skinenigmang/logos/Wuerfelzucker.xpm",
+  "skinenigmang/logos/FOX NEWS.xpm",
+  "skinenigmang/logos/RFI Multilingues.xpm",
+  "skinenigmang/logos/LibertyTV FR.xpm",
+  "skinenigmang/logos/hr3.xpm",
+  "skinenigmang/logos/COULEUR 3.xpm",
+  "skinenigmang/logos/Escales.xpm",
+  "skinenigmang/logos/Animaux.xpm",
+  "skinenigmang/logos/hr4.xpm",
+  "skinenigmang/logos/Mezzo.xpm",
+  "skinenigmang/logos/tv5fbs.xpm",
+  "skinenigmang/logos/N-JOY.xpm",
+  "skinenigmang/logos/RADIO NOVA.xpm",
+  "skinenigmang/logos/TAQUILLA 5.xpm",
+  "skinenigmang/logos/Radio Courtoisie.xpm",
+  "skinenigmang/logos/Canal 24 Horas.xpm",
+  "skinenigmang/logos/Spice Platinum.xpm",
+  "skinenigmang/logos/C+ DEPORTE 1.xpm",
+  "skinenigmang/logos/RTPI.xpm",
+  "skinenigmang/logos/CHERIE FM.xpm",
+  "skinenigmang/logos/RADIO NOTRE-DAME.xpm",
+  "skinenigmang/logos/YOU FM.xpm",
+  "skinenigmang/logos/CADENA DIAL.xpm",
+  "skinenigmang/logos/Canal+.xpm",
+  "skinenigmang/logos/Real Madrid TV.xpm",
+  "skinenigmang/logos/TAQUILLA 1.xpm",
+  "skinenigmang/logos/TSF.xpm",
+  "skinenigmang/logos/CCTV4.xpm",
+  "skinenigmang/logos/Paris Premiere.xpm",
+  "skinenigmang/logos/TVV INT..xpm",
+  "skinenigmang/logos/EUSKADIRRATIA.xpm",
+  "skinenigmang/logos/COSMOPOLITAN.xpm",
+  "skinenigmang/logos/TVEI.xpm",
+  "skinenigmang/logos/Skyrock.xpm",
+  "skinenigmang/logos/RFO Sat.xpm",
+  "skinenigmang/logos/CALLE 13.xpm",
+  "skinenigmang/logos/MDR FIGARO.xpm",
+  "skinenigmang/logos/MTV.xpm",
+  "skinenigmang/logos/TFJ.xpm",
+  "skinenigmang/logos/Fashion TV.xpm",
+  "skinenigmang/logos/Fritz.xpm",
+  "skinenigmang/logos/AB 1.xpm",
+  "skinenigmang/logos/XXL.xpm",
+  "skinenigmang/logos/CANAL+ 2.xpm",
+  "skinenigmang/logos/SPORT FM.xpm",
+  "skinenigmang/logos/ALOUETTE.xpm",
+  "skinenigmang/logos/DISNEY CH. +1.xpm",
+  "skinenigmang/logos/SR3.xpm",
+  "skinenigmang/logos/Multivision 1.xpm",
+  "skinenigmang/logos/MCM.xpm",
+  "skinenigmang/logos/Playhouse Disney.xpm",
+  "skinenigmang/logos/le Mouv_.xpm",
+  "skinenigmang/logos/L_Equipe TV.xpm",
+  "skinenigmang/logos/DIRECT 8.xpm",
+  "skinenigmang/logos/TAQUILLA 7.xpm",
+  "skinenigmang/logos/Sport+.xpm",
+  "skinenigmang/logos/M-80 RADIO.xpm",
+  "skinenigmang/logos/Toon Disney.xpm",
+  "skinenigmang/logos/telemadrid.xpm",
+  "skinenigmang/logos/MTV ESP.xpm",
+  "skinenigmang/logos/C+ CINE 3.xpm",
+  "skinenigmang/logos/40 LATINO.xpm",
+  "skinenigmang/logos/Oui FM.xpm",
+  "skinenigmang/logos/Bloomberg.xpm",
+  "skinenigmang/logos/France 2.xpm",
+  "skinenigmang/logos/FREQUENCE JAZZ.xpm",
+  "skinenigmang/logos/EUROSPORT 2.xpm",
+  "skinenigmang/logos/BFM TV.xpm",
+  "skinenigmang/logos/TAQUILLA 10.xpm",
+  "skinenigmang/logos/VIBRATION.xpm",
+  "skinenigmang/logos/NDR Kultur.xpm",
+  "skinenigmang/logos/NBA+.xpm",
+  "skinenigmang/logos/TAQUILLA 2.xpm",
+  "skinenigmang/logos/DMAX.xpm",
+  "skinenigmang/logos/Best of Shopping.xpm",
+  "skinenigmang/logos/Cine FX.xpm",
+  "skinenigmang/logos/Kiosque 8.xpm",
+  "skinenigmang/logos/TV Breizh.xpm",
+  "skinenigmang/logos/WORLD FASHION CHANNEL.xpm",
+  "skinenigmang/logos/TELESUD.xpm",
+  "skinenigmang/logos/CNN.xpm",
+  "skinenigmang/logos/CADENA SER.xpm",
+  "skinenigmang/logos/Kiosque 3.xpm",
+  "skinenigmang/logos/Europe 2.xpm",
+  "skinenigmang/logos/Hector.xpm",
+  "skinenigmang/logos/Kiosque 7.xpm",
+  "skinenigmang/logos/TPS Star.xpm",
+  "skinenigmang/logos/TAQUILLA 8.xpm",
+  "skinenigmang/logos/Filles Tv.xpm",
+  "skinenigmang/logos/PLAYBOY TV.xpm",
+  "skinenigmang/logos/Ocko TV.xpm",
+  "skinenigmang/logos/Reality TV.xpm",
+  "skinenigmang/logos/hr1.xpm",
+  "skinenigmang/logos/Match TV.xpm",
+  "skinenigmang/logos/TSR2.xpm",
+  "skinenigmang/logos/MFM.xpm",
+  "skinenigmang/logos/hr-info.xpm",
+  "skinenigmang/logos/Fun TV.xpm",
+  "skinenigmang/logos/VIVA polska.xpm",
+  "skinenigmang/logos/France Musiques.xpm",
+  "skinenigmang/logos/FDF.xpm",
+  "skinenigmang/logos/Contact FM.xpm",
+  "skinenigmang/logos/KTO.xpm",
+  "skinenigmang/logos/TV POLONIA.xpm",
+  "skinenigmang/logos/Canal+ Hi-Tech.xpm",
+  "skinenigmang/logos/VH1 Classic.xpm",
+  "skinenigmang/logos/Kiosque 11.xpm",
+  "skinenigmang/logos/hr2.xpm",
+  "skinenigmang/logos/Sud Radio.xpm",
+  "skinenigmang/logos/Motors TV.xpm",
+  "skinenigmang/logos/MTV Hits.xpm",
+  "skinenigmang/logos/France Info old.xpm",
+  "skinenigmang/logos/CANAL+...30.xpm",
+  "skinenigmang/logos/TELEDEPORTE.xpm",
+  "skinenigmang/logos/RAI 1.xpm",
+  "skinenigmang/logos/RTL9.xpm",
+  "skinenigmang/logos/24 HORAS.xpm",
+  "skinenigmang/logos/RTBF SAT.xpm",
+  "skinenigmang/logos/Kiosque 13.xpm",
+  "skinenigmang/logos/40 TV.xpm",
+  "skinenigmang/logos/France 3.xpm",
+  "skinenigmang/logos/TF1.xpm",
+  "skinenigmang/logos/C+ CINE 2.xpm",
+  "skinenigmang/logos/Canal+ Cinema.xpm",
+  "skinenigmang/logos/TPS CINETOILE.xpm",
+  "skinenigmang/logos/France 5.xpm",
+  "skinenigmang/logos/Jimmy.xpm",
+  "skinenigmang/logos/Equidia.xpm",
+  "skinenigmang/logos/Sailing Channel.xpm",
+  "skinenigmang/logos/CNN+.xpm",
+  "skinenigmang/logos/Kiosque 14.xpm",
+  "skinenigmang/logos/102.5 HIT CH.xpm",
+  "skinenigmang/logos/Multivision 3.xpm",
+  "skinenigmang/logos/radioeins.xpm",
+  "skinenigmang/logos/Boomerang.xpm",
+  "skinenigmang/logos/Fun Radio.xpm",
+  "skinenigmang/logos/TCHATCHE TV.xpm",
+  "skinenigmang/logos/MCM Pop.xpm",
+  "skinenigmang/logos/La Locale.xpm",
+  "skinenigmang/logos/NDR Info.xpm",
+  "skinenigmang/logos/TAQUILLA XY.xpm",
+  "skinenigmang/logos/OLTV.xpm",
+  "skinenigmang/logos/W9.xpm",
+  "skinenigmang/logos/C+ DEPORTE 2.xpm",
+  "skinenigmang/logos/Beur Tv.xpm",
+  "skinenigmang/logos/TAQUILLA 9.xpm",
+  "skinenigmang/logos/TPS CINEFAMILY.xpm",
+  "skinenigmang/logos/ouifm.xpm",
+  "skinenigmang/logos/TAQUILLA 4.xpm",
+  "skinenigmang/logos/MTV 2.xpm",
+  "skinenigmang/logos/Arte.xpm",
+  "skinenigmang/logos/RFM-TV.xpm",
+  "skinenigmang/logos/Multivision 6.xpm",
+  "skinenigmang/logos/Game Network.xpm",
+  "skinenigmang/logos/TMC.xpm",
+  "skinenigmang/logos/lafermecelebrites2.xpm",
+  "skinenigmang/logos/VOLTAGE.xpm",
+  "skinenigmang/logos/REAL TIME.xpm",
+  "skinenigmang/logos/EUROPE 2 TV.xpm",
+  "skinenigmang/logos/Live 1.xpm",
+  "skinenigmang/logos/m6musichits.xpm",
+  "skinenigmang/logos/RADIO LATINA.xpm",
+  "skinenigmang/logos/Disney Channel +1.xpm",
+  "skinenigmang/logos/ZDF.xpm",
+  "skinenigmang/logos/NDR 1.xpm",
+  "skinenigmang/logos/Kiosque 10.xpm",
+  "skinenigmang/logos/Europe2.xpm",
+  "skinenigmang/logos/Europe 1.xpm",
+  "skinenigmang/logos/CANAL ALGERIE.xpm",
+  "skinenigmang/logos/E! ENTERTAINMENT.xpm",
+  "skinenigmang/logos/NDR 1 Niedersachsen.xpm",
+  "skinenigmang/logos/Zi-One.xpm",
+  "skinenigmang/logos/CCTV9.xpm",
+  "skinenigmang/logos/NT1.xpm",
+  "skinenigmang/logos/NRJ.xpm",
+  "skinenigmang/logos/TPS Foot.xpm",
+  "skinenigmang/logos/SIC.xpm",
+  "skinenigmang/logos/imusic TV.xpm",
+  "skinenigmang/logos/BBC World.xpm",
+  "skinenigmang/logos/NDR 2.xpm",
+  "skinenigmang/logos/HOLLYWOOD.xpm",
+  "skinenigmang/logos/France bleu old .xpm",
+  "skinenigmang/logos/CAZA Y PESCA.xpm",
+  "skinenigmang/logos/Multivision 7.xpm",
+  "skinenigmang/logos/C+ CINE 1.xpm",
+  "skinenigmang/logos/RFM.xpm",
+  "skinenigmang/logos/Infosport.xpm",
+  "skinenigmang/logos/CFI PECO PRO.xpm",
+  "skinenigmang/logos/AB Moteurs.xpm",
+  "skinenigmang/logos/Piwi.xpm",
+  "skinenigmang/logos/Game One.xpm",
+  "skinenigmang/logos/TV CANARIA.xpm",
+  "skinenigmang/logos/Seasons.xpm",
+  "skinenigmang/logos/TERRA NOVA.xpm",
+  "skinenigmang/logos/France O.xpm",
+  "skinenigmang/logos/NDR 1 Welle Nord.xpm",
+  "skinenigmang/logos/TFOU.xpm",
+  "skinenigmang/logos/FOX.xpm",
+  "skinenigmang/logos/TAQUILLA XX.xpm",
+  "skinenigmang/logos/RTL2.xpm",
+  "skinenigmang/logos/Action.xpm",
+  "skinenigmang/logos/TVC INT..xpm",
+  "skinenigmang/logos/SR1.xpm",
+  "skinenigmang/logos/VH1.xpm",
+  "skinenigmang/logos/Kiosque 9.xpm",
+  "skinenigmang/logos/France Info.xpm",
+  "skinenigmang/logos/M6 Music.xpm",
+  "skinenigmang/logos/tv5europe.xpm",
+  "skinenigmang/logos/ESPN Classic Sport.xpm",
+  "skinenigmang/logos/M6.xpm",
+  "skinenigmang/logos/RFI.xpm",
+  "skinenigmang/logos/ALEGRIA-.xpm",
+  "skinenigmang/logos/m6musicrock.xpm",
+  "skinenigmang/logos/Mangas.xpm",
+  "skinenigmang/logos/Multivision 2.xpm",
+  "skinenigmang/logos/2M Maroc.xpm",
+  "skinenigmang/logos/TPS CINESTAR.xpm",
+  "skinenigmang/logos/TAQUILLA 6.xpm",
+  "skinenigmang/logos/RCJ.xpm",
+  "skinenigmang/logos/DELUXE MUSIC.xpm",
+  "skinenigmang/logos/MCM Top.xpm",
+  "skinenigmang/logos/C+ DEPORTE 3.xpm",
+  "skinenigmang/logos/FIP.xpm",
+  "skinenigmang/logos/PARAMOUNT COM.xpm",
+  "skinenigmang/logos/France bleu.xpm",
+  "skinenigmang/logos/RADIO FG.xpm",
+  "skinenigmang/logos/France 4.xpm",
+  "skinenigmang/logos/Gourmet Tv.xpm",
+  "skinenigmang/logos/Cartoon Network.xpm",
+  "skinenigmang/logos/m6musicblack.xpm",
+  "skinenigmang/logos/hr-info +.xpm",
+  "skinenigmang/logos/EUSKADI TV.xpm",
+  "skinenigmang/logos/TSR1.xpm",
+  "skinenigmang/logos/PRIVATE GOLD.xpm",
+  "skinenigmang/logos/BFM.xpm",
+  "skinenigmang/logos/TCM.xpm",
+  "skinenigmang/logos/Encyclopedia.xpm",
+  "skinenigmang/logos/Nick.xpm",
+  "skinenigmang/logos/Pink TV.xpm",
+  "skinenigmang/logos/Extreme Sports.xpm",
+  "skinenigmang/logos/DEMAIN.xpm",
+  "skinenigmang/logos/TELE 5.xpm",
+  "skinenigmang/logos/LCI.xpm",
+  "skinenigmang/logos/Kiosque 6.xpm",
+  "skinenigmang/logos/Nostalgie.xpm",
+  "skinenigmang/logos/ushuaiatv.xpm",
+  "skinenigmang/logos/DISCOVERY.xpm",
+  "skinenigmang/logos/PEOPLE+ARTS.xpm",
+  "skinenigmang/logos/Fit Toute l_Histoire.xpm",
+  "skinenigmang/logos/Multivision 4.xpm",
+  "skinenigmang/logos/Deutsche Welle.xpm",
+  "skinenigmang/logos/PARIS LIVE RADIO.xpm",
+  "skinenigmang/logos/Voyage.xpm",
+  "skinenigmang/logos/CNBC Europe.xpm",
+  "skinenigmang/logos/RMC.xpm",
+  "skinenigmang/logos/Canal J.xpm",
+  "skinenigmang/logos/STAR ACADEMY.xpm",
+  "skinenigmang/logos/1-2-3.tv.xpm",
+  "skinenigmang/logos/France Culture old.xpm",
+  "skinenigmang/logos/MDR INFO.xpm",
+  "skinenigmang/logos/playboy.xpm",
+  "skinenigmang/logos/MOSAIQUE.xpm",
+  "skinenigmang/logos/Nat Geographic.xpm",
+  "skinenigmang/logos/OM_TV.xpm",
+  "skinenigmang/logos/Multivision.xpm",
+  "skinenigmang/logos/Tiji.xpm",
+  "skinenigmang/logos/Free-X TV.xpm",
+  "skinenigmang/logos/CARTELERA.xpm",
+  "skinenigmang/logos/TPS CINECULTE.xpm",
+  "skinenigmang/logos/Eurosport.xpm",
+  "skinenigmang/logos/telif.xpm",
+  "skinenigmang/logos/EURONEWS.xpm",
+  "skinenigmang/logos/Multivision 5.xpm",
+  "skinenigmang/logos/Teva.xpm",
+  "skinenigmang/logos/TV GALICIA.xpm",
+  "skinenigmang/logos/TELENOVELAS.xpm",
+  "skinenigmang/logos/NDR 90,3.xpm",
+  "skinenigmang/logos/Rire&Chansons.xpm",
+  "skinenigmang/logos/CARTOON NET..xpm",
+  "skinenigmang/logos/NICKELODEON ESP.xpm",
+  "skinenigmang/logos/God TV.xpm",
+  "skinenigmang/logos/GOLF+.xpm",
+  "skinenigmang/logos/Radio Classique.xpm",
+  "skinenigmang/logos/Disney Channel.xpm",
+  "skinenigmang/logos/Festival.xpm",
+  "skinenigmang/logos/TF6.xpm",
+  "skinenigmang/logos/TPS HOMECINEMA.xpm",
+  "skinenigmang/logos/BBC Prime.xpm",
+  "skinenigmang/logos/ENGLISH PREMIER LEAGUE.xpm",
+  "skinenigmang/logos/Beur FM.xpm",
+  "skinenigmang/logos/TV5.xpm",
+  "skinenigmang/logos/Jetix.xpm",
+  "skinenigmang/logos/TAQUILLA 12.xpm",
+  "skinenigmang/logos/France Inter old.xpm",
+  "skinenigmang/logos/FREE-X LIGHT.xpm",
+  "skinenigmang/logos/AXN.xpm",
+  "skinenigmang/logos/CANAL COCINA.xpm",
+  "skinenigmang/logos/VIAJAR.xpm",
+  "skinenigmang/logos/Musique Classique.xpm",
+  "skinenigmang/logos/MTV2 Pop Channel.xpm",
+  "skinenigmang/logos/MDR1 SACHSEN.xpm",
+  "skinenigmang/logos/Canal+ Sport.xpm",
+  "skinenigmang/logos/ADO.xpm",
+  "skinenigmang/logos/Trace Tv.xpm",
+  "skinenigmang/logos/Cuisine.TV.xpm",
+  "skinenigmang/logos/FIP old.xpm",
+  "skinenigmang/logos/Kiosque 12.xpm",
+  "skinenigmang/logos/LE MOUV.xpm",
+  "skinenigmang/logos/CANAL HISTORIA.xpm",
+  "skinenigmang/logos/FREE-XTV 2.xpm",
+  "skinenigmang/logos/tv8montblanc.xpm",
+  "skinenigmang/logos/MTV Base.xpm",
+  "skinenigmang/logos/40 PRINCIPALES.xpm",
+  "skinenigmang/logos/Kiosque 4.xpm",
+  "skinenigmang/logos/NRJ 12.xpm",
+  "skinenigmang/logos/NDR 1 Radio MV.xpm",
+  "skinenigmang/logos/TPS CINEXTREME.xpm",
+  "skinenigmang/logos/eurosport-news.xpm",
+  "skinenigmang/logos/TAQUILLA X.xpm",
+  "skinenigmang/logos/IBERDROLA.xpm",
+  "skinenigmang/logos/MDR1 S-ANHALT.xpm",
+  "skinenigmang/logos/France CULTURE.xpm",
+  "skinenigmang/logos/C-Cinema-16-9.xpm",
+  "skinenigmang/logos/HITWEST.xpm",
+  "skinenigmang/logos/France INTER.xpm",
+  "skinenigmang/logos/m6music.xpm",
+  "skinenigmang/logos/RTL.xpm",
+  "skinenigmang/logos/Kiosque 2.xpm",
+  "skinenigmang/logos/France Musiques old.xpm",
+  "skinenigmang/logos/TAQUILLA 3.xpm",
+  "skinenigmang/logos/Kiosque 5.xpm",
+  "skinenigmang/logos/MEDIA TROPICAL.xpm",
+  "skinenigmang/logos/SR2.xpm",
+  "skinenigmang/hqlogos/Histoire.xpm",
+  "skinenigmang/hqlogos/ATV+.xpm",
+  "skinenigmang/hqlogos/MDR FERNSEHEN.xpm",
+  "skinenigmang/hqlogos/NEUN LIVE Television.xpm",
+  "skinenigmang/hqlogos/Escales.xpm",
+  "skinenigmang/hqlogos/Animaux.xpm",
+  "skinenigmang/hqlogos/SF1.xpm",
+  "skinenigmang/hqlogos/Mezzo.xpm",
+  "skinenigmang/hqlogos/PREMIERE DIREKT.xpm",
+  "skinenigmang/hqlogos/RTPI.xpm",
+  "skinenigmang/hqlogos/Canal+.xpm",
+  "skinenigmang/hqlogos/MTV Central.xpm",
+  "skinenigmang/hqlogos/CCTV4.xpm",
+  "skinenigmang/hqlogos/Paris Premiere.xpm",
+  "skinenigmang/hqlogos/TVEI.xpm",
+  "skinenigmang/hqlogos/RBB.xpm",
+  "skinenigmang/hqlogos/3sat.xpm",
+  "skinenigmang/hqlogos/ANTENNE BAYERN.xpm",
+  "skinenigmang/hqlogos/RFO Sat.xpm",
+  "skinenigmang/hqlogos/MTV.xpm",
+  "skinenigmang/hqlogos/TFJ.xpm",
+  "skinenigmang/hqlogos/Fashion TV.xpm",
+  "skinenigmang/hqlogos/PREMIERE SPORT PORTAL.xpm",
+  "skinenigmang/hqlogos/AB 1.xpm",
+  "skinenigmang/hqlogos/XXL.xpm",
+  "skinenigmang/hqlogos/arte_1.xpm",
+  "skinenigmang/hqlogos/Multivision 1.xpm",
+  "skinenigmang/hqlogos/MCM.xpm",
+  "skinenigmang/hqlogos/Playhouse Disney.xpm",
+  "skinenigmang/hqlogos/L_Equipe TV.xpm",
+  "skinenigmang/hqlogos/N24.xpm",
+  "skinenigmang/hqlogos/Sport+.xpm",
+  "skinenigmang/hqlogos/Toon Disney.xpm",
+  "skinenigmang/hqlogos/COMEDY CENTRAL.xpm",
+  "skinenigmang/hqlogos/hr-fernsehen.xpm",
+  "skinenigmang/hqlogos/EinsPlus.xpm",
+  "skinenigmang/hqlogos/EinsExtra.xpm",
+  "skinenigmang/hqlogos/Bloomberg.xpm",
+  "skinenigmang/hqlogos/France 2.xpm",
+  "skinenigmang/hqlogos/PREMIERE SPORT 1.xpm",
+  "skinenigmang/hqlogos/FM4.xpm",
+  "skinenigmang/hqlogos/NBA+.xpm",
+  "skinenigmang/hqlogos/Cine FX.xpm",
+  "skinenigmang/hqlogos/TV Breizh.xpm",
+  "skinenigmang/hqlogos/CNN.xpm",
+  "skinenigmang/hqlogos/no_logo.xpm",
+  "skinenigmang/hqlogos/TPS Star.xpm",
+  "skinenigmang/hqlogos/TW1.xpm",
+  "skinenigmang/hqlogos/PREMIERE 6.xpm",
+  "skinenigmang/hqlogos/Filles Tv.xpm",
+  "skinenigmang/hqlogos/PREMIERE 4.xpm",
+  "skinenigmang/hqlogos/Bayerisches FS.xpm",
+  "skinenigmang/hqlogos/Match TV.xpm",
+  "skinenigmang/hqlogos/Fun TV.xpm",
+  "skinenigmang/hqlogos/KTO.xpm",
+  "skinenigmang/hqlogos/TV POLONIA.xpm",
+  "skinenigmang/hqlogos/France-4.xpm",
+  "skinenigmang/hqlogos/Canal+ Hi-Tech.xpm",
+  "skinenigmang/hqlogos/VH1 Classic.xpm",
+  "skinenigmang/hqlogos/n-tv.xpm",
+  "skinenigmang/hqlogos/Motors TV.xpm",
+  "skinenigmang/hqlogos/MTV Hits.xpm",
+  "skinenigmang/hqlogos/RAI 1.xpm",
+  "skinenigmang/hqlogos/RTL9.xpm",
+  "skinenigmang/hqlogos/France 3.xpm",
+  "skinenigmang/hqlogos/TF1.xpm",
+  "skinenigmang/hqlogos/ZDFdokukanal.xpm",
+  "skinenigmang/hqlogos/Canal+ Cinema.xpm",
+  "skinenigmang/hqlogos/TPS CINETOILE.xpm",
+  "skinenigmang/hqlogos/PREMIERE 1.xpm",
+  "skinenigmang/hqlogos/France 5.xpm",
+  "skinenigmang/hqlogos/Jimmy.xpm",
+  "skinenigmang/hqlogos/NBC.xpm",
+  "skinenigmang/hqlogos/Equidia.xpm",
+  "skinenigmang/hqlogos/EinsMuXx.xpm",
+  "skinenigmang/hqlogos/Multivision 3.xpm",
+  "skinenigmang/hqlogos/Boomerang.xpm",
+  "skinenigmang/hqlogos/MCM Pop.xpm",
+  "skinenigmang/hqlogos/ORF2.xpm",
+  "skinenigmang/hqlogos/W9.xpm",
+  "skinenigmang/hqlogos/Beur Tv.xpm",
+  "skinenigmang/hqlogos/TPS CINEFAMILY.xpm",
+  "skinenigmang/hqlogos/PREMIERE 2.xpm",
+  "skinenigmang/hqlogos/MTV 2.xpm",
+  "skinenigmang/hqlogos/Arte.xpm",
+  "skinenigmang/hqlogos/NRJ-12.xpm",
+  "skinenigmang/hqlogos/RFM-TV.xpm",
+  "skinenigmang/hqlogos/Multivision 6.xpm",
+  "skinenigmang/hqlogos/TMC.xpm",
+  "skinenigmang/hqlogos/Super RTL.xpm",
+  "skinenigmang/hqlogos/Das Erste.xpm",
+  "skinenigmang/hqlogos/Live 1.xpm",
+  "skinenigmang/hqlogos/VIVA PLUS.xpm",
+  "skinenigmang/hqlogos/ROCK ANTENNE.xpm",
+  "skinenigmang/hqlogos/Disney Channel +1.xpm",
+  "skinenigmang/hqlogos/ZDF.xpm",
+  "skinenigmang/hqlogos/HSE24.xpm",
+  "skinenigmang/hqlogos/EuroNews_1.xpm",
+  "skinenigmang/hqlogos/PREMIERE 3.xpm",
+  "skinenigmang/hqlogos/EinsFestival.xpm",
+  "skinenigmang/hqlogos/KiKa.xpm",
+  "skinenigmang/hqlogos/NT1.xpm",
+  "skinenigmang/hqlogos/SIC.xpm",
+  "skinenigmang/hqlogos/SAT.1.xpm",
+  "skinenigmang/hqlogos/BBC World.xpm",
+  "skinenigmang/hqlogos/BR-alpha.xpm",
+  "skinenigmang/hqlogos/Multivision 7.xpm",
+  "skinenigmang/hqlogos/Infosport.xpm",
+  "skinenigmang/hqlogos/AB Moteurs.xpm",
+  "skinenigmang/hqlogos/NDR FS HH.xpm",
+  "skinenigmang/hqlogos/Piwi.xpm",
+  "skinenigmang/hqlogos/Game One.xpm",
+  "skinenigmang/hqlogos/Seasons.xpm",
+  "skinenigmang/hqlogos/TERRA NOVA.xpm",
+  "skinenigmang/hqlogos/PREMIERE 7.xpm",
+  "skinenigmang/hqlogos/RTL2.xpm",
+  "skinenigmang/hqlogos/Action.xpm",
+  "skinenigmang/hqlogos/VH1.xpm",
+  "skinenigmang/hqlogos/M6 Music.xpm",
+  "skinenigmang/hqlogos/VIVA.xpm",
+  "skinenigmang/hqlogos/ESPN Classic Sport.xpm",
+  "skinenigmang/hqlogos/M6.xpm",
+  "skinenigmang/hqlogos/PREMIERE.xpm",
+  "skinenigmang/hqlogos/Mangas.xpm",
+  "skinenigmang/hqlogos/PREMIERE SPORT 2.xpm",
+  "skinenigmang/hqlogos/Multivision 2.xpm",
+  "skinenigmang/hqlogos/2M Maroc.xpm",
+  "skinenigmang/hqlogos/TPS CINESTAR.xpm",
+  "skinenigmang/hqlogos/DELUXE MUSIC.xpm",
+  "skinenigmang/hqlogos/ORF1.xpm",
+  "skinenigmang/hqlogos/MCM Top.xpm",
+  "skinenigmang/hqlogos/Gourmet Tv.xpm",
+  "skinenigmang/hqlogos/Cartoon Network.xpm",
+  "skinenigmang/hqlogos/PRIVATE GOLD.xpm",
+  "skinenigmang/hqlogos/MDR JUMP.xpm",
+  "skinenigmang/hqlogos/TCM.xpm",
+  "skinenigmang/hqlogos/Encyclopedia.xpm",
+  "skinenigmang/hqlogos/IG3XEX~2.xpm",
+  "skinenigmang/hqlogos/Pink TV.xpm",
+  "skinenigmang/hqlogos/GigaTV.xpm",
+  "skinenigmang/hqlogos/Extreme Sports.xpm",
+  "skinenigmang/hqlogos/TELE 5.xpm",
+  "skinenigmang/hqlogos/LCI.xpm",
+  "skinenigmang/hqlogos/Fit Toute l_Histoire.xpm",
+  "skinenigmang/hqlogos/Multivision 4.xpm",
+  "skinenigmang/hqlogos/Deutsche Welle.xpm",
+  "skinenigmang/hqlogos/Voyage.xpm",
+  "skinenigmang/hqlogos/KABEL1.xpm",
+  "skinenigmang/hqlogos/VOX.xpm",
+  "skinenigmang/hqlogos/CNBC Europe.xpm",
+  "skinenigmang/hqlogos/Canal J.xpm",
+  "skinenigmang/hqlogos/Nat Geographic.xpm",
+  "skinenigmang/hqlogos/GoTV.xpm",
+  "skinenigmang/hqlogos/DSF.xpm",
+  "skinenigmang/hqlogos/NICK.xpm",
+  "skinenigmang/hqlogos/Multivision.xpm",
+  "skinenigmang/hqlogos/Tiji.xpm",
+  "skinenigmang/hqlogos/TPS CINECULTE.xpm",
+  "skinenigmang/hqlogos/Eurosport.xpm",
+  "skinenigmang/hqlogos/EURONEWS.xpm",
+  "skinenigmang/hqlogos/Multivision 5.xpm",
+  "skinenigmang/hqlogos/SF2.xpm",
+  "skinenigmang/hqlogos/ZDFtheaterkanal.xpm",
+  "skinenigmang/hqlogos/Disney Channel.xpm",
+  "skinenigmang/hqlogos/Festival.xpm",
+  "skinenigmang/hqlogos/TF6.xpm",
+  "skinenigmang/hqlogos/TPS HOMECINEMA.xpm",
+  "skinenigmang/hqlogos/BBC Prime.xpm",
+  "skinenigmang/hqlogos/ENGLISH PREMIER LEAGUE.xpm",
+  "skinenigmang/hqlogos/DAS VIERTE.xpm",
+  "skinenigmang/hqlogos/TV5.xpm",
+  "skinenigmang/hqlogos/Jetix.xpm",
+  "skinenigmang/hqlogos/Musique Classique.xpm",
+  "skinenigmang/hqlogos/Canal+ Sport.xpm",
+  "skinenigmang/hqlogos/Trace Tv.xpm",
+  "skinenigmang/hqlogos/Cuisine.TV.xpm",
+  "skinenigmang/hqlogos/ProSieben.xpm",
+  "skinenigmang/hqlogos/ZDFinfokanal.xpm",
+  "skinenigmang/hqlogos/RTL Television.xpm",
+  "skinenigmang/hqlogos/bayern3.xpm",
+  "skinenigmang/hqlogos/TPS CINEXTREME.xpm",
+  "skinenigmang/hqlogos/DIRECT-8.xpm",
+  "skinenigmang/hqlogos/PREMIERE 5.xpm",
+  "skinenigmang/flags/engDUAL.xpm",
+  "skinenigmang/flags/dutDD.xpm",
+  "skinenigmang/flags/deuDD.xpm",
+  "skinenigmang/flags/fra.xpm",
+  "skinenigmang/flags/fraDD.xpm",
+  "skinenigmang/flags/deuDUAL.xpm",
+  "skinenigmang/flags/deu.xpm",
+  "skinenigmang/flags/dutDUAL.xpm",
+  "skinenigmang/flags/fraMONO.xpm",
+  "skinenigmang/flags/engMONO.xpm",
+  "skinenigmang/flags/eng.xpm",
+  "skinenigmang/flags/fraDUAL.xpm",
+  "skinenigmang/flags/engDD.xpm",
+  "skinenigmang/flags/deuMONO.xpm",
+  "skinenigmang/flags/dutMONO.xpm",
+  "skinenigmang/flags/dut.xpm",
+  "skinenigmang/icons/menu/pin.xpm",
+  "skinenigmang/icons/menu/blank.xpm",
+  "skinenigmang/icons/menu/rotor.xpm",
+  "skinenigmang/icons/menu/cdda.xpm",
+  "skinenigmang/icons/menu/epgsearch.xpm",
+  "skinenigmang/icons/menu/cancel.xpm",
+  "skinenigmang/icons/menu/dvd.xpm",
+  "skinenigmang/icons/menu/digicam.xpm",
+  "skinenigmang/icons/menu/soccer.xpm",
+  "skinenigmang/icons/menu/summary.xpm",
+  "skinenigmang/icons/menu/streamdev.xpm",
+  "skinenigmang/icons/menu/timers.xpm",
+  "skinenigmang/icons/menu/device.xpm",
+  "skinenigmang/icons/menu/vdrc.xpm",
+  "skinenigmang/icons/menu/fussball.xpm",
+  "skinenigmang/icons/menu/newsticker.xpm",
+  "skinenigmang/icons/menu/games.xpm",
+  "skinenigmang/icons/menu/image.xpm",
+  "skinenigmang/icons/menu/recordings.xpm",
+  "skinenigmang/icons/menu/tvonscreen.xpm",
+  "skinenigmang/icons/menu/director.xpm",
+  "skinenigmang/icons/menu/filebrowser.xpm",
+  "skinenigmang/icons/menu/vdrrip.xpm",
+  "skinenigmang/icons/menu/schedule.xpm",
+  "skinenigmang/icons/menu/vdr.xpm",
+  "skinenigmang/icons/menu/webepg.xpm",
+  "skinenigmang/icons/menu/vcd.xpm",
+  "skinenigmang/icons/menu/dvdselect.xpm",
+  "skinenigmang/icons/menu/externalplayer.xpm",
+  "skinenigmang/icons/menu/audiorecorder.xpm",
+  "skinenigmang/icons/menu/stop.xpm",
+  "skinenigmang/icons/menu/burn.xpm",
+  "skinenigmang/icons/menu/channelscan.xpm",
+  "skinenigmang/icons/menu/weather.xpm",
+  "skinenigmang/icons/menu/solitaire2.xpm",
+  "skinenigmang/icons/menu/commands.xpm",
+  "skinenigmang/icons/menu/osdpip.xpm",
+  "skinenigmang/icons/menu/teletext.xpm",
+  "skinenigmang/icons/menu/xineliboutput.xpm",
+  "skinenigmang/icons/menu/femon.xpm",
+  "skinenigmang/icons/menu/channels.xpm",
+  "skinenigmang/icons/menu/vdrcd.xpm",
+  "skinenigmang/icons/menu/setup.xpm",
+  "skinenigmang/icons/menu/radio.xpm",
+  "skinenigmang/icons/menu/mp3.xpm",
+  "skinenigmang/icons/menu/solitaire.xpm",
+  "skinenigmang/icons/menu/chanorg.xpm",
+  "skinenigmang/icons/menu/sudoku.xpm",
+  "skinenigmang/icons/menu/mplayer.xpm",
+  "skinenigmang/icons/message/info.xpm",
+  "skinenigmang/icons/audio/audioRight.xpm",
+  "skinenigmang/icons/audio/audioLeft.xpm",
+  "skinenigmang/icons/audio/audioStereo.xpm",
+  "skinenigmang/icons/volume/muteOn.xpm",
+  "skinenigmang/icons/volume/muteOff.xpm",
+  "skinenigmang/icons/replay/fastForward5.xpm",
+  "skinenigmang/icons/replay/slowRewind3.xpm",
+  "skinenigmang/icons/replay/fastForward9.xpm",
+  "skinenigmang/icons/replay/slowForward2.xpm",
+  "skinenigmang/icons/replay/slowRewind.xpm",
+  "skinenigmang/icons/replay/fastForward1.xpm",
+  "skinenigmang/icons/replay/fastRewind6.xpm",
+  "skinenigmang/icons/replay/slowForward.xpm",
+  "skinenigmang/icons/replay/fastRewind7.xpm",
+  "skinenigmang/icons/replay/fastForward8.xpm",
+  "skinenigmang/icons/replay/fastForward2.xpm",
+  "skinenigmang/icons/replay/fastForward7.xpm",
+  "skinenigmang/icons/replay/fastForward3.xpm",
+  "skinenigmang/icons/replay/fastForward.xpm",
+  "skinenigmang/icons/replay/fastRewind8.xpm",
+  "skinenigmang/icons/replay/slowForward1.xpm",
+  "skinenigmang/icons/replay/slowForward3.xpm",
+  "skinenigmang/icons/replay/fastRewind9.xpm",
+  "skinenigmang/icons/replay/fastRewind2.xpm",
+  "skinenigmang/icons/replay/play.xpm",
+  "skinenigmang/icons/replay/slowRewind2.xpm",
+  "skinenigmang/icons/replay/fastRewind4.xpm",
+  "skinenigmang/icons/replay/fastRewind.xpm",
+  "skinenigmang/icons/replay/fastForward6.xpm",
+  "skinenigmang/icons/replay/fastRewind1.xpm",
+  "skinenigmang/icons/replay/fastRewind5.xpm",
+  "skinenigmang/icons/replay/pause.xpm",
+  "skinenigmang/icons/replay/fastRewind3.xpm",
+  "skinenigmang/icons/replay/fastForward4.xpm",
+  "skinenigmang/icons/replay/slowRewind1.xpm"
+]
\ No newline at end of file
diff --git a/tests/data/archive/weird_names/weird_names.7z_libarch_linux.expected b/tests/data/archive/weird_names/weird_names.7z_libarch_linux.expected
index 29ab73e..fea4d74 100644
--- a/tests/data/archive/weird_names/weird_names.7z_libarch_linux.expected
+++ b/tests/data/archive/weird_names/weird_names.7z_libarch_linux.expected
@@ -4,11 +4,11 @@
   "/weird_names/man/1/_.1.gz",
   "/weird_names/man/1/_/.1",
   "/weird_names/man/1/__1.gz",
+  "/weird_names/some _file",
+  "/weird_names/some file",
   "/weird_names/some/_file",
   "/weird_names/some/file",
-  "/weird_names/some__file",
   "/weird_names/some_file",
-  "/weird_names/some_file_1",
   "/weird_names/win/AUX_",
   "/weird_names/win/AUX__1.txt",
   "/weird_names/win/COM1_",
diff --git a/tests/data/archive/weird_names/weird_names.7z_libarch_mac.expected b/tests/data/archive/weird_names/weird_names.7z_libarch_mac.expected
index 8bb1b19..fea4d74 100644
--- a/tests/data/archive/weird_names/weird_names.7z_libarch_mac.expected
+++ b/tests/data/archive/weird_names/weird_names.7z_libarch_mac.expected
@@ -1,111 +1,111 @@
 [
-  "/weird_names/man/1/[.1.gz", 
-  "/weird_names/man/1/[/__.1", 
-  "/weird_names/man/1/_.1.gz", 
-  "/weird_names/man/1/_/.1", 
-  "/weird_names/man/1/__1.gz", 
-  "/weird_names/some/_file", 
-  "/weird_names/some/file", 
-  "/weird_names/some__file", 
-  "/weird_names/some_file", 
-  "/weird_names/some_file_1", 
-  "/weird_names/win/AUX_", 
-  "/weird_names/win/AUX__1.txt", 
-  "/weird_names/win/COM1_", 
-  "/weird_names/win/COM1_.txt", 
-  "/weird_names/win/COM2_", 
-  "/weird_names/win/COM2__1.txt", 
-  "/weird_names/win/COM3_", 
-  "/weird_names/win/COM3__1.txt", 
-  "/weird_names/win/COM4_", 
-  "/weird_names/win/COM4_.txt", 
-  "/weird_names/win/COM5_.txt", 
-  "/weird_names/win/COM5__1", 
-  "/weird_names/win/COM6_", 
-  "/weird_names/win/COM6_.txt", 
-  "/weird_names/win/COM7_", 
-  "/weird_names/win/COM7_.txt", 
-  "/weird_names/win/COM8_", 
-  "/weird_names/win/COM8_.txt", 
-  "/weird_names/win/COM9_", 
-  "/weird_names/win/COM9_.txt", 
-  "/weird_names/win/CON__1", 
-  "/weird_names/win/CON__1.txt", 
-  "/weird_names/win/LPT1_", 
-  "/weird_names/win/LPT1__1.txt", 
-  "/weird_names/win/LPT2_", 
-  "/weird_names/win/LPT2__1.txt", 
-  "/weird_names/win/LPT3__1", 
-  "/weird_names/win/LPT3__1.txt", 
-  "/weird_names/win/LPT4__1", 
-  "/weird_names/win/LPT4__1.txt", 
-  "/weird_names/win/LPT5__1", 
-  "/weird_names/win/LPT5__1.txt", 
-  "/weird_names/win/LPT6_.txt", 
-  "/weird_names/win/LPT6__1", 
-  "/weird_names/win/LPT7_", 
-  "/weird_names/win/LPT7_.txt", 
-  "/weird_names/win/LPT8_", 
-  "/weird_names/win/LPT8_.txt", 
-  "/weird_names/win/LPT9_", 
-  "/weird_names/win/LPT9_.txt", 
-  "/weird_names/win/NUL_.txt", 
-  "/weird_names/win/NUL__1", 
-  "/weird_names/win/PRN_.txt", 
-  "/weird_names/win/PRN__1", 
-  "/weird_names/win/aux_.txt", 
-  "/weird_names/win/aux__1", 
-  "/weird_names/win/com1__1", 
-  "/weird_names/win/com1__1.txt", 
-  "/weird_names/win/com2_.txt", 
-  "/weird_names/win/com2__1", 
-  "/weird_names/win/com3_.txt", 
-  "/weird_names/win/com3__1", 
-  "/weird_names/win/com4__1", 
-  "/weird_names/win/com4__1.txt", 
-  "/weird_names/win/com5_", 
-  "/weird_names/win/com5__1.txt", 
-  "/weird_names/win/com6__1", 
-  "/weird_names/win/com6__1.txt", 
-  "/weird_names/win/com7__1", 
-  "/weird_names/win/com7__1.txt", 
-  "/weird_names/win/com8__1", 
-  "/weird_names/win/com8__1.txt", 
-  "/weird_names/win/com9__1", 
-  "/weird_names/win/com9__1.txt", 
-  "/weird_names/win/con_", 
-  "/weird_names/win/con_.txt", 
-  "/weird_names/win/lpt1_.txt", 
-  "/weird_names/win/lpt1__1", 
-  "/weird_names/win/lpt2_.txt", 
-  "/weird_names/win/lpt2__1", 
-  "/weird_names/win/lpt3_", 
-  "/weird_names/win/lpt3_.txt", 
-  "/weird_names/win/lpt4_", 
-  "/weird_names/win/lpt4_.txt", 
-  "/weird_names/win/lpt5_", 
-  "/weird_names/win/lpt5_.txt", 
-  "/weird_names/win/lpt6_", 
-  "/weird_names/win/lpt6__1.txt", 
-  "/weird_names/win/lpt7__1", 
-  "/weird_names/win/lpt7__1.txt", 
-  "/weird_names/win/lpt8__1", 
-  "/weird_names/win/lpt8__1.txt", 
-  "/weird_names/win/lpt9__1", 
-  "/weird_names/win/lpt9__1.txt", 
-  "/weird_names/win/nul_", 
-  "/weird_names/win/nul__1.txt", 
-  "/weird_names/win/prn_", 
-  "/weird_names/win/prn__1.txt", 
-  "/weird_names/winchr/ab/.t", 
-  "/weird_names/winchr/ab_.t", 
-  "/weird_names/winchr/ab_.t_", 
-  "/weird_names/winchr/ab__1.t", 
-  "/weird_names/winchr/ab__1.t_", 
-  "/weird_names/winchr/ab__2.t", 
-  "/weird_names/winchr/ab__2.t_", 
-  "/weird_names/winchr/ab__3.t_", 
-  "/weird_names/winchr/ab__4.t_", 
-  "/weird_names/winchr/ab__5.t_", 
+  "/weird_names/man/1/[.1.gz",
+  "/weird_names/man/1/[/__.1",
+  "/weird_names/man/1/_.1.gz",
+  "/weird_names/man/1/_/.1",
+  "/weird_names/man/1/__1.gz",
+  "/weird_names/some _file",
+  "/weird_names/some file",
+  "/weird_names/some/_file",
+  "/weird_names/some/file",
+  "/weird_names/some_file",
+  "/weird_names/win/AUX_",
+  "/weird_names/win/AUX__1.txt",
+  "/weird_names/win/COM1_",
+  "/weird_names/win/COM1_.txt",
+  "/weird_names/win/COM2_",
+  "/weird_names/win/COM2__1.txt",
+  "/weird_names/win/COM3_",
+  "/weird_names/win/COM3__1.txt",
+  "/weird_names/win/COM4_",
+  "/weird_names/win/COM4_.txt",
+  "/weird_names/win/COM5_.txt",
+  "/weird_names/win/COM5__1",
+  "/weird_names/win/COM6_",
+  "/weird_names/win/COM6_.txt",
+  "/weird_names/win/COM7_",
+  "/weird_names/win/COM7_.txt",
+  "/weird_names/win/COM8_",
+  "/weird_names/win/COM8_.txt",
+  "/weird_names/win/COM9_",
+  "/weird_names/win/COM9_.txt",
+  "/weird_names/win/CON__1",
+  "/weird_names/win/CON__1.txt",
+  "/weird_names/win/LPT1_",
+  "/weird_names/win/LPT1__1.txt",
+  "/weird_names/win/LPT2_",
+  "/weird_names/win/LPT2__1.txt",
+  "/weird_names/win/LPT3__1",
+  "/weird_names/win/LPT3__1.txt",
+  "/weird_names/win/LPT4__1",
+  "/weird_names/win/LPT4__1.txt",
+  "/weird_names/win/LPT5__1",
+  "/weird_names/win/LPT5__1.txt",
+  "/weird_names/win/LPT6_.txt",
+  "/weird_names/win/LPT6__1",
+  "/weird_names/win/LPT7_",
+  "/weird_names/win/LPT7_.txt",
+  "/weird_names/win/LPT8_",
+  "/weird_names/win/LPT8_.txt",
+  "/weird_names/win/LPT9_",
+  "/weird_names/win/LPT9_.txt",
+  "/weird_names/win/NUL_.txt",
+  "/weird_names/win/NUL__1",
+  "/weird_names/win/PRN_.txt",
+  "/weird_names/win/PRN__1",
+  "/weird_names/win/aux_.txt",
+  "/weird_names/win/aux__1",
+  "/weird_names/win/com1__1",
+  "/weird_names/win/com1__1.txt",
+  "/weird_names/win/com2_.txt",
+  "/weird_names/win/com2__1",
+  "/weird_names/win/com3_.txt",
+  "/weird_names/win/com3__1",
+  "/weird_names/win/com4__1",
+  "/weird_names/win/com4__1.txt",
+  "/weird_names/win/com5_",
+  "/weird_names/win/com5__1.txt",
+  "/weird_names/win/com6__1",
+  "/weird_names/win/com6__1.txt",
+  "/weird_names/win/com7__1",
+  "/weird_names/win/com7__1.txt",
+  "/weird_names/win/com8__1",
+  "/weird_names/win/com8__1.txt",
+  "/weird_names/win/com9__1",
+  "/weird_names/win/com9__1.txt",
+  "/weird_names/win/con_",
+  "/weird_names/win/con_.txt",
+  "/weird_names/win/lpt1_.txt",
+  "/weird_names/win/lpt1__1",
+  "/weird_names/win/lpt2_.txt",
+  "/weird_names/win/lpt2__1",
+  "/weird_names/win/lpt3_",
+  "/weird_names/win/lpt3_.txt",
+  "/weird_names/win/lpt4_",
+  "/weird_names/win/lpt4_.txt",
+  "/weird_names/win/lpt5_",
+  "/weird_names/win/lpt5_.txt",
+  "/weird_names/win/lpt6_",
+  "/weird_names/win/lpt6__1.txt",
+  "/weird_names/win/lpt7__1",
+  "/weird_names/win/lpt7__1.txt",
+  "/weird_names/win/lpt8__1",
+  "/weird_names/win/lpt8__1.txt",
+  "/weird_names/win/lpt9__1",
+  "/weird_names/win/lpt9__1.txt",
+  "/weird_names/win/nul_",
+  "/weird_names/win/nul__1.txt",
+  "/weird_names/win/prn_",
+  "/weird_names/win/prn__1.txt",
+  "/weird_names/winchr/ab/.t",
+  "/weird_names/winchr/ab_.t",
+  "/weird_names/winchr/ab_.t_",
+  "/weird_names/winchr/ab__1.t",
+  "/weird_names/winchr/ab__1.t_",
+  "/weird_names/winchr/ab__2.t",
+  "/weird_names/winchr/ab__2.t_",
+  "/weird_names/winchr/ab__3.t_",
+  "/weird_names/winchr/ab__4.t_",
+  "/weird_names/winchr/ab__5.t_",
   "/weird_names/winchr/ab__6.t_"
 ]
\ No newline at end of file
diff --git a/tests/data/archive/weird_names/weird_names.7z_libarch_win.expected b/tests/data/archive/weird_names/weird_names.7z_libarch_win.expected
index 8bb1b19..fea4d74 100644
--- a/tests/data/archive/weird_names/weird_names.7z_libarch_win.expected
+++ b/tests/data/archive/weird_names/weird_names.7z_libarch_win.expected
@@ -1,111 +1,111 @@
 [
-  "/weird_names/man/1/[.1.gz", 
-  "/weird_names/man/1/[/__.1", 
-  "/weird_names/man/1/_.1.gz", 
-  "/weird_names/man/1/_/.1", 
-  "/weird_names/man/1/__1.gz", 
-  "/weird_names/some/_file", 
-  "/weird_names/some/file", 
-  "/weird_names/some__file", 
-  "/weird_names/some_file", 
-  "/weird_names/some_file_1", 
-  "/weird_names/win/AUX_", 
-  "/weird_names/win/AUX__1.txt", 
-  "/weird_names/win/COM1_", 
-  "/weird_names/win/COM1_.txt", 
-  "/weird_names/win/COM2_", 
-  "/weird_names/win/COM2__1.txt", 
-  "/weird_names/win/COM3_", 
-  "/weird_names/win/COM3__1.txt", 
-  "/weird_names/win/COM4_", 
-  "/weird_names/win/COM4_.txt", 
-  "/weird_names/win/COM5_.txt", 
-  "/weird_names/win/COM5__1", 
-  "/weird_names/win/COM6_", 
-  "/weird_names/win/COM6_.txt", 
-  "/weird_names/win/COM7_", 
-  "/weird_names/win/COM7_.txt", 
-  "/weird_names/win/COM8_", 
-  "/weird_names/win/COM8_.txt", 
-  "/weird_names/win/COM9_", 
-  "/weird_names/win/COM9_.txt", 
-  "/weird_names/win/CON__1", 
-  "/weird_names/win/CON__1.txt", 
-  "/weird_names/win/LPT1_", 
-  "/weird_names/win/LPT1__1.txt", 
-  "/weird_names/win/LPT2_", 
-  "/weird_names/win/LPT2__1.txt", 
-  "/weird_names/win/LPT3__1", 
-  "/weird_names/win/LPT3__1.txt", 
-  "/weird_names/win/LPT4__1", 
-  "/weird_names/win/LPT4__1.txt", 
-  "/weird_names/win/LPT5__1", 
-  "/weird_names/win/LPT5__1.txt", 
-  "/weird_names/win/LPT6_.txt", 
-  "/weird_names/win/LPT6__1", 
-  "/weird_names/win/LPT7_", 
-  "/weird_names/win/LPT7_.txt", 
-  "/weird_names/win/LPT8_", 
-  "/weird_names/win/LPT8_.txt", 
-  "/weird_names/win/LPT9_", 
-  "/weird_names/win/LPT9_.txt", 
-  "/weird_names/win/NUL_.txt", 
-  "/weird_names/win/NUL__1", 
-  "/weird_names/win/PRN_.txt", 
-  "/weird_names/win/PRN__1", 
-  "/weird_names/win/aux_.txt", 
-  "/weird_names/win/aux__1", 
-  "/weird_names/win/com1__1", 
-  "/weird_names/win/com1__1.txt", 
-  "/weird_names/win/com2_.txt", 
-  "/weird_names/win/com2__1", 
-  "/weird_names/win/com3_.txt", 
-  "/weird_names/win/com3__1", 
-  "/weird_names/win/com4__1", 
-  "/weird_names/win/com4__1.txt", 
-  "/weird_names/win/com5_", 
-  "/weird_names/win/com5__1.txt", 
-  "/weird_names/win/com6__1", 
-  "/weird_names/win/com6__1.txt", 
-  "/weird_names/win/com7__1", 
-  "/weird_names/win/com7__1.txt", 
-  "/weird_names/win/com8__1", 
-  "/weird_names/win/com8__1.txt", 
-  "/weird_names/win/com9__1", 
-  "/weird_names/win/com9__1.txt", 
-  "/weird_names/win/con_", 
-  "/weird_names/win/con_.txt", 
-  "/weird_names/win/lpt1_.txt", 
-  "/weird_names/win/lpt1__1", 
-  "/weird_names/win/lpt2_.txt", 
-  "/weird_names/win/lpt2__1", 
-  "/weird_names/win/lpt3_", 
-  "/weird_names/win/lpt3_.txt", 
-  "/weird_names/win/lpt4_", 
-  "/weird_names/win/lpt4_.txt", 
-  "/weird_names/win/lpt5_", 
-  "/weird_names/win/lpt5_.txt", 
-  "/weird_names/win/lpt6_", 
-  "/weird_names/win/lpt6__1.txt", 
-  "/weird_names/win/lpt7__1", 
-  "/weird_names/win/lpt7__1.txt", 
-  "/weird_names/win/lpt8__1", 
-  "/weird_names/win/lpt8__1.txt", 
-  "/weird_names/win/lpt9__1", 
-  "/weird_names/win/lpt9__1.txt", 
-  "/weird_names/win/nul_", 
-  "/weird_names/win/nul__1.txt", 
-  "/weird_names/win/prn_", 
-  "/weird_names/win/prn__1.txt", 
-  "/weird_names/winchr/ab/.t", 
-  "/weird_names/winchr/ab_.t", 
-  "/weird_names/winchr/ab_.t_", 
-  "/weird_names/winchr/ab__1.t", 
-  "/weird_names/winchr/ab__1.t_", 
-  "/weird_names/winchr/ab__2.t", 
-  "/weird_names/winchr/ab__2.t_", 
-  "/weird_names/winchr/ab__3.t_", 
-  "/weird_names/winchr/ab__4.t_", 
-  "/weird_names/winchr/ab__5.t_", 
+  "/weird_names/man/1/[.1.gz",
+  "/weird_names/man/1/[/__.1",
+  "/weird_names/man/1/_.1.gz",
+  "/weird_names/man/1/_/.1",
+  "/weird_names/man/1/__1.gz",
+  "/weird_names/some _file",
+  "/weird_names/some file",
+  "/weird_names/some/_file",
+  "/weird_names/some/file",
+  "/weird_names/some_file",
+  "/weird_names/win/AUX_",
+  "/weird_names/win/AUX__1.txt",
+  "/weird_names/win/COM1_",
+  "/weird_names/win/COM1_.txt",
+  "/weird_names/win/COM2_",
+  "/weird_names/win/COM2__1.txt",
+  "/weird_names/win/COM3_",
+  "/weird_names/win/COM3__1.txt",
+  "/weird_names/win/COM4_",
+  "/weird_names/win/COM4_.txt",
+  "/weird_names/win/COM5_.txt",
+  "/weird_names/win/COM5__1",
+  "/weird_names/win/COM6_",
+  "/weird_names/win/COM6_.txt",
+  "/weird_names/win/COM7_",
+  "/weird_names/win/COM7_.txt",
+  "/weird_names/win/COM8_",
+  "/weird_names/win/COM8_.txt",
+  "/weird_names/win/COM9_",
+  "/weird_names/win/COM9_.txt",
+  "/weird_names/win/CON__1",
+  "/weird_names/win/CON__1.txt",
+  "/weird_names/win/LPT1_",
+  "/weird_names/win/LPT1__1.txt",
+  "/weird_names/win/LPT2_",
+  "/weird_names/win/LPT2__1.txt",
+  "/weird_names/win/LPT3__1",
+  "/weird_names/win/LPT3__1.txt",
+  "/weird_names/win/LPT4__1",
+  "/weird_names/win/LPT4__1.txt",
+  "/weird_names/win/LPT5__1",
+  "/weird_names/win/LPT5__1.txt",
+  "/weird_names/win/LPT6_.txt",
+  "/weird_names/win/LPT6__1",
+  "/weird_names/win/LPT7_",
+  "/weird_names/win/LPT7_.txt",
+  "/weird_names/win/LPT8_",
+  "/weird_names/win/LPT8_.txt",
+  "/weird_names/win/LPT9_",
+  "/weird_names/win/LPT9_.txt",
+  "/weird_names/win/NUL_.txt",
+  "/weird_names/win/NUL__1",
+  "/weird_names/win/PRN_.txt",
+  "/weird_names/win/PRN__1",
+  "/weird_names/win/aux_.txt",
+  "/weird_names/win/aux__1",
+  "/weird_names/win/com1__1",
+  "/weird_names/win/com1__1.txt",
+  "/weird_names/win/com2_.txt",
+  "/weird_names/win/com2__1",
+  "/weird_names/win/com3_.txt",
+  "/weird_names/win/com3__1",
+  "/weird_names/win/com4__1",
+  "/weird_names/win/com4__1.txt",
+  "/weird_names/win/com5_",
+  "/weird_names/win/com5__1.txt",
+  "/weird_names/win/com6__1",
+  "/weird_names/win/com6__1.txt",
+  "/weird_names/win/com7__1",
+  "/weird_names/win/com7__1.txt",
+  "/weird_names/win/com8__1",
+  "/weird_names/win/com8__1.txt",
+  "/weird_names/win/com9__1",
+  "/weird_names/win/com9__1.txt",
+  "/weird_names/win/con_",
+  "/weird_names/win/con_.txt",
+  "/weird_names/win/lpt1_.txt",
+  "/weird_names/win/lpt1__1",
+  "/weird_names/win/lpt2_.txt",
+  "/weird_names/win/lpt2__1",
+  "/weird_names/win/lpt3_",
+  "/weird_names/win/lpt3_.txt",
+  "/weird_names/win/lpt4_",
+  "/weird_names/win/lpt4_.txt",
+  "/weird_names/win/lpt5_",
+  "/weird_names/win/lpt5_.txt",
+  "/weird_names/win/lpt6_",
+  "/weird_names/win/lpt6__1.txt",
+  "/weird_names/win/lpt7__1",
+  "/weird_names/win/lpt7__1.txt",
+  "/weird_names/win/lpt8__1",
+  "/weird_names/win/lpt8__1.txt",
+  "/weird_names/win/lpt9__1",
+  "/weird_names/win/lpt9__1.txt",
+  "/weird_names/win/nul_",
+  "/weird_names/win/nul__1.txt",
+  "/weird_names/win/prn_",
+  "/weird_names/win/prn__1.txt",
+  "/weird_names/winchr/ab/.t",
+  "/weird_names/winchr/ab_.t",
+  "/weird_names/winchr/ab_.t_",
+  "/weird_names/winchr/ab__1.t",
+  "/weird_names/winchr/ab__1.t_",
+  "/weird_names/winchr/ab__2.t",
+  "/weird_names/winchr/ab__2.t_",
+  "/weird_names/winchr/ab__3.t_",
+  "/weird_names/winchr/ab__4.t_",
+  "/weird_names/winchr/ab__5.t_",
   "/weird_names/winchr/ab__6.t_"
 ]
\ No newline at end of file
diff --git a/tests/data/archive/weird_names/weird_names.cpio_libarch_linux.expected b/tests/data/archive/weird_names/weird_names.cpio_libarch_linux.expected
index 5131b98..01f2ee6 100644
--- a/tests/data/archive/weird_names/weird_names.cpio_libarch_linux.expected
+++ b/tests/data/archive/weird_names/weird_names.cpio_libarch_linux.expected
@@ -4,11 +4,11 @@
   "/weird_names/man/1/_.1.gz",
   "/weird_names/man/1/_/.1",
   "/weird_names/man/1/__1.gz",
+  "/weird_names/some _file",
+  "/weird_names/some file",
   "/weird_names/some/_file",
   "/weird_names/some/file",
-  "/weird_names/some__file",
   "/weird_names/some_file",
-  "/weird_names/some_file_1",
   "/weird_names/win/AUX_",
   "/weird_names/win/AUX_.txt",
   "/weird_names/win/COM1_",
diff --git a/tests/data/archive/weird_names/weird_names.cpio_libarch_mac.expected b/tests/data/archive/weird_names/weird_names.cpio_libarch_mac.expected
index 686ca68..01f2ee6 100644
--- a/tests/data/archive/weird_names/weird_names.cpio_libarch_mac.expected
+++ b/tests/data/archive/weird_names/weird_names.cpio_libarch_mac.expected
@@ -1,111 +1,111 @@
 [
-  "/weird_names/man/1/[.1.gz", 
-  "/weird_names/man/1/[/__.1", 
-  "/weird_names/man/1/_.1.gz", 
-  "/weird_names/man/1/_/.1", 
-  "/weird_names/man/1/__1.gz", 
-  "/weird_names/some/_file", 
-  "/weird_names/some/file", 
-  "/weird_names/some__file", 
-  "/weird_names/some_file", 
-  "/weird_names/some_file_1", 
-  "/weird_names/win/AUX_", 
-  "/weird_names/win/AUX_.txt", 
-  "/weird_names/win/COM1_", 
-  "/weird_names/win/COM1__1.txt", 
-  "/weird_names/win/COM2_", 
-  "/weird_names/win/COM2__1.txt", 
-  "/weird_names/win/COM3_", 
-  "/weird_names/win/COM3__1.txt", 
-  "/weird_names/win/COM4_", 
-  "/weird_names/win/COM4__1.txt", 
-  "/weird_names/win/COM5_", 
-  "/weird_names/win/COM5__1.txt", 
-  "/weird_names/win/COM6_", 
-  "/weird_names/win/COM6__1.txt", 
-  "/weird_names/win/COM7_", 
-  "/weird_names/win/COM7__1.txt", 
-  "/weird_names/win/COM8_", 
-  "/weird_names/win/COM8__1.txt", 
-  "/weird_names/win/COM9_", 
-  "/weird_names/win/COM9_.txt", 
-  "/weird_names/win/CON_", 
-  "/weird_names/win/CON_.txt", 
-  "/weird_names/win/LPT1_", 
-  "/weird_names/win/LPT1__1.txt", 
-  "/weird_names/win/LPT2_", 
-  "/weird_names/win/LPT2__1.txt", 
-  "/weird_names/win/LPT3_", 
-  "/weird_names/win/LPT3__1.txt", 
-  "/weird_names/win/LPT4_", 
-  "/weird_names/win/LPT4__1.txt", 
-  "/weird_names/win/LPT5_", 
-  "/weird_names/win/LPT5__1.txt", 
-  "/weird_names/win/LPT6_", 
-  "/weird_names/win/LPT6__1.txt", 
-  "/weird_names/win/LPT7_", 
-  "/weird_names/win/LPT7__1.txt", 
-  "/weird_names/win/LPT8_", 
-  "/weird_names/win/LPT8__1.txt", 
-  "/weird_names/win/LPT9_", 
-  "/weird_names/win/LPT9__1.txt", 
-  "/weird_names/win/NUL_", 
-  "/weird_names/win/NUL_.txt", 
-  "/weird_names/win/PRN_", 
-  "/weird_names/win/PRN_.txt", 
-  "/weird_names/win/aux__1", 
-  "/weird_names/win/aux__1.txt", 
-  "/weird_names/win/com1_.txt", 
-  "/weird_names/win/com1__1", 
-  "/weird_names/win/com2_.txt", 
-  "/weird_names/win/com2__1", 
-  "/weird_names/win/com3_.txt", 
-  "/weird_names/win/com3__1", 
-  "/weird_names/win/com4_.txt", 
-  "/weird_names/win/com4__1", 
-  "/weird_names/win/com5_.txt", 
-  "/weird_names/win/com5__1", 
-  "/weird_names/win/com6_.txt", 
-  "/weird_names/win/com6__1", 
-  "/weird_names/win/com7_.txt", 
-  "/weird_names/win/com7__1", 
-  "/weird_names/win/com8_.txt", 
-  "/weird_names/win/com8__1", 
-  "/weird_names/win/com9__1", 
-  "/weird_names/win/com9__1.txt", 
-  "/weird_names/win/con__1", 
-  "/weird_names/win/con__1.txt", 
-  "/weird_names/win/lpt1_.txt", 
-  "/weird_names/win/lpt1__1", 
-  "/weird_names/win/lpt2_.txt", 
-  "/weird_names/win/lpt2__1", 
-  "/weird_names/win/lpt3_.txt", 
-  "/weird_names/win/lpt3__1", 
-  "/weird_names/win/lpt4_.txt", 
-  "/weird_names/win/lpt4__1", 
-  "/weird_names/win/lpt5_.txt", 
-  "/weird_names/win/lpt5__1", 
-  "/weird_names/win/lpt6_.txt", 
-  "/weird_names/win/lpt6__1", 
-  "/weird_names/win/lpt7_.txt", 
-  "/weird_names/win/lpt7__1", 
-  "/weird_names/win/lpt8_.txt", 
-  "/weird_names/win/lpt8__1", 
-  "/weird_names/win/lpt9_.txt", 
-  "/weird_names/win/lpt9__1", 
-  "/weird_names/win/nul__1", 
-  "/weird_names/win/nul__1.txt", 
-  "/weird_names/win/prn__1", 
-  "/weird_names/win/prn__1.txt", 
-  "/weird_names/winchr/ab/.t", 
-  "/weird_names/winchr/ab_.t", 
-  "/weird_names/winchr/ab_.t_", 
-  "/weird_names/winchr/ab__1.t", 
-  "/weird_names/winchr/ab__1.t_", 
-  "/weird_names/winchr/ab__2.t", 
-  "/weird_names/winchr/ab__2.t_", 
-  "/weird_names/winchr/ab__3.t_", 
-  "/weird_names/winchr/ab__4.t_", 
-  "/weird_names/winchr/ab__5.t_", 
+  "/weird_names/man/1/[.1.gz",
+  "/weird_names/man/1/[/__.1",
+  "/weird_names/man/1/_.1.gz",
+  "/weird_names/man/1/_/.1",
+  "/weird_names/man/1/__1.gz",
+  "/weird_names/some _file",
+  "/weird_names/some file",
+  "/weird_names/some/_file",
+  "/weird_names/some/file",
+  "/weird_names/some_file",
+  "/weird_names/win/AUX_",
+  "/weird_names/win/AUX_.txt",
+  "/weird_names/win/COM1_",
+  "/weird_names/win/COM1__1.txt",
+  "/weird_names/win/COM2_",
+  "/weird_names/win/COM2__1.txt",
+  "/weird_names/win/COM3_",
+  "/weird_names/win/COM3__1.txt",
+  "/weird_names/win/COM4_",
+  "/weird_names/win/COM4__1.txt",
+  "/weird_names/win/COM5_",
+  "/weird_names/win/COM5__1.txt",
+  "/weird_names/win/COM6_",
+  "/weird_names/win/COM6__1.txt",
+  "/weird_names/win/COM7_",
+  "/weird_names/win/COM7__1.txt",
+  "/weird_names/win/COM8_",
+  "/weird_names/win/COM8__1.txt",
+  "/weird_names/win/COM9_",
+  "/weird_names/win/COM9_.txt",
+  "/weird_names/win/CON_",
+  "/weird_names/win/CON_.txt",
+  "/weird_names/win/LPT1_",
+  "/weird_names/win/LPT1__1.txt",
+  "/weird_names/win/LPT2_",
+  "/weird_names/win/LPT2__1.txt",
+  "/weird_names/win/LPT3_",
+  "/weird_names/win/LPT3__1.txt",
+  "/weird_names/win/LPT4_",
+  "/weird_names/win/LPT4__1.txt",
+  "/weird_names/win/LPT5_",
+  "/weird_names/win/LPT5__1.txt",
+  "/weird_names/win/LPT6_",
+  "/weird_names/win/LPT6__1.txt",
+  "/weird_names/win/LPT7_",
+  "/weird_names/win/LPT7__1.txt",
+  "/weird_names/win/LPT8_",
+  "/weird_names/win/LPT8__1.txt",
+  "/weird_names/win/LPT9_",
+  "/weird_names/win/LPT9__1.txt",
+  "/weird_names/win/NUL_",
+  "/weird_names/win/NUL_.txt",
+  "/weird_names/win/PRN_",
+  "/weird_names/win/PRN_.txt",
+  "/weird_names/win/aux__1",
+  "/weird_names/win/aux__1.txt",
+  "/weird_names/win/com1_.txt",
+  "/weird_names/win/com1__1",
+  "/weird_names/win/com2_.txt",
+  "/weird_names/win/com2__1",
+  "/weird_names/win/com3_.txt",
+  "/weird_names/win/com3__1",
+  "/weird_names/win/com4_.txt",
+  "/weird_names/win/com4__1",
+  "/weird_names/win/com5_.txt",
+  "/weird_names/win/com5__1",
+  "/weird_names/win/com6_.txt",
+  "/weird_names/win/com6__1",
+  "/weird_names/win/com7_.txt",
+  "/weird_names/win/com7__1",
+  "/weird_names/win/com8_.txt",
+  "/weird_names/win/com8__1",
+  "/weird_names/win/com9__1",
+  "/weird_names/win/com9__1.txt",
+  "/weird_names/win/con__1",
+  "/weird_names/win/con__1.txt",
+  "/weird_names/win/lpt1_.txt",
+  "/weird_names/win/lpt1__1",
+  "/weird_names/win/lpt2_.txt",
+  "/weird_names/win/lpt2__1",
+  "/weird_names/win/lpt3_.txt",
+  "/weird_names/win/lpt3__1",
+  "/weird_names/win/lpt4_.txt",
+  "/weird_names/win/lpt4__1",
+  "/weird_names/win/lpt5_.txt",
+  "/weird_names/win/lpt5__1",
+  "/weird_names/win/lpt6_.txt",
+  "/weird_names/win/lpt6__1",
+  "/weird_names/win/lpt7_.txt",
+  "/weird_names/win/lpt7__1",
+  "/weird_names/win/lpt8_.txt",
+  "/weird_names/win/lpt8__1",
+  "/weird_names/win/lpt9_.txt",
+  "/weird_names/win/lpt9__1",
+  "/weird_names/win/nul__1",
+  "/weird_names/win/nul__1.txt",
+  "/weird_names/win/prn__1",
+  "/weird_names/win/prn__1.txt",
+  "/weird_names/winchr/ab/.t",
+  "/weird_names/winchr/ab_.t",
+  "/weird_names/winchr/ab_.t_",
+  "/weird_names/winchr/ab__1.t",
+  "/weird_names/winchr/ab__1.t_",
+  "/weird_names/winchr/ab__2.t",
+  "/weird_names/winchr/ab__2.t_",
+  "/weird_names/winchr/ab__3.t_",
+  "/weird_names/winchr/ab__4.t_",
+  "/weird_names/winchr/ab__5.t_",
   "/weird_names/winchr/ab__6.t_"
 ]
\ No newline at end of file
diff --git a/tests/data/archive/weird_names/weird_names.cpio_libarch_win.expected b/tests/data/archive/weird_names/weird_names.cpio_libarch_win.expected
index 686ca68..cd13a67 100644
--- a/tests/data/archive/weird_names/weird_names.cpio_libarch_win.expected
+++ b/tests/data/archive/weird_names/weird_names.cpio_libarch_win.expected
@@ -1,111 +1,111 @@
 [
-  "/weird_names/man/1/[.1.gz", 
-  "/weird_names/man/1/[/__.1", 
-  "/weird_names/man/1/_.1.gz", 
-  "/weird_names/man/1/_/.1", 
-  "/weird_names/man/1/__1.gz", 
-  "/weird_names/some/_file", 
-  "/weird_names/some/file", 
-  "/weird_names/some__file", 
-  "/weird_names/some_file", 
-  "/weird_names/some_file_1", 
-  "/weird_names/win/AUX_", 
-  "/weird_names/win/AUX_.txt", 
-  "/weird_names/win/COM1_", 
-  "/weird_names/win/COM1__1.txt", 
-  "/weird_names/win/COM2_", 
-  "/weird_names/win/COM2__1.txt", 
-  "/weird_names/win/COM3_", 
-  "/weird_names/win/COM3__1.txt", 
-  "/weird_names/win/COM4_", 
-  "/weird_names/win/COM4__1.txt", 
-  "/weird_names/win/COM5_", 
-  "/weird_names/win/COM5__1.txt", 
-  "/weird_names/win/COM6_", 
-  "/weird_names/win/COM6__1.txt", 
-  "/weird_names/win/COM7_", 
-  "/weird_names/win/COM7__1.txt", 
-  "/weird_names/win/COM8_", 
-  "/weird_names/win/COM8__1.txt", 
-  "/weird_names/win/COM9_", 
-  "/weird_names/win/COM9_.txt", 
-  "/weird_names/win/CON_", 
-  "/weird_names/win/CON_.txt", 
-  "/weird_names/win/LPT1_", 
-  "/weird_names/win/LPT1__1.txt", 
-  "/weird_names/win/LPT2_", 
-  "/weird_names/win/LPT2__1.txt", 
-  "/weird_names/win/LPT3_", 
-  "/weird_names/win/LPT3__1.txt", 
-  "/weird_names/win/LPT4_", 
-  "/weird_names/win/LPT4__1.txt", 
-  "/weird_names/win/LPT5_", 
-  "/weird_names/win/LPT5__1.txt", 
-  "/weird_names/win/LPT6_", 
-  "/weird_names/win/LPT6__1.txt", 
-  "/weird_names/win/LPT7_", 
-  "/weird_names/win/LPT7__1.txt", 
-  "/weird_names/win/LPT8_", 
-  "/weird_names/win/LPT8__1.txt", 
-  "/weird_names/win/LPT9_", 
-  "/weird_names/win/LPT9__1.txt", 
-  "/weird_names/win/NUL_", 
-  "/weird_names/win/NUL_.txt", 
-  "/weird_names/win/PRN_", 
-  "/weird_names/win/PRN_.txt", 
-  "/weird_names/win/aux__1", 
-  "/weird_names/win/aux__1.txt", 
-  "/weird_names/win/com1_.txt", 
-  "/weird_names/win/com1__1", 
-  "/weird_names/win/com2_.txt", 
-  "/weird_names/win/com2__1", 
-  "/weird_names/win/com3_.txt", 
-  "/weird_names/win/com3__1", 
-  "/weird_names/win/com4_.txt", 
-  "/weird_names/win/com4__1", 
-  "/weird_names/win/com5_.txt", 
-  "/weird_names/win/com5__1", 
-  "/weird_names/win/com6_.txt", 
-  "/weird_names/win/com6__1", 
-  "/weird_names/win/com7_.txt", 
-  "/weird_names/win/com7__1", 
-  "/weird_names/win/com8_.txt", 
-  "/weird_names/win/com8__1", 
-  "/weird_names/win/com9__1", 
-  "/weird_names/win/com9__1.txt", 
-  "/weird_names/win/con__1", 
-  "/weird_names/win/con__1.txt", 
-  "/weird_names/win/lpt1_.txt", 
-  "/weird_names/win/lpt1__1", 
-  "/weird_names/win/lpt2_.txt", 
-  "/weird_names/win/lpt2__1", 
-  "/weird_names/win/lpt3_.txt", 
-  "/weird_names/win/lpt3__1", 
-  "/weird_names/win/lpt4_.txt", 
-  "/weird_names/win/lpt4__1", 
-  "/weird_names/win/lpt5_.txt", 
-  "/weird_names/win/lpt5__1", 
-  "/weird_names/win/lpt6_.txt", 
-  "/weird_names/win/lpt6__1", 
-  "/weird_names/win/lpt7_.txt", 
-  "/weird_names/win/lpt7__1", 
-  "/weird_names/win/lpt8_.txt", 
-  "/weird_names/win/lpt8__1", 
-  "/weird_names/win/lpt9_.txt", 
-  "/weird_names/win/lpt9__1", 
-  "/weird_names/win/nul__1", 
-  "/weird_names/win/nul__1.txt", 
-  "/weird_names/win/prn__1", 
-  "/weird_names/win/prn__1.txt", 
-  "/weird_names/winchr/ab/.t", 
-  "/weird_names/winchr/ab_.t", 
-  "/weird_names/winchr/ab_.t_", 
-  "/weird_names/winchr/ab__1.t", 
-  "/weird_names/winchr/ab__1.t_", 
-  "/weird_names/winchr/ab__2.t", 
-  "/weird_names/winchr/ab__2.t_", 
-  "/weird_names/winchr/ab__3.t_", 
-  "/weird_names/winchr/ab__4.t_", 
-  "/weird_names/winchr/ab__5.t_", 
+  "/weird_names/man/1/[.1.gz",
+  "/weird_names/man/1/[/__.1",
+  "/weird_names/man/1/_.1.gz",
+  "/weird_names/man/1/_/.1",
+  "/weird_names/man/1/__1.gz",
+  "/weird_names/some/_file",
+  "/weird_names/some/file",
+  "/weird_names/some _file",
+  "/weird_names/some file",
+  "/weird_names/some_file",
+  "/weird_names/win/AUX_",
+  "/weird_names/win/AUX_.txt",
+  "/weird_names/win/COM1_",
+  "/weird_names/win/COM1__1.txt",
+  "/weird_names/win/COM2_",
+  "/weird_names/win/COM2__1.txt",
+  "/weird_names/win/COM3_",
+  "/weird_names/win/COM3__1.txt",
+  "/weird_names/win/COM4_",
+  "/weird_names/win/COM4__1.txt",
+  "/weird_names/win/COM5_",
+  "/weird_names/win/COM5__1.txt",
+  "/weird_names/win/COM6_",
+  "/weird_names/win/COM6__1.txt",
+  "/weird_names/win/COM7_",
+  "/weird_names/win/COM7__1.txt",
+  "/weird_names/win/COM8_",
+  "/weird_names/win/COM8__1.txt",
+  "/weird_names/win/COM9_",
+  "/weird_names/win/COM9_.txt",
+  "/weird_names/win/CON_",
+  "/weird_names/win/CON_.txt",
+  "/weird_names/win/LPT1_",
+  "/weird_names/win/LPT1__1.txt",
+  "/weird_names/win/LPT2_",
+  "/weird_names/win/LPT2__1.txt",
+  "/weird_names/win/LPT3_",
+  "/weird_names/win/LPT3__1.txt",
+  "/weird_names/win/LPT4_",
+  "/weird_names/win/LPT4__1.txt",
+  "/weird_names/win/LPT5_",
+  "/weird_names/win/LPT5__1.txt",
+  "/weird_names/win/LPT6_",
+  "/weird_names/win/LPT6__1.txt",
+  "/weird_names/win/LPT7_",
+  "/weird_names/win/LPT7__1.txt",
+  "/weird_names/win/LPT8_",
+  "/weird_names/win/LPT8__1.txt",
+  "/weird_names/win/LPT9_",
+  "/weird_names/win/LPT9__1.txt",
+  "/weird_names/win/NUL_",
+  "/weird_names/win/NUL_.txt",
+  "/weird_names/win/PRN_",
+  "/weird_names/win/PRN_.txt",
+  "/weird_names/win/aux__1",
+  "/weird_names/win/aux__1.txt",
+  "/weird_names/win/com1_.txt",
+  "/weird_names/win/com1__1",
+  "/weird_names/win/com2_.txt",
+  "/weird_names/win/com2__1",
+  "/weird_names/win/com3_.txt",
+  "/weird_names/win/com3__1",
+  "/weird_names/win/com4_.txt",
+  "/weird_names/win/com4__1",
+  "/weird_names/win/com5_.txt",
+  "/weird_names/win/com5__1",
+  "/weird_names/win/com6_.txt",
+  "/weird_names/win/com6__1",
+  "/weird_names/win/com7_.txt",
+  "/weird_names/win/com7__1",
+  "/weird_names/win/com8_.txt",
+  "/weird_names/win/com8__1",
+  "/weird_names/win/com9__1",
+  "/weird_names/win/com9__1.txt",
+  "/weird_names/win/con__1",
+  "/weird_names/win/con__1.txt",
+  "/weird_names/win/lpt1_.txt",
+  "/weird_names/win/lpt1__1",
+  "/weird_names/win/lpt2_.txt",
+  "/weird_names/win/lpt2__1",
+  "/weird_names/win/lpt3_.txt",
+  "/weird_names/win/lpt3__1",
+  "/weird_names/win/lpt4_.txt",
+  "/weird_names/win/lpt4__1",
+  "/weird_names/win/lpt5_.txt",
+  "/weird_names/win/lpt5__1",
+  "/weird_names/win/lpt6_.txt",
+  "/weird_names/win/lpt6__1",
+  "/weird_names/win/lpt7_.txt",
+  "/weird_names/win/lpt7__1",
+  "/weird_names/win/lpt8_.txt",
+  "/weird_names/win/lpt8__1",
+  "/weird_names/win/lpt9_.txt",
+  "/weird_names/win/lpt9__1",
+  "/weird_names/win/nul__1",
+  "/weird_names/win/nul__1.txt",
+  "/weird_names/win/prn__1",
+  "/weird_names/win/prn__1.txt",
+  "/weird_names/winchr/ab/.t",
+  "/weird_names/winchr/ab_.t",
+  "/weird_names/winchr/ab_.t_",
+  "/weird_names/winchr/ab__1.t",
+  "/weird_names/winchr/ab__1.t_",
+  "/weird_names/winchr/ab__2.t",
+  "/weird_names/winchr/ab__2.t_",
+  "/weird_names/winchr/ab__3.t_",
+  "/weird_names/winchr/ab__4.t_",
+  "/weird_names/winchr/ab__5.t_",
   "/weird_names/winchr/ab__6.t_"
 ]
\ No newline at end of file
diff --git a/tests/data/archive/weird_names/weird_names.tar_libarch_linux.expected b/tests/data/archive/weird_names/weird_names.tar_libarch_linux.expected
index 5131b98..01f2ee6 100644
--- a/tests/data/archive/weird_names/weird_names.tar_libarch_linux.expected
+++ b/tests/data/archive/weird_names/weird_names.tar_libarch_linux.expected
@@ -4,11 +4,11 @@
   "/weird_names/man/1/_.1.gz",
   "/weird_names/man/1/_/.1",
   "/weird_names/man/1/__1.gz",
+  "/weird_names/some _file",
+  "/weird_names/some file",
   "/weird_names/some/_file",
   "/weird_names/some/file",
-  "/weird_names/some__file",
   "/weird_names/some_file",
-  "/weird_names/some_file_1",
   "/weird_names/win/AUX_",
   "/weird_names/win/AUX_.txt",
   "/weird_names/win/COM1_",
diff --git a/tests/data/archive/weird_names/weird_names.tar_libarch_mac.expected b/tests/data/archive/weird_names/weird_names.tar_libarch_mac.expected
index 686ca68..01f2ee6 100644
--- a/tests/data/archive/weird_names/weird_names.tar_libarch_mac.expected
+++ b/tests/data/archive/weird_names/weird_names.tar_libarch_mac.expected
@@ -1,111 +1,111 @@
 [
-  "/weird_names/man/1/[.1.gz", 
-  "/weird_names/man/1/[/__.1", 
-  "/weird_names/man/1/_.1.gz", 
-  "/weird_names/man/1/_/.1", 
-  "/weird_names/man/1/__1.gz", 
-  "/weird_names/some/_file", 
-  "/weird_names/some/file", 
-  "/weird_names/some__file", 
-  "/weird_names/some_file", 
-  "/weird_names/some_file_1", 
-  "/weird_names/win/AUX_", 
-  "/weird_names/win/AUX_.txt", 
-  "/weird_names/win/COM1_", 
-  "/weird_names/win/COM1__1.txt", 
-  "/weird_names/win/COM2_", 
-  "/weird_names/win/COM2__1.txt", 
-  "/weird_names/win/COM3_", 
-  "/weird_names/win/COM3__1.txt", 
-  "/weird_names/win/COM4_", 
-  "/weird_names/win/COM4__1.txt", 
-  "/weird_names/win/COM5_", 
-  "/weird_names/win/COM5__1.txt", 
-  "/weird_names/win/COM6_", 
-  "/weird_names/win/COM6__1.txt", 
-  "/weird_names/win/COM7_", 
-  "/weird_names/win/COM7__1.txt", 
-  "/weird_names/win/COM8_", 
-  "/weird_names/win/COM8__1.txt", 
-  "/weird_names/win/COM9_", 
-  "/weird_names/win/COM9_.txt", 
-  "/weird_names/win/CON_", 
-  "/weird_names/win/CON_.txt", 
-  "/weird_names/win/LPT1_", 
-  "/weird_names/win/LPT1__1.txt", 
-  "/weird_names/win/LPT2_", 
-  "/weird_names/win/LPT2__1.txt", 
-  "/weird_names/win/LPT3_", 
-  "/weird_names/win/LPT3__1.txt", 
-  "/weird_names/win/LPT4_", 
-  "/weird_names/win/LPT4__1.txt", 
-  "/weird_names/win/LPT5_", 
-  "/weird_names/win/LPT5__1.txt", 
-  "/weird_names/win/LPT6_", 
-  "/weird_names/win/LPT6__1.txt", 
-  "/weird_names/win/LPT7_", 
-  "/weird_names/win/LPT7__1.txt", 
-  "/weird_names/win/LPT8_", 
-  "/weird_names/win/LPT8__1.txt", 
-  "/weird_names/win/LPT9_", 
-  "/weird_names/win/LPT9__1.txt", 
-  "/weird_names/win/NUL_", 
-  "/weird_names/win/NUL_.txt", 
-  "/weird_names/win/PRN_", 
-  "/weird_names/win/PRN_.txt", 
-  "/weird_names/win/aux__1", 
-  "/weird_names/win/aux__1.txt", 
-  "/weird_names/win/com1_.txt", 
-  "/weird_names/win/com1__1", 
-  "/weird_names/win/com2_.txt", 
-  "/weird_names/win/com2__1", 
-  "/weird_names/win/com3_.txt", 
-  "/weird_names/win/com3__1", 
-  "/weird_names/win/com4_.txt", 
-  "/weird_names/win/com4__1", 
-  "/weird_names/win/com5_.txt", 
-  "/weird_names/win/com5__1", 
-  "/weird_names/win/com6_.txt", 
-  "/weird_names/win/com6__1", 
-  "/weird_names/win/com7_.txt", 
-  "/weird_names/win/com7__1", 
-  "/weird_names/win/com8_.txt", 
-  "/weird_names/win/com8__1", 
-  "/weird_names/win/com9__1", 
-  "/weird_names/win/com9__1.txt", 
-  "/weird_names/win/con__1", 
-  "/weird_names/win/con__1.txt", 
-  "/weird_names/win/lpt1_.txt", 
-  "/weird_names/win/lpt1__1", 
-  "/weird_names/win/lpt2_.txt", 
-  "/weird_names/win/lpt2__1", 
-  "/weird_names/win/lpt3_.txt", 
-  "/weird_names/win/lpt3__1", 
-  "/weird_names/win/lpt4_.txt", 
-  "/weird_names/win/lpt4__1", 
-  "/weird_names/win/lpt5_.txt", 
-  "/weird_names/win/lpt5__1", 
-  "/weird_names/win/lpt6_.txt", 
-  "/weird_names/win/lpt6__1", 
-  "/weird_names/win/lpt7_.txt", 
-  "/weird_names/win/lpt7__1", 
-  "/weird_names/win/lpt8_.txt", 
-  "/weird_names/win/lpt8__1", 
-  "/weird_names/win/lpt9_.txt", 
-  "/weird_names/win/lpt9__1", 
-  "/weird_names/win/nul__1", 
-  "/weird_names/win/nul__1.txt", 
-  "/weird_names/win/prn__1", 
-  "/weird_names/win/prn__1.txt", 
-  "/weird_names/winchr/ab/.t", 
-  "/weird_names/winchr/ab_.t", 
-  "/weird_names/winchr/ab_.t_", 
-  "/weird_names/winchr/ab__1.t", 
-  "/weird_names/winchr/ab__1.t_", 
-  "/weird_names/winchr/ab__2.t", 
-  "/weird_names/winchr/ab__2.t_", 
-  "/weird_names/winchr/ab__3.t_", 
-  "/weird_names/winchr/ab__4.t_", 
-  "/weird_names/winchr/ab__5.t_", 
+  "/weird_names/man/1/[.1.gz",
+  "/weird_names/man/1/[/__.1",
+  "/weird_names/man/1/_.1.gz",
+  "/weird_names/man/1/_/.1",
+  "/weird_names/man/1/__1.gz",
+  "/weird_names/some _file",
+  "/weird_names/some file",
+  "/weird_names/some/_file",
+  "/weird_names/some/file",
+  "/weird_names/some_file",
+  "/weird_names/win/AUX_",
+  "/weird_names/win/AUX_.txt",
+  "/weird_names/win/COM1_",
+  "/weird_names/win/COM1__1.txt",
+  "/weird_names/win/COM2_",
+  "/weird_names/win/COM2__1.txt",
+  "/weird_names/win/COM3_",
+  "/weird_names/win/COM3__1.txt",
+  "/weird_names/win/COM4_",
+  "/weird_names/win/COM4__1.txt",
+  "/weird_names/win/COM5_",
+  "/weird_names/win/COM5__1.txt",
+  "/weird_names/win/COM6_",
+  "/weird_names/win/COM6__1.txt",
+  "/weird_names/win/COM7_",
+  "/weird_names/win/COM7__1.txt",
+  "/weird_names/win/COM8_",
+  "/weird_names/win/COM8__1.txt",
+  "/weird_names/win/COM9_",
+  "/weird_names/win/COM9_.txt",
+  "/weird_names/win/CON_",
+  "/weird_names/win/CON_.txt",
+  "/weird_names/win/LPT1_",
+  "/weird_names/win/LPT1__1.txt",
+  "/weird_names/win/LPT2_",
+  "/weird_names/win/LPT2__1.txt",
+  "/weird_names/win/LPT3_",
+  "/weird_names/win/LPT3__1.txt",
+  "/weird_names/win/LPT4_",
+  "/weird_names/win/LPT4__1.txt",
+  "/weird_names/win/LPT5_",
+  "/weird_names/win/LPT5__1.txt",
+  "/weird_names/win/LPT6_",
+  "/weird_names/win/LPT6__1.txt",
+  "/weird_names/win/LPT7_",
+  "/weird_names/win/LPT7__1.txt",
+  "/weird_names/win/LPT8_",
+  "/weird_names/win/LPT8__1.txt",
+  "/weird_names/win/LPT9_",
+  "/weird_names/win/LPT9__1.txt",
+  "/weird_names/win/NUL_",
+  "/weird_names/win/NUL_.txt",
+  "/weird_names/win/PRN_",
+  "/weird_names/win/PRN_.txt",
+  "/weird_names/win/aux__1",
+  "/weird_names/win/aux__1.txt",
+  "/weird_names/win/com1_.txt",
+  "/weird_names/win/com1__1",
+  "/weird_names/win/com2_.txt",
+  "/weird_names/win/com2__1",
+  "/weird_names/win/com3_.txt",
+  "/weird_names/win/com3__1",
+  "/weird_names/win/com4_.txt",
+  "/weird_names/win/com4__1",
+  "/weird_names/win/com5_.txt",
+  "/weird_names/win/com5__1",
+  "/weird_names/win/com6_.txt",
+  "/weird_names/win/com6__1",
+  "/weird_names/win/com7_.txt",
+  "/weird_names/win/com7__1",
+  "/weird_names/win/com8_.txt",
+  "/weird_names/win/com8__1",
+  "/weird_names/win/com9__1",
+  "/weird_names/win/com9__1.txt",
+  "/weird_names/win/con__1",
+  "/weird_names/win/con__1.txt",
+  "/weird_names/win/lpt1_.txt",
+  "/weird_names/win/lpt1__1",
+  "/weird_names/win/lpt2_.txt",
+  "/weird_names/win/lpt2__1",
+  "/weird_names/win/lpt3_.txt",
+  "/weird_names/win/lpt3__1",
+  "/weird_names/win/lpt4_.txt",
+  "/weird_names/win/lpt4__1",
+  "/weird_names/win/lpt5_.txt",
+  "/weird_names/win/lpt5__1",
+  "/weird_names/win/lpt6_.txt",
+  "/weird_names/win/lpt6__1",
+  "/weird_names/win/lpt7_.txt",
+  "/weird_names/win/lpt7__1",
+  "/weird_names/win/lpt8_.txt",
+  "/weird_names/win/lpt8__1",
+  "/weird_names/win/lpt9_.txt",
+  "/weird_names/win/lpt9__1",
+  "/weird_names/win/nul__1",
+  "/weird_names/win/nul__1.txt",
+  "/weird_names/win/prn__1",
+  "/weird_names/win/prn__1.txt",
+  "/weird_names/winchr/ab/.t",
+  "/weird_names/winchr/ab_.t",
+  "/weird_names/winchr/ab_.t_",
+  "/weird_names/winchr/ab__1.t",
+  "/weird_names/winchr/ab__1.t_",
+  "/weird_names/winchr/ab__2.t",
+  "/weird_names/winchr/ab__2.t_",
+  "/weird_names/winchr/ab__3.t_",
+  "/weird_names/winchr/ab__4.t_",
+  "/weird_names/winchr/ab__5.t_",
   "/weird_names/winchr/ab__6.t_"
 ]
\ No newline at end of file
diff --git a/tests/data/archive/weird_names/weird_names.tar_libarch_win.expected b/tests/data/archive/weird_names/weird_names.tar_libarch_win.expected
index 686ca68..cd13a67 100644
--- a/tests/data/archive/weird_names/weird_names.tar_libarch_win.expected
+++ b/tests/data/archive/weird_names/weird_names.tar_libarch_win.expected
@@ -1,111 +1,111 @@
 [
-  "/weird_names/man/1/[.1.gz", 
-  "/weird_names/man/1/[/__.1", 
-  "/weird_names/man/1/_.1.gz", 
-  "/weird_names/man/1/_/.1", 
-  "/weird_names/man/1/__1.gz", 
-  "/weird_names/some/_file", 
-  "/weird_names/some/file", 
-  "/weird_names/some__file", 
-  "/weird_names/some_file", 
-  "/weird_names/some_file_1", 
-  "/weird_names/win/AUX_", 
-  "/weird_names/win/AUX_.txt", 
-  "/weird_names/win/COM1_", 
-  "/weird_names/win/COM1__1.txt", 
-  "/weird_names/win/COM2_", 
-  "/weird_names/win/COM2__1.txt", 
-  "/weird_names/win/COM3_", 
-  "/weird_names/win/COM3__1.txt", 
-  "/weird_names/win/COM4_", 
-  "/weird_names/win/COM4__1.txt", 
-  "/weird_names/win/COM5_", 
-  "/weird_names/win/COM5__1.txt", 
-  "/weird_names/win/COM6_", 
-  "/weird_names/win/COM6__1.txt", 
-  "/weird_names/win/COM7_", 
-  "/weird_names/win/COM7__1.txt", 
-  "/weird_names/win/COM8_", 
-  "/weird_names/win/COM8__1.txt", 
-  "/weird_names/win/COM9_", 
-  "/weird_names/win/COM9_.txt", 
-  "/weird_names/win/CON_", 
-  "/weird_names/win/CON_.txt", 
-  "/weird_names/win/LPT1_", 
-  "/weird_names/win/LPT1__1.txt", 
-  "/weird_names/win/LPT2_", 
-  "/weird_names/win/LPT2__1.txt", 
-  "/weird_names/win/LPT3_", 
-  "/weird_names/win/LPT3__1.txt", 
-  "/weird_names/win/LPT4_", 
-  "/weird_names/win/LPT4__1.txt", 
-  "/weird_names/win/LPT5_", 
-  "/weird_names/win/LPT5__1.txt", 
-  "/weird_names/win/LPT6_", 
-  "/weird_names/win/LPT6__1.txt", 
-  "/weird_names/win/LPT7_", 
-  "/weird_names/win/LPT7__1.txt", 
-  "/weird_names/win/LPT8_", 
-  "/weird_names/win/LPT8__1.txt", 
-  "/weird_names/win/LPT9_", 
-  "/weird_names/win/LPT9__1.txt", 
-  "/weird_names/win/NUL_", 
-  "/weird_names/win/NUL_.txt", 
-  "/weird_names/win/PRN_", 
-  "/weird_names/win/PRN_.txt", 
-  "/weird_names/win/aux__1", 
-  "/weird_names/win/aux__1.txt", 
-  "/weird_names/win/com1_.txt", 
-  "/weird_names/win/com1__1", 
-  "/weird_names/win/com2_.txt", 
-  "/weird_names/win/com2__1", 
-  "/weird_names/win/com3_.txt", 
-  "/weird_names/win/com3__1", 
-  "/weird_names/win/com4_.txt", 
-  "/weird_names/win/com4__1", 
-  "/weird_names/win/com5_.txt", 
-  "/weird_names/win/com5__1", 
-  "/weird_names/win/com6_.txt", 
-  "/weird_names/win/com6__1", 
-  "/weird_names/win/com7_.txt", 
-  "/weird_names/win/com7__1", 
-  "/weird_names/win/com8_.txt", 
-  "/weird_names/win/com8__1", 
-  "/weird_names/win/com9__1", 
-  "/weird_names/win/com9__1.txt", 
-  "/weird_names/win/con__1", 
-  "/weird_names/win/con__1.txt", 
-  "/weird_names/win/lpt1_.txt", 
-  "/weird_names/win/lpt1__1", 
-  "/weird_names/win/lpt2_.txt", 
-  "/weird_names/win/lpt2__1", 
-  "/weird_names/win/lpt3_.txt", 
-  "/weird_names/win/lpt3__1", 
-  "/weird_names/win/lpt4_.txt", 
-  "/weird_names/win/lpt4__1", 
-  "/weird_names/win/lpt5_.txt", 
-  "/weird_names/win/lpt5__1", 
-  "/weird_names/win/lpt6_.txt", 
-  "/weird_names/win/lpt6__1", 
-  "/weird_names/win/lpt7_.txt", 
-  "/weird_names/win/lpt7__1", 
-  "/weird_names/win/lpt8_.txt", 
-  "/weird_names/win/lpt8__1", 
-  "/weird_names/win/lpt9_.txt", 
-  "/weird_names/win/lpt9__1", 
-  "/weird_names/win/nul__1", 
-  "/weird_names/win/nul__1.txt", 
-  "/weird_names/win/prn__1", 
-  "/weird_names/win/prn__1.txt", 
-  "/weird_names/winchr/ab/.t", 
-  "/weird_names/winchr/ab_.t", 
-  "/weird_names/winchr/ab_.t_", 
-  "/weird_names/winchr/ab__1.t", 
-  "/weird_names/winchr/ab__1.t_", 
-  "/weird_names/winchr/ab__2.t", 
-  "/weird_names/winchr/ab__2.t_", 
-  "/weird_names/winchr/ab__3.t_", 
-  "/weird_names/winchr/ab__4.t_", 
-  "/weird_names/winchr/ab__5.t_", 
+  "/weird_names/man/1/[.1.gz",
+  "/weird_names/man/1/[/__.1",
+  "/weird_names/man/1/_.1.gz",
+  "/weird_names/man/1/_/.1",
+  "/weird_names/man/1/__1.gz",
+  "/weird_names/some/_file",
+  "/weird_names/some/file",
+  "/weird_names/some _file",
+  "/weird_names/some file",
+  "/weird_names/some_file",
+  "/weird_names/win/AUX_",
+  "/weird_names/win/AUX_.txt",
+  "/weird_names/win/COM1_",
+  "/weird_names/win/COM1__1.txt",
+  "/weird_names/win/COM2_",
+  "/weird_names/win/COM2__1.txt",
+  "/weird_names/win/COM3_",
+  "/weird_names/win/COM3__1.txt",
+  "/weird_names/win/COM4_",
+  "/weird_names/win/COM4__1.txt",
+  "/weird_names/win/COM5_",
+  "/weird_names/win/COM5__1.txt",
+  "/weird_names/win/COM6_",
+  "/weird_names/win/COM6__1.txt",
+  "/weird_names/win/COM7_",
+  "/weird_names/win/COM7__1.txt",
+  "/weird_names/win/COM8_",
+  "/weird_names/win/COM8__1.txt",
+  "/weird_names/win/COM9_",
+  "/weird_names/win/COM9_.txt",
+  "/weird_names/win/CON_",
+  "/weird_names/win/CON_.txt",
+  "/weird_names/win/LPT1_",
+  "/weird_names/win/LPT1__1.txt",
+  "/weird_names/win/LPT2_",
+  "/weird_names/win/LPT2__1.txt",
+  "/weird_names/win/LPT3_",
+  "/weird_names/win/LPT3__1.txt",
+  "/weird_names/win/LPT4_",
+  "/weird_names/win/LPT4__1.txt",
+  "/weird_names/win/LPT5_",
+  "/weird_names/win/LPT5__1.txt",
+  "/weird_names/win/LPT6_",
+  "/weird_names/win/LPT6__1.txt",
+  "/weird_names/win/LPT7_",
+  "/weird_names/win/LPT7__1.txt",
+  "/weird_names/win/LPT8_",
+  "/weird_names/win/LPT8__1.txt",
+  "/weird_names/win/LPT9_",
+  "/weird_names/win/LPT9__1.txt",
+  "/weird_names/win/NUL_",
+  "/weird_names/win/NUL_.txt",
+  "/weird_names/win/PRN_",
+  "/weird_names/win/PRN_.txt",
+  "/weird_names/win/aux__1",
+  "/weird_names/win/aux__1.txt",
+  "/weird_names/win/com1_.txt",
+  "/weird_names/win/com1__1",
+  "/weird_names/win/com2_.txt",
+  "/weird_names/win/com2__1",
+  "/weird_names/win/com3_.txt",
+  "/weird_names/win/com3__1",
+  "/weird_names/win/com4_.txt",
+  "/weird_names/win/com4__1",
+  "/weird_names/win/com5_.txt",
+  "/weird_names/win/com5__1",
+  "/weird_names/win/com6_.txt",
+  "/weird_names/win/com6__1",
+  "/weird_names/win/com7_.txt",
+  "/weird_names/win/com7__1",
+  "/weird_names/win/com8_.txt",
+  "/weird_names/win/com8__1",
+  "/weird_names/win/com9__1",
+  "/weird_names/win/com9__1.txt",
+  "/weird_names/win/con__1",
+  "/weird_names/win/con__1.txt",
+  "/weird_names/win/lpt1_.txt",
+  "/weird_names/win/lpt1__1",
+  "/weird_names/win/lpt2_.txt",
+  "/weird_names/win/lpt2__1",
+  "/weird_names/win/lpt3_.txt",
+  "/weird_names/win/lpt3__1",
+  "/weird_names/win/lpt4_.txt",
+  "/weird_names/win/lpt4__1",
+  "/weird_names/win/lpt5_.txt",
+  "/weird_names/win/lpt5__1",
+  "/weird_names/win/lpt6_.txt",
+  "/weird_names/win/lpt6__1",
+  "/weird_names/win/lpt7_.txt",
+  "/weird_names/win/lpt7__1",
+  "/weird_names/win/lpt8_.txt",
+  "/weird_names/win/lpt8__1",
+  "/weird_names/win/lpt9_.txt",
+  "/weird_names/win/lpt9__1",
+  "/weird_names/win/nul__1",
+  "/weird_names/win/nul__1.txt",
+  "/weird_names/win/prn__1",
+  "/weird_names/win/prn__1.txt",
+  "/weird_names/winchr/ab/.t",
+  "/weird_names/winchr/ab_.t",
+  "/weird_names/winchr/ab_.t_",
+  "/weird_names/winchr/ab__1.t",
+  "/weird_names/winchr/ab__1.t_",
+  "/weird_names/winchr/ab__2.t",
+  "/weird_names/winchr/ab__2.t_",
+  "/weird_names/winchr/ab__3.t_",
+  "/weird_names/winchr/ab__4.t_",
+  "/weird_names/winchr/ab__5.t_",
   "/weird_names/winchr/ab__6.t_"
 ]
\ No newline at end of file
diff --git a/tests/data/archive/weird_names/weird_names.zip_libarch_linux.expected b/tests/data/archive/weird_names/weird_names.zip_libarch_linux.expected
index 9cd3bab..f673790 100644
--- a/tests/data/archive/weird_names/weird_names.zip_libarch_linux.expected
+++ b/tests/data/archive/weird_names/weird_names.zip_libarch_linux.expected
@@ -4,11 +4,11 @@
   "/weird_names/man/1/_.1.gz",
   "/weird_names/man/1/_/.1",
   "/weird_names/man/1/__1.gz",
+  "/weird_names/some _file",
+  "/weird_names/some file",
   "/weird_names/some/_file",
   "/weird_names/some/file",
-  "/weird_names/some__file",
   "/weird_names/some_file",
-  "/weird_names/some_file_1",
   "/weird_names/win/AUX_",
   "/weird_names/win/AUX_.txt",
   "/weird_names/win/COM1_",
diff --git a/tests/data/archive/weird_names/weird_names.zip_libarch_mac.expected b/tests/data/archive/weird_names/weird_names.zip_libarch_mac.expected
index 2f49c8f..f673790 100644
--- a/tests/data/archive/weird_names/weird_names.zip_libarch_mac.expected
+++ b/tests/data/archive/weird_names/weird_names.zip_libarch_mac.expected
@@ -1,111 +1,111 @@
 [
-  "/weird_names/man/1/[.1.gz", 
-  "/weird_names/man/1/[/__.1", 
-  "/weird_names/man/1/_.1.gz", 
-  "/weird_names/man/1/_/.1", 
-  "/weird_names/man/1/__1.gz", 
-  "/weird_names/some/_file", 
-  "/weird_names/some/file", 
-  "/weird_names/some__file", 
-  "/weird_names/some_file", 
-  "/weird_names/some_file_1", 
-  "/weird_names/win/AUX_", 
-  "/weird_names/win/AUX_.txt", 
-  "/weird_names/win/COM1_", 
-  "/weird_names/win/COM1__1.txt", 
-  "/weird_names/win/COM2_", 
-  "/weird_names/win/COM2__1.txt", 
-  "/weird_names/win/COM3__1", 
-  "/weird_names/win/COM3__1.txt", 
-  "/weird_names/win/COM4_", 
-  "/weird_names/win/COM4_.txt", 
-  "/weird_names/win/COM5_", 
-  "/weird_names/win/COM5__1.txt", 
-  "/weird_names/win/COM6_", 
-  "/weird_names/win/COM6_.txt", 
-  "/weird_names/win/COM7_", 
-  "/weird_names/win/COM7__1.txt", 
-  "/weird_names/win/COM8_.txt", 
-  "/weird_names/win/COM8__1", 
-  "/weird_names/win/COM9_.txt", 
-  "/weird_names/win/COM9__1", 
-  "/weird_names/win/CON__1", 
-  "/weird_names/win/CON__1.txt", 
-  "/weird_names/win/LPT1_.txt", 
-  "/weird_names/win/LPT1__1", 
-  "/weird_names/win/LPT2__1", 
-  "/weird_names/win/LPT2__1.txt", 
-  "/weird_names/win/LPT3_", 
-  "/weird_names/win/LPT3__1.txt", 
-  "/weird_names/win/LPT4__1", 
-  "/weird_names/win/LPT4__1.txt", 
-  "/weird_names/win/LPT5__1", 
-  "/weird_names/win/LPT5__1.txt", 
-  "/weird_names/win/LPT6_.txt", 
-  "/weird_names/win/LPT6__1", 
-  "/weird_names/win/LPT7_", 
-  "/weird_names/win/LPT7_.txt", 
-  "/weird_names/win/LPT8__1", 
-  "/weird_names/win/LPT8__1.txt", 
-  "/weird_names/win/LPT9_", 
-  "/weird_names/win/LPT9__1.txt", 
-  "/weird_names/win/NUL__1", 
-  "/weird_names/win/NUL__1.txt", 
-  "/weird_names/win/PRN_", 
-  "/weird_names/win/PRN_.txt", 
-  "/weird_names/win/aux__1", 
-  "/weird_names/win/aux__1.txt", 
-  "/weird_names/win/com1_.txt", 
-  "/weird_names/win/com1__1", 
-  "/weird_names/win/com2_.txt", 
-  "/weird_names/win/com2__1", 
-  "/weird_names/win/com3_", 
-  "/weird_names/win/com3_.txt", 
-  "/weird_names/win/com4__1", 
-  "/weird_names/win/com4__1.txt", 
-  "/weird_names/win/com5_.txt", 
-  "/weird_names/win/com5__1", 
-  "/weird_names/win/com6__1", 
-  "/weird_names/win/com6__1.txt", 
-  "/weird_names/win/com7_.txt", 
-  "/weird_names/win/com7__1", 
-  "/weird_names/win/com8_", 
-  "/weird_names/win/com8__1.txt", 
-  "/weird_names/win/com9_", 
-  "/weird_names/win/com9__1.txt", 
-  "/weird_names/win/con_", 
-  "/weird_names/win/con_.txt", 
-  "/weird_names/win/lpt1_", 
-  "/weird_names/win/lpt1__1.txt", 
-  "/weird_names/win/lpt2_", 
-  "/weird_names/win/lpt2_.txt", 
-  "/weird_names/win/lpt3_.txt", 
-  "/weird_names/win/lpt3__1", 
-  "/weird_names/win/lpt4_", 
-  "/weird_names/win/lpt4_.txt", 
-  "/weird_names/win/lpt5_", 
-  "/weird_names/win/lpt5_.txt", 
-  "/weird_names/win/lpt6_", 
-  "/weird_names/win/lpt6__1.txt", 
-  "/weird_names/win/lpt7__1", 
-  "/weird_names/win/lpt7__1.txt", 
-  "/weird_names/win/lpt8_", 
-  "/weird_names/win/lpt8_.txt", 
-  "/weird_names/win/lpt9_.txt", 
-  "/weird_names/win/lpt9__1", 
-  "/weird_names/win/nul_", 
-  "/weird_names/win/nul_.txt", 
-  "/weird_names/win/prn__1", 
-  "/weird_names/win/prn__1.txt", 
-  "/weird_names/winchr/ab/.t", 
-  "/weird_names/winchr/ab_.t", 
-  "/weird_names/winchr/ab_.t_", 
-  "/weird_names/winchr/ab__1.t", 
-  "/weird_names/winchr/ab__1.t_", 
-  "/weird_names/winchr/ab__2.t", 
-  "/weird_names/winchr/ab__2.t_", 
-  "/weird_names/winchr/ab__3.t_", 
-  "/weird_names/winchr/ab__4.t_", 
-  "/weird_names/winchr/ab__5.t_", 
+  "/weird_names/man/1/[.1.gz",
+  "/weird_names/man/1/[/__.1",
+  "/weird_names/man/1/_.1.gz",
+  "/weird_names/man/1/_/.1",
+  "/weird_names/man/1/__1.gz",
+  "/weird_names/some _file",
+  "/weird_names/some file",
+  "/weird_names/some/_file",
+  "/weird_names/some/file",
+  "/weird_names/some_file",
+  "/weird_names/win/AUX_",
+  "/weird_names/win/AUX_.txt",
+  "/weird_names/win/COM1_",
+  "/weird_names/win/COM1__1.txt",
+  "/weird_names/win/COM2_",
+  "/weird_names/win/COM2__1.txt",
+  "/weird_names/win/COM3__1",
+  "/weird_names/win/COM3__1.txt",
+  "/weird_names/win/COM4_",
+  "/weird_names/win/COM4_.txt",
+  "/weird_names/win/COM5_",
+  "/weird_names/win/COM5__1.txt",
+  "/weird_names/win/COM6_",
+  "/weird_names/win/COM6_.txt",
+  "/weird_names/win/COM7_",
+  "/weird_names/win/COM7__1.txt",
+  "/weird_names/win/COM8_.txt",
+  "/weird_names/win/COM8__1",
+  "/weird_names/win/COM9_.txt",
+  "/weird_names/win/COM9__1",
+  "/weird_names/win/CON__1",
+  "/weird_names/win/CON__1.txt",
+  "/weird_names/win/LPT1_.txt",
+  "/weird_names/win/LPT1__1",
+  "/weird_names/win/LPT2__1",
+  "/weird_names/win/LPT2__1.txt",
+  "/weird_names/win/LPT3_",
+  "/weird_names/win/LPT3__1.txt",
+  "/weird_names/win/LPT4__1",
+  "/weird_names/win/LPT4__1.txt",
+  "/weird_names/win/LPT5__1",
+  "/weird_names/win/LPT5__1.txt",
+  "/weird_names/win/LPT6_.txt",
+  "/weird_names/win/LPT6__1",
+  "/weird_names/win/LPT7_",
+  "/weird_names/win/LPT7_.txt",
+  "/weird_names/win/LPT8__1",
+  "/weird_names/win/LPT8__1.txt",
+  "/weird_names/win/LPT9_",
+  "/weird_names/win/LPT9__1.txt",
+  "/weird_names/win/NUL__1",
+  "/weird_names/win/NUL__1.txt",
+  "/weird_names/win/PRN_",
+  "/weird_names/win/PRN_.txt",
+  "/weird_names/win/aux__1",
+  "/weird_names/win/aux__1.txt",
+  "/weird_names/win/com1_.txt",
+  "/weird_names/win/com1__1",
+  "/weird_names/win/com2_.txt",
+  "/weird_names/win/com2__1",
+  "/weird_names/win/com3_",
+  "/weird_names/win/com3_.txt",
+  "/weird_names/win/com4__1",
+  "/weird_names/win/com4__1.txt",
+  "/weird_names/win/com5_.txt",
+  "/weird_names/win/com5__1",
+  "/weird_names/win/com6__1",
+  "/weird_names/win/com6__1.txt",
+  "/weird_names/win/com7_.txt",
+  "/weird_names/win/com7__1",
+  "/weird_names/win/com8_",
+  "/weird_names/win/com8__1.txt",
+  "/weird_names/win/com9_",
+  "/weird_names/win/com9__1.txt",
+  "/weird_names/win/con_",
+  "/weird_names/win/con_.txt",
+  "/weird_names/win/lpt1_",
+  "/weird_names/win/lpt1__1.txt",
+  "/weird_names/win/lpt2_",
+  "/weird_names/win/lpt2_.txt",
+  "/weird_names/win/lpt3_.txt",
+  "/weird_names/win/lpt3__1",
+  "/weird_names/win/lpt4_",
+  "/weird_names/win/lpt4_.txt",
+  "/weird_names/win/lpt5_",
+  "/weird_names/win/lpt5_.txt",
+  "/weird_names/win/lpt6_",
+  "/weird_names/win/lpt6__1.txt",
+  "/weird_names/win/lpt7__1",
+  "/weird_names/win/lpt7__1.txt",
+  "/weird_names/win/lpt8_",
+  "/weird_names/win/lpt8_.txt",
+  "/weird_names/win/lpt9_.txt",
+  "/weird_names/win/lpt9__1",
+  "/weird_names/win/nul_",
+  "/weird_names/win/nul_.txt",
+  "/weird_names/win/prn__1",
+  "/weird_names/win/prn__1.txt",
+  "/weird_names/winchr/ab/.t",
+  "/weird_names/winchr/ab_.t",
+  "/weird_names/winchr/ab_.t_",
+  "/weird_names/winchr/ab__1.t",
+  "/weird_names/winchr/ab__1.t_",
+  "/weird_names/winchr/ab__2.t",
+  "/weird_names/winchr/ab__2.t_",
+  "/weird_names/winchr/ab__3.t_",
+  "/weird_names/winchr/ab__4.t_",
+  "/weird_names/winchr/ab__5.t_",
   "/weird_names/winchr/ab__6.t_"
 ]
\ No newline at end of file
diff --git a/tests/data/archive/weird_names/weird_names.zip_libarch_win.expected b/tests/data/archive/weird_names/weird_names.zip_libarch_win.expected
index 2f49c8f..fe87450 100644
--- a/tests/data/archive/weird_names/weird_names.zip_libarch_win.expected
+++ b/tests/data/archive/weird_names/weird_names.zip_libarch_win.expected
@@ -1,111 +1,111 @@
 [
-  "/weird_names/man/1/[.1.gz", 
-  "/weird_names/man/1/[/__.1", 
-  "/weird_names/man/1/_.1.gz", 
-  "/weird_names/man/1/_/.1", 
-  "/weird_names/man/1/__1.gz", 
-  "/weird_names/some/_file", 
-  "/weird_names/some/file", 
-  "/weird_names/some__file", 
-  "/weird_names/some_file", 
-  "/weird_names/some_file_1", 
-  "/weird_names/win/AUX_", 
-  "/weird_names/win/AUX_.txt", 
-  "/weird_names/win/COM1_", 
-  "/weird_names/win/COM1__1.txt", 
-  "/weird_names/win/COM2_", 
-  "/weird_names/win/COM2__1.txt", 
-  "/weird_names/win/COM3__1", 
-  "/weird_names/win/COM3__1.txt", 
-  "/weird_names/win/COM4_", 
-  "/weird_names/win/COM4_.txt", 
-  "/weird_names/win/COM5_", 
-  "/weird_names/win/COM5__1.txt", 
-  "/weird_names/win/COM6_", 
-  "/weird_names/win/COM6_.txt", 
-  "/weird_names/win/COM7_", 
-  "/weird_names/win/COM7__1.txt", 
-  "/weird_names/win/COM8_.txt", 
-  "/weird_names/win/COM8__1", 
-  "/weird_names/win/COM9_.txt", 
-  "/weird_names/win/COM9__1", 
-  "/weird_names/win/CON__1", 
-  "/weird_names/win/CON__1.txt", 
-  "/weird_names/win/LPT1_.txt", 
-  "/weird_names/win/LPT1__1", 
-  "/weird_names/win/LPT2__1", 
-  "/weird_names/win/LPT2__1.txt", 
-  "/weird_names/win/LPT3_", 
-  "/weird_names/win/LPT3__1.txt", 
-  "/weird_names/win/LPT4__1", 
-  "/weird_names/win/LPT4__1.txt", 
-  "/weird_names/win/LPT5__1", 
-  "/weird_names/win/LPT5__1.txt", 
-  "/weird_names/win/LPT6_.txt", 
-  "/weird_names/win/LPT6__1", 
-  "/weird_names/win/LPT7_", 
-  "/weird_names/win/LPT7_.txt", 
-  "/weird_names/win/LPT8__1", 
-  "/weird_names/win/LPT8__1.txt", 
-  "/weird_names/win/LPT9_", 
-  "/weird_names/win/LPT9__1.txt", 
-  "/weird_names/win/NUL__1", 
-  "/weird_names/win/NUL__1.txt", 
-  "/weird_names/win/PRN_", 
-  "/weird_names/win/PRN_.txt", 
-  "/weird_names/win/aux__1", 
-  "/weird_names/win/aux__1.txt", 
-  "/weird_names/win/com1_.txt", 
-  "/weird_names/win/com1__1", 
-  "/weird_names/win/com2_.txt", 
-  "/weird_names/win/com2__1", 
-  "/weird_names/win/com3_", 
-  "/weird_names/win/com3_.txt", 
-  "/weird_names/win/com4__1", 
-  "/weird_names/win/com4__1.txt", 
-  "/weird_names/win/com5_.txt", 
-  "/weird_names/win/com5__1", 
-  "/weird_names/win/com6__1", 
-  "/weird_names/win/com6__1.txt", 
-  "/weird_names/win/com7_.txt", 
-  "/weird_names/win/com7__1", 
-  "/weird_names/win/com8_", 
-  "/weird_names/win/com8__1.txt", 
-  "/weird_names/win/com9_", 
-  "/weird_names/win/com9__1.txt", 
-  "/weird_names/win/con_", 
-  "/weird_names/win/con_.txt", 
-  "/weird_names/win/lpt1_", 
-  "/weird_names/win/lpt1__1.txt", 
-  "/weird_names/win/lpt2_", 
-  "/weird_names/win/lpt2_.txt", 
-  "/weird_names/win/lpt3_.txt", 
-  "/weird_names/win/lpt3__1", 
-  "/weird_names/win/lpt4_", 
-  "/weird_names/win/lpt4_.txt", 
-  "/weird_names/win/lpt5_", 
-  "/weird_names/win/lpt5_.txt", 
-  "/weird_names/win/lpt6_", 
-  "/weird_names/win/lpt6__1.txt", 
-  "/weird_names/win/lpt7__1", 
-  "/weird_names/win/lpt7__1.txt", 
-  "/weird_names/win/lpt8_", 
-  "/weird_names/win/lpt8_.txt", 
-  "/weird_names/win/lpt9_.txt", 
-  "/weird_names/win/lpt9__1", 
-  "/weird_names/win/nul_", 
-  "/weird_names/win/nul_.txt", 
-  "/weird_names/win/prn__1", 
-  "/weird_names/win/prn__1.txt", 
-  "/weird_names/winchr/ab/.t", 
-  "/weird_names/winchr/ab_.t", 
-  "/weird_names/winchr/ab_.t_", 
-  "/weird_names/winchr/ab__1.t", 
-  "/weird_names/winchr/ab__1.t_", 
-  "/weird_names/winchr/ab__2.t", 
-  "/weird_names/winchr/ab__2.t_", 
-  "/weird_names/winchr/ab__3.t_", 
-  "/weird_names/winchr/ab__4.t_", 
-  "/weird_names/winchr/ab__5.t_", 
+  "/weird_names/man/1/[.1.gz",
+  "/weird_names/man/1/[/__.1",
+  "/weird_names/man/1/_.1.gz",
+  "/weird_names/man/1/_/.1",
+  "/weird_names/man/1/__1.gz",
+  "/weird_names/some/_file",
+  "/weird_names/some/file",
+  "/weird_names/some _file",
+  "/weird_names/some file",
+  "/weird_names/some_file",
+  "/weird_names/win/AUX_",
+  "/weird_names/win/AUX_.txt",
+  "/weird_names/win/COM1_",
+  "/weird_names/win/COM1__1.txt",
+  "/weird_names/win/COM2_",
+  "/weird_names/win/COM2__1.txt",
+  "/weird_names/win/COM3__1",
+  "/weird_names/win/COM3__1.txt",
+  "/weird_names/win/COM4_",
+  "/weird_names/win/COM4_.txt",
+  "/weird_names/win/COM5_",
+  "/weird_names/win/COM5__1.txt",
+  "/weird_names/win/COM6_",
+  "/weird_names/win/COM6_.txt",
+  "/weird_names/win/COM7_",
+  "/weird_names/win/COM7__1.txt",
+  "/weird_names/win/COM8_.txt",
+  "/weird_names/win/COM8__1",
+  "/weird_names/win/COM9_.txt",
+  "/weird_names/win/COM9__1",
+  "/weird_names/win/CON__1",
+  "/weird_names/win/CON__1.txt",
+  "/weird_names/win/LPT1_.txt",
+  "/weird_names/win/LPT1__1",
+  "/weird_names/win/LPT2__1",
+  "/weird_names/win/LPT2__1.txt",
+  "/weird_names/win/LPT3_",
+  "/weird_names/win/LPT3__1.txt",
+  "/weird_names/win/LPT4__1",
+  "/weird_names/win/LPT4__1.txt",
+  "/weird_names/win/LPT5__1",
+  "/weird_names/win/LPT5__1.txt",
+  "/weird_names/win/LPT6_.txt",
+  "/weird_names/win/LPT6__1",
+  "/weird_names/win/LPT7_",
+  "/weird_names/win/LPT7_.txt",
+  "/weird_names/win/LPT8__1",
+  "/weird_names/win/LPT8__1.txt",
+  "/weird_names/win/LPT9_",
+  "/weird_names/win/LPT9__1.txt",
+  "/weird_names/win/NUL__1",
+  "/weird_names/win/NUL__1.txt",
+  "/weird_names/win/PRN_",
+  "/weird_names/win/PRN_.txt",
+  "/weird_names/win/aux__1",
+  "/weird_names/win/aux__1.txt",
+  "/weird_names/win/com1_.txt",
+  "/weird_names/win/com1__1",
+  "/weird_names/win/com2_.txt",
+  "/weird_names/win/com2__1",
+  "/weird_names/win/com3_",
+  "/weird_names/win/com3_.txt",
+  "/weird_names/win/com4__1",
+  "/weird_names/win/com4__1.txt",
+  "/weird_names/win/com5_.txt",
+  "/weird_names/win/com5__1",
+  "/weird_names/win/com6__1",
+  "/weird_names/win/com6__1.txt",
+  "/weird_names/win/com7_.txt",
+  "/weird_names/win/com7__1",
+  "/weird_names/win/com8_",
+  "/weird_names/win/com8__1.txt",
+  "/weird_names/win/com9_",
+  "/weird_names/win/com9__1.txt",
+  "/weird_names/win/con_",
+  "/weird_names/win/con_.txt",
+  "/weird_names/win/lpt1_",
+  "/weird_names/win/lpt1__1.txt",
+  "/weird_names/win/lpt2_",
+  "/weird_names/win/lpt2_.txt",
+  "/weird_names/win/lpt3_.txt",
+  "/weird_names/win/lpt3__1",
+  "/weird_names/win/lpt4_",
+  "/weird_names/win/lpt4_.txt",
+  "/weird_names/win/lpt5_",
+  "/weird_names/win/lpt5_.txt",
+  "/weird_names/win/lpt6_",
+  "/weird_names/win/lpt6__1.txt",
+  "/weird_names/win/lpt7__1",
+  "/weird_names/win/lpt7__1.txt",
+  "/weird_names/win/lpt8_",
+  "/weird_names/win/lpt8_.txt",
+  "/weird_names/win/lpt9_.txt",
+  "/weird_names/win/lpt9__1",
+  "/weird_names/win/nul_",
+  "/weird_names/win/nul_.txt",
+  "/weird_names/win/prn__1",
+  "/weird_names/win/prn__1.txt",
+  "/weird_names/winchr/ab/.t",
+  "/weird_names/winchr/ab_.t",
+  "/weird_names/winchr/ab_.t_",
+  "/weird_names/winchr/ab__1.t",
+  "/weird_names/winchr/ab__1.t_",
+  "/weird_names/winchr/ab__2.t",
+  "/weird_names/winchr/ab__2.t_",
+  "/weird_names/winchr/ab__3.t_",
+  "/weird_names/winchr/ab__4.t_",
+  "/weird_names/winchr/ab__5.t_",
   "/weird_names/winchr/ab__6.t_"
 ]
\ No newline at end of file
diff --git a/tests/test_archive.py b/tests/test_archive.py
index 3d2eaca..a886545 100644
--- a/tests/test_archive.py
+++ b/tests/test_archive.py
@@ -394,10 +394,10 @@ def test_extract_targz_with_mixed_case_and_symlink(self):
         result = archive.extract_tar(test_file, test_dir)
         assert [] == result
         import json
-        exp_file = self.get_test_loc('archive/tgz/mixed_case_and_symlink.tgz.expected')
+        exp_file = self.get_test_loc('archive/tgz/mixed_case_and_symlink.tgz.expected.json')
         with open(exp_file) as ef:
             expected_files = json.load(ef)
-        check_files(test_dir, list(map(str, expected_files)))
+        check_files(test_dir, exp_file, regen=False)
 
     def test_extract_targz_symlinks(self):
         test_file = self.get_test_loc('archive/tgz/symlink.tar.gz')
@@ -2266,6 +2266,7 @@ def check_extract_weird_names(
 
         expected = json.loads(open(expected_file).read())
         expected = [p for p in expected if p.strip()]
+        expected = sorted(expected)
         try:
             assert expected == extracted
         except:
diff --git a/tests/test_extractcode_cli.py b/tests/test_extractcode_cli.py
index 6ef6b74..04fcbfc 100644
--- a/tests/test_extractcode_cli.py
+++ b/tests/test_extractcode_cli.py
@@ -203,7 +203,7 @@ def test_extractcode_command_can_extract_archive_with_unicode_names_verbose():
     expected = [
         '/unicodepath/Ho_',
         '/unicodepath/Ho_a',
-        '/unicodepath/koristenjem_Karkkainen_-_Sander.pdf'
+        '/unicodepath/koristenjem Karkkainen - Sander.pdf'
     ]
     assert sorted(expected) == sorted(file_result)
 
@@ -220,7 +220,7 @@ def test_extractcode_command_can_extract_archive_with_unicode_names():
     expected = [
         '/unicodepath/Ho_',
         '/unicodepath/Ho_a',
-        '/unicodepath/koristenjem_Karkkainen_-_Sander.pdf'
+        '/unicodepath/koristenjem Karkkainen - Sander.pdf'
     ]
     assert sorted(expected) == sorted(file_result)