Moving theme-specific switches into functions-conf