added actionbar theme
attempt to reconcile themes
Revert "attempt to reconcile themes"

This reverts commit a1f1fb84474b55c4ec8575813799f2451c7e722e.
Cleanup and refactor