Fixed style and controller merge issues

* added new sass variable names in place of old ones
* added missing parentheses in main_controller
* added missing end in application_controller