Merge "Out with the sliders, in with the cog." into klp-dev