Make theme.c indentation more locally consistent