diff --git a/beets.config.yaml b/beets.config.yaml
index acc8a8a..0836d77 100644
--- a/beets.config.yaml
+++ b/beets.config.yaml
@@ -21,18 +21,19 @@ musicbrainz:
 original_date: yes
 
 replace:
-  '^!!!$':       'Chk_Chk_Chk'
+  '^!!!$':         'Chk_Chk_Chk'
   '[#"()\[\]<>:\*\|{}\\!\?]': _
-  "'":           _
-  '[\\/]':       _
-  '[\.,]':       _
-  '[\x00-\x1f]': _
-  '&':           '_and_'
-  '\+':          '_plus_'
-  '\s+':         _
-  '[-_]+':       _
-  '^[-_](?!$)':  ''
-  '(?<!^)[-_]$': ''
+  "'":             _
+  '[\\/]':         _
+  '[\.,]':         _
+  '[\x00-\x1f]':   _
+  'Samson & Gert': 'Samson_en_Gert'
+  '&':             '_and_'
+  '\+':            '_plus_'
+  '\s+':           _
+  '[-_]+':         _
+  '^[-_](?!$)':    ''
+  '(?<!^)[-_]$':   ''
 
 # first (non-pregap) track on each disc always has track number 1
 per_disc_numbering: yes
@@ -41,16 +42,16 @@ item_fields:
   multidisc: disctotal > 1
 
 paths:
-  default: $albumartist/$album%aunique{}/%if{$multidisc,${disc}_}_${track}_-_${title}
-  singleton: $artist/etc/$title
-  comp: various_artists/$album%aunique{}/%if{$multidisc,${disc}_}_${track}_-_${title}
+  default:   %the{$albumartist}/%the{$album}%aunique{}/%if{$multidisc,${disc}_}_${track}_-_$title
+  singleton: %the{$artist}/etc/$title
+  comp:      various_artists/%the{$album}%aunique{}/%if{$multidisc,${disc}_}_${track}_-_$title
 
 va_name: various artists
 
 languages: ["nl", "en"]
 bell: yes
 
-plugins: edit inline the types fetchart lyrics mpdupdate mbsync mbsubmit badfiles absubmit acousticbrainz replaygain permissions fromfilename lastgenre play fuzzy info
+plugins: edit inline the types fetchart lyrics mpdupdate mbsync mbsubmit badfiles acousticbrainz replaygain permissions fromfilename lastgenre play fuzzy info
 
 edit:
   itemfields: track disc title artist album mb_trackid
@@ -70,7 +71,8 @@ lastgenre:
 
 the:
   strip: yes
-  patterns: ^de ^een
+  # this string is split on spaces so we use the escape sequence
+  patterns: '^(de|het|een|une?|les?|la|der|die|das)\x20'
 
 types:
   rating: float