Adding changes from forked whitespace theme