tagged: Improve handling of default layout, screen #s
Additional powerline date+batt configs