Improved theme and added longer timeout