Fixes a bunch of lint issues
Fixes lint issues, work on theme