Refactor and ignore .idea
Remove unnecessary jellybeans overrides