Fixes from upstream jasonlong/architect-theme issue #9