Updated (with theme default font fix)