minor: making theme more portable