theme review, design and functional changes