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

* commit 'cd85db331dd319d63f57f7b4c942bc506606b5b0':
  Out with the sliders, in with the cog.