better implementation of tomorrow theme