Some adjustments to use AngularJS theme