Improve transitions
Add dark theme
Add null option