More cleanup!!!

-Merge battery bar & battery icon styles into one
-Delete Beanstalk files
-Categotize the battery icon settings & battery bar settings