Merge CM
Theme
Torch Delay
Fix