updated theme and controllers