applied changes from tomorrow-theme repo