refactored all domain templates
Merge commit '28f5e9c5f4ddb6f810fc823048991f77e0bcb2bf'