Merge branch 'jn/parse-config-slot' into jk/colors