Fixes issues with lib and theme