Revert "Settings: cleanup, fixes, etc"

Why? Because your prefs_statusbarmods file doesn't have a fucking extension.

This reverts commit cca3f3a9f9794c9eea78a4d79b97e85dde232398.

Change-Id: I832c3ad6295bd4ea5a49495d73a1d4dd8642b435