Fixes at theme