Mhotar/companion new theme

Ready to be merged.
![yerico_19](https://f.cloud.github.com/assets/6114100/2208771/aa7f810c-9983-11e3-9c8d-b30a4312fb17.png)