Improved app to handle custom styles