Partial fix of the custom theme