Very close to adding theme option