merge: base: update base-files and basic config