Fixes for hardcoded styles and shortcuts