WIP
WIP
refactoring
refactoring, cleanup
restore simple default
Additional tweak(s)
Set default for distro correctly