Further theme adjustments to fix compile errors...