[Jaws_Layout]: tail of last commit
[Settings]: rename some registry keys for better logical grouping