Remove some code from templates
K 3.0 Crypsis: Spoiler - Click to expand does not work. #1467
Merge pull request #1487 from xillibit/k30_bugs3

K 3.0 Crypsis: Spoiler - Click to expand does not work. #1467
Merge pull request #1486 from xillibit/k30_bugs5

Remove some code from templates
fix conflict