Fixes on config theme