move to common kcm and fix overlay