Improved Firefox OS theme, and restored the macaw bros theme