From 17905a94d0aefa20ffa60b6935472926ebca707b Mon Sep 17 00:00:00 2001
From: Lertsenem <lertsenem@lertsenem.com>
Date: Sat, 9 Jan 2021 19:07:26 +0100
Subject: [PATCH] Add a covid option for confismash theme

The covid masks files and data have been moved from the rebootlyon2020
template directory to the template root (under _template), so now it can
be more easily used by any template. And so the covid opion has been
added to the confismash template
---
 .../covid => _covid}/banjo & kazooie.svg.j2   |   0
 .../covid => _covid}/bayonetta.svg.j2         |   0
 .../covid => _covid}/bowser jr.svg.j2         |   0
 .../covid => _covid}/bowser.svg.j2            |   0
 .../covid => _covid}/byleth f.svg.j2          |   0
 .../covid => _covid}/byleth m.svg.j2          |   0
 .../covid => _covid}/captain falcon.svg.j2    |   0
 .../covid => _covid}/chrom.svg.j2             |   0
 .../covid => _covid}/cloud.svg.j2             |   0
 .../covid => _covid}/corrin f.svg.j2          |   0
 .../covid => _covid}/corrin m.svg.j2          |   0
 .../{rebootlyon2020/covid => _covid}/covid.j2 |   0
 .../covid => _covid}/daisy.svg.j2             |   0
 .../covid => _covid}/dark pit.svg.j2          |   0
 .../covid => _covid}/dark samus.svg.j2        |   0
 .../covid => _covid}/diddy kong.svg.j2        |   0
 .../covid => _covid}/donkey kong.svg.j2       |   0
 .../covid => _covid}/dr mario.svg.j2          |   0
 .../covid => _covid}/falco.svg.j2             |   0
 .../covid => _covid}/fox.svg.j2               |   0
 .../covid => _covid}/ganondorf.svg.j2         |   0
 .../covid => _covid}/greninja.svg.j2          |   0
 .../covid => _covid}/hero.svg.j2              |   0
 .../covid => _covid}/ice climbers.svg.j2      |   0
 .../covid => _covid}/ike.svg.j2               |   0
 .../covid => _covid}/incineroar.svg.j2        |   0
 .../covid => _covid}/inkling.svg.j2           |   0
 .../covid => _covid}/isabelle.svg.j2          |   0
 .../covid => _covid}/jigglypuff.svg.j2        |   0
 .../covid => _covid}/joker.svg.j2             |   0
 .../covid => _covid}/ken.svg.j2               |   0
 .../covid => _covid}/king dedede.svg.j2       |   0
 .../covid => _covid}/king k rool.svg.j2       |   0
 .../covid => _covid}/kirby.svg.j2             |   0
 .../covid => _covid}/link.svg.j2              |   0
 .../{rebootlyon2020/covid => _covid}/list     |   0
 .../covid => _covid}/little mac.svg.j2        |   0
 .../covid => _covid}/lucario.svg.j2           |   0
 .../covid => _covid}/lucas.svg.j2             |   0
 .../covid => _covid}/lucina.svg.j2            |   0
 .../covid => _covid}/luigi.svg.j2             |   0
 .../covid => _covid}/mario.svg.j2             |   0
 .../covid => _covid}/marth.svg.j2             |   0
 .../covid => _covid}/mega man.svg.j2          |   0
 .../covid => _covid}/meta knight.svg.j2       |   0
 .../covid => _covid}/mewtwo.svg.j2            |   0
 .../covid => _covid}/min min.svg.j2           |   0
 .../covid => _covid}/mr game and watch.svg.j2 |   0
 .../covid => _covid}/ness.svg.j2              |   0
 .../covid => _covid}/olimar.svg.j2            |   0
 .../covid => _covid}/pacman.svg.j2            |   0
 .../covid => _covid}/palutena.svg.j2          |   0
 .../covid => _covid}/peach.svg.j2             |   0
 .../covid => _covid}/pichu.svg.j2             |   0
 .../covid => _covid}/pikachu.svg.j2           |   0
 .../covid => _covid}/pit.svg.j2               |   0
 .../covid => _covid}/pokemon trainer f.svg.j2 |   0
 .../covid => _covid}/pokemon trainer m.svg.j2 |   0
 .../covid => _covid}/richter.svg.j2           |   0
 .../covid => _covid}/ridley.svg.j2            |   0
 .../covid => _covid}/robin f.svg.j2           |   0
 .../covid => _covid}/robin m.svg.j2           |   0
 .../covid => _covid}/rosalina and luma.svg.j2 |   0
 .../covid => _covid}/roy.svg.j2               |   0
 .../covid => _covid}/ryu.svg.j2               |   0
 .../covid => _covid}/samus.svg.j2             |   0
 .../covid => _covid}/sheik.svg.j2             |   0
 .../covid => _covid}/shulk.svg.j2             |   0
 .../covid => _covid}/simon.svg.j2             |   0
 .../covid => _covid}/snake.svg.j2             |   0
 .../covid => _covid}/sonic.svg.j2             |   0
 .../covid => _covid}/terry.svg.j2             |   0
 .../covid => _covid}/toon link.svg.j2         |   0
 .../covid => _covid}/villager.svg.j2          |   0
 .../covid => _covid}/wario.svg.j2             |   0
 .../covid => _covid}/wii fit trainer f.svg.j2 |   0
 .../covid => _covid}/wii fit trainer m.svg.j2 |   0
 .../covid => _covid}/wolf.svg.j2              |   0
 .../covid => _covid}/yoshi.svg.j2             |   0
 .../covid => _covid}/young link.svg.j2        |   0
 .../covid => _covid}/zelda.svg.j2             |   0
 .../covid => _covid}/zero suit samus.svg.j2   |   0
 .../confismash/characters_corrections.j2      |   2 +-
 lokrez/templates/confismash/template.svg.j2   | 127 ++++++++++++++++++
 .../templates/rebootlyon2020/template.svg.j2  |   4 +-
 85 files changed, 130 insertions(+), 3 deletions(-)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/banjo & kazooie.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/bayonetta.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/bowser jr.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/bowser.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/byleth f.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/byleth m.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/captain falcon.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/chrom.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/cloud.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/corrin f.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/corrin m.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/covid.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/daisy.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/dark pit.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/dark samus.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/diddy kong.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/donkey kong.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/dr mario.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/falco.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/fox.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/ganondorf.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/greninja.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/hero.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/ice climbers.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/ike.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/incineroar.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/inkling.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/isabelle.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/jigglypuff.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/joker.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/ken.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/king dedede.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/king k rool.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/kirby.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/link.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/list (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/little mac.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/lucario.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/lucas.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/lucina.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/luigi.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/mario.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/marth.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/mega man.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/meta knight.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/mewtwo.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/min min.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/mr game and watch.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/ness.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/olimar.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/pacman.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/palutena.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/peach.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/pichu.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/pikachu.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/pit.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/pokemon trainer f.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/pokemon trainer m.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/richter.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/ridley.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/robin f.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/robin m.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/rosalina and luma.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/roy.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/ryu.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/samus.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/sheik.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/shulk.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/simon.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/snake.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/sonic.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/terry.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/toon link.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/villager.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/wario.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/wii fit trainer f.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/wii fit trainer m.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/wolf.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/yoshi.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/young link.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/zelda.svg.j2 (100%)
 rename lokrez/templates/{rebootlyon2020/covid => _covid}/zero suit samus.svg.j2 (100%)

diff --git a/lokrez/templates/rebootlyon2020/covid/banjo & kazooie.svg.j2 b/lokrez/templates/_covid/banjo & kazooie.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/banjo & kazooie.svg.j2
rename to lokrez/templates/_covid/banjo & kazooie.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/bayonetta.svg.j2 b/lokrez/templates/_covid/bayonetta.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/bayonetta.svg.j2
rename to lokrez/templates/_covid/bayonetta.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/bowser jr.svg.j2 b/lokrez/templates/_covid/bowser jr.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/bowser jr.svg.j2
rename to lokrez/templates/_covid/bowser jr.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/bowser.svg.j2 b/lokrez/templates/_covid/bowser.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/bowser.svg.j2
rename to lokrez/templates/_covid/bowser.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/byleth f.svg.j2 b/lokrez/templates/_covid/byleth f.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/byleth f.svg.j2
rename to lokrez/templates/_covid/byleth f.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/byleth m.svg.j2 b/lokrez/templates/_covid/byleth m.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/byleth m.svg.j2
rename to lokrez/templates/_covid/byleth m.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/captain falcon.svg.j2 b/lokrez/templates/_covid/captain falcon.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/captain falcon.svg.j2
rename to lokrez/templates/_covid/captain falcon.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/chrom.svg.j2 b/lokrez/templates/_covid/chrom.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/chrom.svg.j2
rename to lokrez/templates/_covid/chrom.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/cloud.svg.j2 b/lokrez/templates/_covid/cloud.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/cloud.svg.j2
rename to lokrez/templates/_covid/cloud.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/corrin f.svg.j2 b/lokrez/templates/_covid/corrin f.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/corrin f.svg.j2
rename to lokrez/templates/_covid/corrin f.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/corrin m.svg.j2 b/lokrez/templates/_covid/corrin m.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/corrin m.svg.j2
rename to lokrez/templates/_covid/corrin m.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/covid.j2 b/lokrez/templates/_covid/covid.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/covid.j2
rename to lokrez/templates/_covid/covid.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/daisy.svg.j2 b/lokrez/templates/_covid/daisy.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/daisy.svg.j2
rename to lokrez/templates/_covid/daisy.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/dark pit.svg.j2 b/lokrez/templates/_covid/dark pit.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/dark pit.svg.j2
rename to lokrez/templates/_covid/dark pit.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/dark samus.svg.j2 b/lokrez/templates/_covid/dark samus.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/dark samus.svg.j2
rename to lokrez/templates/_covid/dark samus.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/diddy kong.svg.j2 b/lokrez/templates/_covid/diddy kong.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/diddy kong.svg.j2
rename to lokrez/templates/_covid/diddy kong.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/donkey kong.svg.j2 b/lokrez/templates/_covid/donkey kong.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/donkey kong.svg.j2
rename to lokrez/templates/_covid/donkey kong.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/dr mario.svg.j2 b/lokrez/templates/_covid/dr mario.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/dr mario.svg.j2
rename to lokrez/templates/_covid/dr mario.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/falco.svg.j2 b/lokrez/templates/_covid/falco.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/falco.svg.j2
rename to lokrez/templates/_covid/falco.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/fox.svg.j2 b/lokrez/templates/_covid/fox.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/fox.svg.j2
rename to lokrez/templates/_covid/fox.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/ganondorf.svg.j2 b/lokrez/templates/_covid/ganondorf.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/ganondorf.svg.j2
rename to lokrez/templates/_covid/ganondorf.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/greninja.svg.j2 b/lokrez/templates/_covid/greninja.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/greninja.svg.j2
rename to lokrez/templates/_covid/greninja.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/hero.svg.j2 b/lokrez/templates/_covid/hero.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/hero.svg.j2
rename to lokrez/templates/_covid/hero.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/ice climbers.svg.j2 b/lokrez/templates/_covid/ice climbers.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/ice climbers.svg.j2
rename to lokrez/templates/_covid/ice climbers.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/ike.svg.j2 b/lokrez/templates/_covid/ike.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/ike.svg.j2
rename to lokrez/templates/_covid/ike.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/incineroar.svg.j2 b/lokrez/templates/_covid/incineroar.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/incineroar.svg.j2
rename to lokrez/templates/_covid/incineroar.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/inkling.svg.j2 b/lokrez/templates/_covid/inkling.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/inkling.svg.j2
rename to lokrez/templates/_covid/inkling.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/isabelle.svg.j2 b/lokrez/templates/_covid/isabelle.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/isabelle.svg.j2
rename to lokrez/templates/_covid/isabelle.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/jigglypuff.svg.j2 b/lokrez/templates/_covid/jigglypuff.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/jigglypuff.svg.j2
rename to lokrez/templates/_covid/jigglypuff.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/joker.svg.j2 b/lokrez/templates/_covid/joker.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/joker.svg.j2
rename to lokrez/templates/_covid/joker.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/ken.svg.j2 b/lokrez/templates/_covid/ken.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/ken.svg.j2
rename to lokrez/templates/_covid/ken.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/king dedede.svg.j2 b/lokrez/templates/_covid/king dedede.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/king dedede.svg.j2
rename to lokrez/templates/_covid/king dedede.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/king k rool.svg.j2 b/lokrez/templates/_covid/king k rool.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/king k rool.svg.j2
rename to lokrez/templates/_covid/king k rool.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/kirby.svg.j2 b/lokrez/templates/_covid/kirby.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/kirby.svg.j2
rename to lokrez/templates/_covid/kirby.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/link.svg.j2 b/lokrez/templates/_covid/link.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/link.svg.j2
rename to lokrez/templates/_covid/link.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/list b/lokrez/templates/_covid/list
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/list
rename to lokrez/templates/_covid/list
diff --git a/lokrez/templates/rebootlyon2020/covid/little mac.svg.j2 b/lokrez/templates/_covid/little mac.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/little mac.svg.j2
rename to lokrez/templates/_covid/little mac.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/lucario.svg.j2 b/lokrez/templates/_covid/lucario.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/lucario.svg.j2
rename to lokrez/templates/_covid/lucario.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/lucas.svg.j2 b/lokrez/templates/_covid/lucas.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/lucas.svg.j2
rename to lokrez/templates/_covid/lucas.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/lucina.svg.j2 b/lokrez/templates/_covid/lucina.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/lucina.svg.j2
rename to lokrez/templates/_covid/lucina.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/luigi.svg.j2 b/lokrez/templates/_covid/luigi.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/luigi.svg.j2
rename to lokrez/templates/_covid/luigi.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/mario.svg.j2 b/lokrez/templates/_covid/mario.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/mario.svg.j2
rename to lokrez/templates/_covid/mario.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/marth.svg.j2 b/lokrez/templates/_covid/marth.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/marth.svg.j2
rename to lokrez/templates/_covid/marth.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/mega man.svg.j2 b/lokrez/templates/_covid/mega man.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/mega man.svg.j2
rename to lokrez/templates/_covid/mega man.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/meta knight.svg.j2 b/lokrez/templates/_covid/meta knight.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/meta knight.svg.j2
rename to lokrez/templates/_covid/meta knight.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/mewtwo.svg.j2 b/lokrez/templates/_covid/mewtwo.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/mewtwo.svg.j2
rename to lokrez/templates/_covid/mewtwo.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/min min.svg.j2 b/lokrez/templates/_covid/min min.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/min min.svg.j2
rename to lokrez/templates/_covid/min min.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/mr game and watch.svg.j2 b/lokrez/templates/_covid/mr game and watch.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/mr game and watch.svg.j2
rename to lokrez/templates/_covid/mr game and watch.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/ness.svg.j2 b/lokrez/templates/_covid/ness.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/ness.svg.j2
rename to lokrez/templates/_covid/ness.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/olimar.svg.j2 b/lokrez/templates/_covid/olimar.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/olimar.svg.j2
rename to lokrez/templates/_covid/olimar.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/pacman.svg.j2 b/lokrez/templates/_covid/pacman.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/pacman.svg.j2
rename to lokrez/templates/_covid/pacman.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/palutena.svg.j2 b/lokrez/templates/_covid/palutena.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/palutena.svg.j2
rename to lokrez/templates/_covid/palutena.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/peach.svg.j2 b/lokrez/templates/_covid/peach.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/peach.svg.j2
rename to lokrez/templates/_covid/peach.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/pichu.svg.j2 b/lokrez/templates/_covid/pichu.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/pichu.svg.j2
rename to lokrez/templates/_covid/pichu.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/pikachu.svg.j2 b/lokrez/templates/_covid/pikachu.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/pikachu.svg.j2
rename to lokrez/templates/_covid/pikachu.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/pit.svg.j2 b/lokrez/templates/_covid/pit.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/pit.svg.j2
rename to lokrez/templates/_covid/pit.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/pokemon trainer f.svg.j2 b/lokrez/templates/_covid/pokemon trainer f.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/pokemon trainer f.svg.j2
rename to lokrez/templates/_covid/pokemon trainer f.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/pokemon trainer m.svg.j2 b/lokrez/templates/_covid/pokemon trainer m.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/pokemon trainer m.svg.j2
rename to lokrez/templates/_covid/pokemon trainer m.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/richter.svg.j2 b/lokrez/templates/_covid/richter.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/richter.svg.j2
rename to lokrez/templates/_covid/richter.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/ridley.svg.j2 b/lokrez/templates/_covid/ridley.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/ridley.svg.j2
rename to lokrez/templates/_covid/ridley.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/robin f.svg.j2 b/lokrez/templates/_covid/robin f.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/robin f.svg.j2
rename to lokrez/templates/_covid/robin f.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/robin m.svg.j2 b/lokrez/templates/_covid/robin m.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/robin m.svg.j2
rename to lokrez/templates/_covid/robin m.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/rosalina and luma.svg.j2 b/lokrez/templates/_covid/rosalina and luma.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/rosalina and luma.svg.j2
rename to lokrez/templates/_covid/rosalina and luma.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/roy.svg.j2 b/lokrez/templates/_covid/roy.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/roy.svg.j2
rename to lokrez/templates/_covid/roy.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/ryu.svg.j2 b/lokrez/templates/_covid/ryu.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/ryu.svg.j2
rename to lokrez/templates/_covid/ryu.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/samus.svg.j2 b/lokrez/templates/_covid/samus.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/samus.svg.j2
rename to lokrez/templates/_covid/samus.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/sheik.svg.j2 b/lokrez/templates/_covid/sheik.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/sheik.svg.j2
rename to lokrez/templates/_covid/sheik.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/shulk.svg.j2 b/lokrez/templates/_covid/shulk.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/shulk.svg.j2
rename to lokrez/templates/_covid/shulk.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/simon.svg.j2 b/lokrez/templates/_covid/simon.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/simon.svg.j2
rename to lokrez/templates/_covid/simon.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/snake.svg.j2 b/lokrez/templates/_covid/snake.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/snake.svg.j2
rename to lokrez/templates/_covid/snake.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/sonic.svg.j2 b/lokrez/templates/_covid/sonic.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/sonic.svg.j2
rename to lokrez/templates/_covid/sonic.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/terry.svg.j2 b/lokrez/templates/_covid/terry.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/terry.svg.j2
rename to lokrez/templates/_covid/terry.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/toon link.svg.j2 b/lokrez/templates/_covid/toon link.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/toon link.svg.j2
rename to lokrez/templates/_covid/toon link.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/villager.svg.j2 b/lokrez/templates/_covid/villager.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/villager.svg.j2
rename to lokrez/templates/_covid/villager.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/wario.svg.j2 b/lokrez/templates/_covid/wario.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/wario.svg.j2
rename to lokrez/templates/_covid/wario.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/wii fit trainer f.svg.j2 b/lokrez/templates/_covid/wii fit trainer f.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/wii fit trainer f.svg.j2
rename to lokrez/templates/_covid/wii fit trainer f.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/wii fit trainer m.svg.j2 b/lokrez/templates/_covid/wii fit trainer m.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/wii fit trainer m.svg.j2
rename to lokrez/templates/_covid/wii fit trainer m.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/wolf.svg.j2 b/lokrez/templates/_covid/wolf.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/wolf.svg.j2
rename to lokrez/templates/_covid/wolf.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/yoshi.svg.j2 b/lokrez/templates/_covid/yoshi.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/yoshi.svg.j2
rename to lokrez/templates/_covid/yoshi.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/young link.svg.j2 b/lokrez/templates/_covid/young link.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/young link.svg.j2
rename to lokrez/templates/_covid/young link.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/zelda.svg.j2 b/lokrez/templates/_covid/zelda.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/zelda.svg.j2
rename to lokrez/templates/_covid/zelda.svg.j2
diff --git a/lokrez/templates/rebootlyon2020/covid/zero suit samus.svg.j2 b/lokrez/templates/_covid/zero suit samus.svg.j2
similarity index 100%
rename from lokrez/templates/rebootlyon2020/covid/zero suit samus.svg.j2
rename to lokrez/templates/_covid/zero suit samus.svg.j2
diff --git a/lokrez/templates/confismash/characters_corrections.j2 b/lokrez/templates/confismash/characters_corrections.j2
index 4f5348c..b154404 100644
--- a/lokrez/templates/confismash/characters_corrections.j2
+++ b/lokrez/templates/confismash/characters_corrections.j2
@@ -60,7 +60,7 @@
     "little mac": { "default": (-20, 5) },
     "lucario": { "default": (-10, -3) },
     "lucas": { "default": (-14, -5) },
-    "lucina": { "default": (-63, 2) },
+    "lucina": { "default": (-83, 2) },
     "luigi": { "default": (-5, 3) },
     "mario": { "default": (-10, -10) },
     "marth": { "default": (-70, -3) },
diff --git a/lokrez/templates/confismash/template.svg.j2 b/lokrez/templates/confismash/template.svg.j2
index bc01657..8390cc0 100644
--- a/lokrez/templates/confismash/template.svg.j2
+++ b/lokrez/templates/confismash/template.svg.j2
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 {% import "confismash/characters_corrections.j2" as charcorr %}
+{% if "covid" in options %}
+{% import "_covid/covid.j2" as covid %}
+{% endif %}
 <svg
    xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
@@ -2150,6 +2153,22 @@
             x="{{ (1/( 0.08869 * charcorr.charcorr[ players[1].get_mains()[0][0] ].get( players[1].get_mains()[0][1], charcorr.charcorr[ players[1].get_mains()[0][0] ]["default"] )[2] if charcorr.charcorr[ players[1].get_mains()[0][0] ].get( players[1].get_mains()[0][1], charcorr.charcorr[ players[1].get_mains()[0][0] ]["default"] )[2] else 0.08869 ))*(725.54163 + charcorr.charcorr[ players[1].get_mains()[0][0] ].get( players[1].get_mains()[0][1], charcorr.charcorr[ players[1].get_mains()[0][0] ]["default"] )[0]) }}"
             y="{{ (1/( 0.08869 * charcorr.charcorr[ players[1].get_mains()[0][0] ].get( players[1].get_mains()[0][1], charcorr.charcorr[ players[1].get_mains()[0][0] ]["default"] )[2] if charcorr.charcorr[ players[1].get_mains()[0][0] ].get( players[1].get_mains()[0][1], charcorr.charcorr[ players[1].get_mains()[0][0] ]["default"] )[2] else 0.08869 ))*(143.36404  + charcorr.charcorr[ players[1].get_mains()[0][0] ].get( players[1].get_mains()[0][1], charcorr.charcorr[ players[1].get_mains()[0][0] ]["default"] )[1]) }}"
             />
+     {% if "covid" in options %}
+     <g
+         transform="
+                    {% if charcorr.charcorr[ players[1].get_mains()[0][0] ].get( players[1].get_mains()[0][1], charcorr.charcorr[ players[1].get_mains()[0][0] ]["default"] )[2] %}
+                    scale({{ 0.08869 * ( charcorr.charcorr[ players[1].get_mains()[0][0] ].get( players[1].get_mains()[0][1], charcorr.charcorr[ players[1].get_mains()[0][0] ]["default"] )[2] )}})
+                    {% else %}
+                    scale({{0.08869}})
+                    {% endif %}
+                    translate(
+                        {{ (1/( 0.08869 * charcorr.charcorr[ players[1].get_mains()[0][0] ].get( players[1].get_mains()[0][1], charcorr.charcorr[ players[1].get_mains()[0][0] ]["default"] )[2] if charcorr.charcorr[ players[1].get_mains()[0][0] ].get( players[1].get_mains()[0][1], charcorr.charcorr[ players[1].get_mains()[0][0] ]["default"] )[2] else 0.08869 ))*(725.54163 + charcorr.charcorr[ players[1].get_mains()[0][0] ].get( players[1].get_mains()[0][1], charcorr.charcorr[ players[1].get_mains()[0][0] ]["default"] )[0]) }}
+                        {{ (1/( 0.08869 * charcorr.charcorr[ players[1].get_mains()[0][0] ].get( players[1].get_mains()[0][1], charcorr.charcorr[ players[1].get_mains()[0][0] ]["default"] )[2] if charcorr.charcorr[ players[1].get_mains()[0][0] ].get( players[1].get_mains()[0][1], charcorr.charcorr[ players[1].get_mains()[0][0] ]["default"] )[2] else 0.08869 ))*(143.36404  + charcorr.charcorr[ players[1].get_mains()[0][0] ].get( players[1].get_mains()[0][1], charcorr.charcorr[ players[1].get_mains()[0][0] ]["default"] )[1]) }}
+                       )"
+         >
+         {% include "_covid/{}.svg.j2".format(covid.masks_filenames[players[1].get_mains()[0][0]][players[1].get_mains()[0][1]]) ignore missing %}
+      </g>
+     {% endif %}
       </g>
       <path
          style="fill:url(#linearGradient1903);fill-opacity:1;stroke-width:0.0494766;stop-color:#000000"
@@ -2413,6 +2432,22 @@
             x="{{ (1/( 0.08869 * charcorr.charcorr[ players[2].get_mains()[0][0] ].get( players[2].get_mains()[0][1], charcorr.charcorr[ players[2].get_mains()[0][0] ]["default"] )[2] if charcorr.charcorr[ players[2].get_mains()[0][0] ].get( players[2].get_mains()[0][1], charcorr.charcorr[ players[2].get_mains()[0][0] ]["default"] )[2] else 0.08869 ))*(725.54163 + charcorr.charcorr[ players[2].get_mains()[0][0] ].get( players[2].get_mains()[0][1], charcorr.charcorr[ players[2].get_mains()[0][0] ]["default"] )[0]) }}"
             y="{{ (1/( 0.08869 * charcorr.charcorr[ players[2].get_mains()[0][0] ].get( players[2].get_mains()[0][1], charcorr.charcorr[ players[2].get_mains()[0][0] ]["default"] )[2] if charcorr.charcorr[ players[2].get_mains()[0][0] ].get( players[2].get_mains()[0][1], charcorr.charcorr[ players[2].get_mains()[0][0] ]["default"] )[2] else 0.08869 ))*(143.36404  + charcorr.charcorr[ players[2].get_mains()[0][0] ].get( players[2].get_mains()[0][1], charcorr.charcorr[ players[2].get_mains()[0][0] ]["default"] )[1]) }}"
             />
+     {% if "covid" in options %}
+     <g
+         transform="
+                    {% if charcorr.charcorr[ players[2].get_mains()[0][0] ].get( players[2].get_mains()[0][1], charcorr.charcorr[ players[2].get_mains()[0][0] ]["default"] )[2] %}
+                    scale({{ 0.08869 * ( charcorr.charcorr[ players[2].get_mains()[0][0] ].get( players[2].get_mains()[0][1], charcorr.charcorr[ players[2].get_mains()[0][0] ]["default"] )[2] )}})
+                    {% else %}
+                    scale({{0.08869}})
+                    {% endif %}
+                    translate(
+                        {{ (1/( 0.08869 * charcorr.charcorr[ players[2].get_mains()[0][0] ].get( players[2].get_mains()[0][1], charcorr.charcorr[ players[2].get_mains()[0][0] ]["default"] )[2] if charcorr.charcorr[ players[2].get_mains()[0][0] ].get( players[2].get_mains()[0][1], charcorr.charcorr[ players[2].get_mains()[0][0] ]["default"] )[2] else 0.08869 ))*(725.54163 + charcorr.charcorr[ players[2].get_mains()[0][0] ].get( players[2].get_mains()[0][1], charcorr.charcorr[ players[2].get_mains()[0][0] ]["default"] )[0]) }}
+                        {{ (1/( 0.08869 * charcorr.charcorr[ players[2].get_mains()[0][0] ].get( players[2].get_mains()[0][1], charcorr.charcorr[ players[2].get_mains()[0][0] ]["default"] )[2] if charcorr.charcorr[ players[2].get_mains()[0][0] ].get( players[2].get_mains()[0][1], charcorr.charcorr[ players[2].get_mains()[0][0] ]["default"] )[2] else 0.08869 ))*(143.36404  + charcorr.charcorr[ players[2].get_mains()[0][0] ].get( players[2].get_mains()[0][1], charcorr.charcorr[ players[2].get_mains()[0][0] ]["default"] )[1]) }}
+                       )"
+         >
+         {% include "_covid/{}.svg.j2".format(covid.masks_filenames[players[2].get_mains()[0][0]][players[2].get_mains()[0][1]]) ignore missing %}
+      </g>
+     {% endif %}
       </g>
       <path
          style="opacity:1;fill:url(#linearGradient1903-0);fill-opacity:1;stroke-width:0.0525142;stop-color:#000000"
@@ -2545,6 +2580,22 @@
             x="{{ (1/( 0.08869 * charcorr.charcorr[ players[3].get_mains()[0][0] ].get( players[3].get_mains()[0][1], charcorr.charcorr[ players[3].get_mains()[0][0] ]["default"] )[2] if charcorr.charcorr[ players[3].get_mains()[0][0] ].get( players[3].get_mains()[0][1], charcorr.charcorr[ players[3].get_mains()[0][0] ]["default"] )[2] else 0.08869 ))*(725.54163 + charcorr.charcorr[ players[3].get_mains()[0][0] ].get( players[3].get_mains()[0][1], charcorr.charcorr[ players[3].get_mains()[0][0] ]["default"] )[0]) }}"
             y="{{ (1/( 0.08869 * charcorr.charcorr[ players[3].get_mains()[0][0] ].get( players[3].get_mains()[0][1], charcorr.charcorr[ players[3].get_mains()[0][0] ]["default"] )[2] if charcorr.charcorr[ players[3].get_mains()[0][0] ].get( players[3].get_mains()[0][1], charcorr.charcorr[ players[3].get_mains()[0][0] ]["default"] )[2] else 0.08869 ))*(143.36404  + charcorr.charcorr[ players[3].get_mains()[0][0] ].get( players[3].get_mains()[0][1], charcorr.charcorr[ players[3].get_mains()[0][0] ]["default"] )[1]) }}"
             />
+     {% if "covid" in options %}
+     <g
+         transform="
+                    {% if charcorr.charcorr[ players[3].get_mains()[0][0] ].get( players[3].get_mains()[0][1], charcorr.charcorr[ players[3].get_mains()[0][0] ]["default"] )[2] %}
+                    scale({{ 0.08869 * ( charcorr.charcorr[ players[3].get_mains()[0][0] ].get( players[3].get_mains()[0][1], charcorr.charcorr[ players[3].get_mains()[0][0] ]["default"] )[2] )}})
+                    {% else %}
+                    scale({{0.08869}})
+                    {% endif %}
+                    translate(
+                        {{ (1/( 0.08869 * charcorr.charcorr[ players[3].get_mains()[0][0] ].get( players[3].get_mains()[0][1], charcorr.charcorr[ players[3].get_mains()[0][0] ]["default"] )[2] if charcorr.charcorr[ players[3].get_mains()[0][0] ].get( players[3].get_mains()[0][1], charcorr.charcorr[ players[3].get_mains()[0][0] ]["default"] )[2] else 0.08869 ))*(725.54163 + charcorr.charcorr[ players[3].get_mains()[0][0] ].get( players[3].get_mains()[0][1], charcorr.charcorr[ players[3].get_mains()[0][0] ]["default"] )[0]) }}
+                        {{ (1/( 0.08869 * charcorr.charcorr[ players[3].get_mains()[0][0] ].get( players[3].get_mains()[0][1], charcorr.charcorr[ players[3].get_mains()[0][0] ]["default"] )[2] if charcorr.charcorr[ players[3].get_mains()[0][0] ].get( players[3].get_mains()[0][1], charcorr.charcorr[ players[3].get_mains()[0][0] ]["default"] )[2] else 0.08869 ))*(143.36404  + charcorr.charcorr[ players[3].get_mains()[0][0] ].get( players[3].get_mains()[0][1], charcorr.charcorr[ players[3].get_mains()[0][0] ]["default"] )[1]) }}
+                       )"
+         >
+         {% include "_covid/{}.svg.j2".format(covid.masks_filenames[players[3].get_mains()[0][0]][players[3].get_mains()[0][1]]) ignore missing %}
+      </g>
+     {% endif %}
       </g>
       <path
          style="opacity:1;fill:url(#linearGradient1903-5-9);fill-opacity:1;stroke-width:0.0528054;stop-color:#000000"
@@ -2668,6 +2719,22 @@
             x="{{ (1/( 0.08869 * charcorr.charcorr[ players[4].get_mains()[0][0] ].get( players[4].get_mains()[0][1], charcorr.charcorr[ players[4].get_mains()[0][0] ]["default"] )[2] if charcorr.charcorr[ players[4].get_mains()[0][0] ].get( players[4].get_mains()[0][1], charcorr.charcorr[ players[4].get_mains()[0][0] ]["default"] )[2] else 0.08869 ))*(725.54163 + charcorr.charcorr[ players[4].get_mains()[0][0] ].get( players[4].get_mains()[0][1], charcorr.charcorr[ players[4].get_mains()[0][0] ]["default"] )[0]) }}"
             y="{{ (1/( 0.08869 * charcorr.charcorr[ players[4].get_mains()[0][0] ].get( players[4].get_mains()[0][1], charcorr.charcorr[ players[4].get_mains()[0][0] ]["default"] )[2] if charcorr.charcorr[ players[4].get_mains()[0][0] ].get( players[4].get_mains()[0][1], charcorr.charcorr[ players[4].get_mains()[0][0] ]["default"] )[2] else 0.08869 ))*(143.36404  + charcorr.charcorr[ players[4].get_mains()[0][0] ].get( players[4].get_mains()[0][1], charcorr.charcorr[ players[4].get_mains()[0][0] ]["default"] )[1]) }}"
             />
+     {% if "covid" in options %}
+     <g
+         transform="
+                    {% if charcorr.charcorr[ players[4].get_mains()[0][0] ].get( players[4].get_mains()[0][1], charcorr.charcorr[ players[4].get_mains()[0][0] ]["default"] )[2] %}
+                    scale({{ 0.08869 * ( charcorr.charcorr[ players[4].get_mains()[0][0] ].get( players[4].get_mains()[0][1], charcorr.charcorr[ players[4].get_mains()[0][0] ]["default"] )[2] )}})
+                    {% else %}
+                    scale({{0.08869}})
+                    {% endif %}
+                    translate(
+                        {{ (1/( 0.08869 * charcorr.charcorr[ players[4].get_mains()[0][0] ].get( players[4].get_mains()[0][1], charcorr.charcorr[ players[4].get_mains()[0][0] ]["default"] )[2] if charcorr.charcorr[ players[4].get_mains()[0][0] ].get( players[4].get_mains()[0][1], charcorr.charcorr[ players[4].get_mains()[0][0] ]["default"] )[2] else 0.08869 ))*(725.54163 + charcorr.charcorr[ players[4].get_mains()[0][0] ].get( players[4].get_mains()[0][1], charcorr.charcorr[ players[4].get_mains()[0][0] ]["default"] )[0]) }}
+                        {{ (1/( 0.08869 * charcorr.charcorr[ players[4].get_mains()[0][0] ].get( players[4].get_mains()[0][1], charcorr.charcorr[ players[4].get_mains()[0][0] ]["default"] )[2] if charcorr.charcorr[ players[4].get_mains()[0][0] ].get( players[4].get_mains()[0][1], charcorr.charcorr[ players[4].get_mains()[0][0] ]["default"] )[2] else 0.08869 ))*(143.36404  + charcorr.charcorr[ players[4].get_mains()[0][0] ].get( players[4].get_mains()[0][1], charcorr.charcorr[ players[4].get_mains()[0][0] ]["default"] )[1]) }}
+                       )"
+         >
+         {% include "_covid/{}.svg.j2".format(covid.masks_filenames[players[4].get_mains()[0][0]][players[4].get_mains()[0][1]]) ignore missing %}
+      </g>
+     {% endif %}
       </g>
       <path
          style="opacity:1;fill:url(#linearGradient1903-5-9-9);fill-opacity:1;stroke-width:0.0541005;stop-color:#000000"
@@ -2788,6 +2855,22 @@
             x="{{ (1/( 0.08869 * charcorr.charcorr[ players[5].get_mains()[0][0] ].get( players[5].get_mains()[0][1], charcorr.charcorr[ players[5].get_mains()[0][0] ]["default"] )[2] if charcorr.charcorr[ players[5].get_mains()[0][0] ].get( players[5].get_mains()[0][1], charcorr.charcorr[ players[5].get_mains()[0][0] ]["default"] )[2] else 0.08869 ))*(725.54163 + charcorr.charcorr[ players[5].get_mains()[0][0] ].get( players[5].get_mains()[0][1], charcorr.charcorr[ players[5].get_mains()[0][0] ]["default"] )[0]) }}"
             y="{{ (1/( 0.08869 * charcorr.charcorr[ players[5].get_mains()[0][0] ].get( players[5].get_mains()[0][1], charcorr.charcorr[ players[5].get_mains()[0][0] ]["default"] )[2] if charcorr.charcorr[ players[5].get_mains()[0][0] ].get( players[5].get_mains()[0][1], charcorr.charcorr[ players[5].get_mains()[0][0] ]["default"] )[2] else 0.08869 ))*(143.36404  + charcorr.charcorr[ players[5].get_mains()[0][0] ].get( players[5].get_mains()[0][1], charcorr.charcorr[ players[5].get_mains()[0][0] ]["default"] )[1]) }}"
             />
+     {% if "covid" in options %}
+     <g
+         transform="
+                    {% if charcorr.charcorr[ players[5].get_mains()[0][0] ].get( players[5].get_mains()[0][1], charcorr.charcorr[ players[5].get_mains()[0][0] ]["default"] )[2] %}
+                    scale({{ 0.08869 * ( charcorr.charcorr[ players[5].get_mains()[0][0] ].get( players[5].get_mains()[0][1], charcorr.charcorr[ players[5].get_mains()[0][0] ]["default"] )[2] )}})
+                    {% else %}
+                    scale({{0.08869}})
+                    {% endif %}
+                    translate(
+                        {{ (1/( 0.08869 * charcorr.charcorr[ players[5].get_mains()[0][0] ].get( players[5].get_mains()[0][1], charcorr.charcorr[ players[5].get_mains()[0][0] ]["default"] )[2] if charcorr.charcorr[ players[5].get_mains()[0][0] ].get( players[5].get_mains()[0][1], charcorr.charcorr[ players[5].get_mains()[0][0] ]["default"] )[2] else 0.08869 ))*(725.54163 + charcorr.charcorr[ players[5].get_mains()[0][0] ].get( players[5].get_mains()[0][1], charcorr.charcorr[ players[5].get_mains()[0][0] ]["default"] )[0]) }}
+                        {{ (1/( 0.08869 * charcorr.charcorr[ players[5].get_mains()[0][0] ].get( players[5].get_mains()[0][1], charcorr.charcorr[ players[5].get_mains()[0][0] ]["default"] )[2] if charcorr.charcorr[ players[5].get_mains()[0][0] ].get( players[5].get_mains()[0][1], charcorr.charcorr[ players[5].get_mains()[0][0] ]["default"] )[2] else 0.08869 ))*(143.36404  + charcorr.charcorr[ players[5].get_mains()[0][0] ].get( players[5].get_mains()[0][1], charcorr.charcorr[ players[5].get_mains()[0][0] ]["default"] )[1]) }}
+                       )"
+         >
+         {% include "_covid/{}.svg.j2".format(covid.masks_filenames[players[5].get_mains()[0][0]][players[5].get_mains()[0][1]]) ignore missing %}
+      </g>
+     {% endif %}
       </g>
       <path
          style="opacity:1;fill:url(#linearGradient1903-5-9-9-6);fill-opacity:1;stroke-width:0.0541005;stop-color:#000000"
@@ -2911,6 +2994,22 @@
             x="{{ (1/( 0.08869 * charcorr.charcorr[ players[6].get_mains()[0][0] ].get( players[6].get_mains()[0][1], charcorr.charcorr[ players[6].get_mains()[0][0] ]["default"] )[2] if charcorr.charcorr[ players[6].get_mains()[0][0] ].get( players[6].get_mains()[0][1], charcorr.charcorr[ players[6].get_mains()[0][0] ]["default"] )[2] else 0.08869 ))*(725.54163 + charcorr.charcorr[ players[6].get_mains()[0][0] ].get( players[6].get_mains()[0][1], charcorr.charcorr[ players[6].get_mains()[0][0] ]["default"] )[0]) }}"
             y="{{ (1/( 0.08869 * charcorr.charcorr[ players[6].get_mains()[0][0] ].get( players[6].get_mains()[0][1], charcorr.charcorr[ players[6].get_mains()[0][0] ]["default"] )[2] if charcorr.charcorr[ players[6].get_mains()[0][0] ].get( players[6].get_mains()[0][1], charcorr.charcorr[ players[6].get_mains()[0][0] ]["default"] )[2] else 0.08869 ))*(143.36404  + charcorr.charcorr[ players[6].get_mains()[0][0] ].get( players[6].get_mains()[0][1], charcorr.charcorr[ players[6].get_mains()[0][0] ]["default"] )[1]) }}"
             />
+     {% if "covid" in options %}
+     <g
+         transform="
+                    {% if charcorr.charcorr[ players[6].get_mains()[0][0] ].get( players[6].get_mains()[0][1], charcorr.charcorr[ players[6].get_mains()[0][0] ]["default"] )[2] %}
+                    scale({{ 0.08869 * ( charcorr.charcorr[ players[6].get_mains()[0][0] ].get( players[6].get_mains()[0][1], charcorr.charcorr[ players[6].get_mains()[0][0] ]["default"] )[2] )}})
+                    {% else %}
+                    scale({{0.08869}})
+                    {% endif %}
+                    translate(
+                        {{ (1/( 0.08869 * charcorr.charcorr[ players[6].get_mains()[0][0] ].get( players[6].get_mains()[0][1], charcorr.charcorr[ players[6].get_mains()[0][0] ]["default"] )[2] if charcorr.charcorr[ players[6].get_mains()[0][0] ].get( players[6].get_mains()[0][1], charcorr.charcorr[ players[6].get_mains()[0][0] ]["default"] )[2] else 0.08869 ))*(725.54163 + charcorr.charcorr[ players[6].get_mains()[0][0] ].get( players[6].get_mains()[0][1], charcorr.charcorr[ players[6].get_mains()[0][0] ]["default"] )[0]) }}
+                        {{ (1/( 0.08869 * charcorr.charcorr[ players[6].get_mains()[0][0] ].get( players[6].get_mains()[0][1], charcorr.charcorr[ players[6].get_mains()[0][0] ]["default"] )[2] if charcorr.charcorr[ players[6].get_mains()[0][0] ].get( players[6].get_mains()[0][1], charcorr.charcorr[ players[6].get_mains()[0][0] ]["default"] )[2] else 0.08869 ))*(143.36404  + charcorr.charcorr[ players[6].get_mains()[0][0] ].get( players[6].get_mains()[0][1], charcorr.charcorr[ players[6].get_mains()[0][0] ]["default"] )[1]) }}
+                       )"
+         >
+         {% include "_covid/{}.svg.j2".format(covid.masks_filenames[players[6].get_mains()[0][0]][players[6].get_mains()[0][1]]) ignore missing %}
+      </g>
+     {% endif %}
       </g>
       <path
          style="opacity:1;fill:url(#linearGradient1903-5-9-9-6-4);fill-opacity:1;stroke-width:0.0557806;stop-color:#000000"
@@ -3033,6 +3132,22 @@
             x="{{ (1/( 0.08869 * charcorr.charcorr[ players[7].get_mains()[0][0] ].get( players[7].get_mains()[0][1], charcorr.charcorr[ players[7].get_mains()[0][0] ]["default"] )[2] if charcorr.charcorr[ players[7].get_mains()[0][0] ].get( players[7].get_mains()[0][1], charcorr.charcorr[ players[7].get_mains()[0][0] ]["default"] )[2] else 0.08869 ))*(725.54163 + charcorr.charcorr[ players[7].get_mains()[0][0] ].get( players[7].get_mains()[0][1], charcorr.charcorr[ players[7].get_mains()[0][0] ]["default"] )[0]) }}"
             y="{{ (1/( 0.08869 * charcorr.charcorr[ players[7].get_mains()[0][0] ].get( players[7].get_mains()[0][1], charcorr.charcorr[ players[7].get_mains()[0][0] ]["default"] )[2] if charcorr.charcorr[ players[7].get_mains()[0][0] ].get( players[7].get_mains()[0][1], charcorr.charcorr[ players[7].get_mains()[0][0] ]["default"] )[2] else 0.08869 ))*(143.36404  + charcorr.charcorr[ players[7].get_mains()[0][0] ].get( players[7].get_mains()[0][1], charcorr.charcorr[ players[7].get_mains()[0][0] ]["default"] )[1]) }}"
             />
+     {% if "covid" in options %}
+     <g
+         transform="
+                    {% if charcorr.charcorr[ players[7].get_mains()[0][0] ].get( players[7].get_mains()[0][1], charcorr.charcorr[ players[7].get_mains()[0][0] ]["default"] )[2] %}
+                    scale({{ 0.08869 * ( charcorr.charcorr[ players[7].get_mains()[0][0] ].get( players[7].get_mains()[0][1], charcorr.charcorr[ players[7].get_mains()[0][0] ]["default"] )[2] )}})
+                    {% else %}
+                    scale({{0.08869}})
+                    {% endif %}
+                    translate(
+                        {{ (1/( 0.08869 * charcorr.charcorr[ players[7].get_mains()[0][0] ].get( players[7].get_mains()[0][1], charcorr.charcorr[ players[7].get_mains()[0][0] ]["default"] )[2] if charcorr.charcorr[ players[7].get_mains()[0][0] ].get( players[7].get_mains()[0][1], charcorr.charcorr[ players[7].get_mains()[0][0] ]["default"] )[2] else 0.08869 ))*(725.54163 + charcorr.charcorr[ players[7].get_mains()[0][0] ].get( players[7].get_mains()[0][1], charcorr.charcorr[ players[7].get_mains()[0][0] ]["default"] )[0]) }}
+                        {{ (1/( 0.08869 * charcorr.charcorr[ players[7].get_mains()[0][0] ].get( players[7].get_mains()[0][1], charcorr.charcorr[ players[7].get_mains()[0][0] ]["default"] )[2] if charcorr.charcorr[ players[7].get_mains()[0][0] ].get( players[7].get_mains()[0][1], charcorr.charcorr[ players[7].get_mains()[0][0] ]["default"] )[2] else 0.08869 ))*(143.36404  + charcorr.charcorr[ players[7].get_mains()[0][0] ].get( players[7].get_mains()[0][1], charcorr.charcorr[ players[7].get_mains()[0][0] ]["default"] )[1]) }}
+                       )"
+         >
+         {% include "_covid/{}.svg.j2".format(covid.masks_filenames[players[7].get_mains()[0][0]][players[7].get_mains()[0][1]]) ignore missing %}
+      </g>
+     {% endif %}
       </g>
       <path
          style="opacity:1;fill:url(#linearGradient1903-5-9-9-6-4-6);fill-opacity:1;stroke-width:0.0557806;stop-color:#000000"
@@ -3167,6 +3282,18 @@
             x="{{ (1/( 0.08869 * charcorr.charcorr[ players[0].get_mains()[0][0] ].get( players[0].get_mains()[0][1], charcorr.charcorr[ players[0].get_mains()[0][0] ]["default"] )[2] if charcorr.charcorr[ players[0].get_mains()[0][0] ].get( players[0].get_mains()[0][1], charcorr.charcorr[ players[0].get_mains()[0][0] ]["default"] )[2] else 0.08869 ))*(725.54163 + charcorr.charcorr[ players[0].get_mains()[0][0] ].get( players[0].get_mains()[0][1], charcorr.charcorr[ players[0].get_mains()[0][0] ]["default"] )[0]) }}"
             y="{{ (1/( 0.08869 * charcorr.charcorr[ players[0].get_mains()[0][0] ].get( players[0].get_mains()[0][1], charcorr.charcorr[ players[0].get_mains()[0][0] ]["default"] )[2] if charcorr.charcorr[ players[0].get_mains()[0][0] ].get( players[0].get_mains()[0][1], charcorr.charcorr[ players[0].get_mains()[0][0] ]["default"] )[2] else 0.08869 ))*(143.36404 + charcorr.charcorr[ players[0].get_mains()[0][0] ].get( players[0].get_mains()[0][1], charcorr.charcorr[ players[0].get_mains()[0][0] ]["default"] )[1]) }}"
             />
+     {% if "covid" in options %}
+     <g
+         transform="
+                    scale({{( 0.08869 * charcorr.charcorr[ players[0].get_mains()[0][0] ].get( players[0].get_mains()[0][1], charcorr.charcorr[ players[0].get_mains()[0][0] ]["default"] )[2] if charcorr.charcorr[ players[0].get_mains()[0][0] ].get( players[0].get_mains()[0][1], charcorr.charcorr[ players[0].get_mains()[0][0] ]["default"] )[2] else 0.08869 )}})
+                    translate(
+                        {{ (1/( 0.08869 * charcorr.charcorr[ players[0].get_mains()[0][0] ].get( players[0].get_mains()[0][1], charcorr.charcorr[ players[0].get_mains()[0][0] ]["default"] )[2] if charcorr.charcorr[ players[0].get_mains()[0][0] ].get( players[0].get_mains()[0][1], charcorr.charcorr[ players[0].get_mains()[0][0] ]["default"] )[2] else 0.08869 ))*(725.54163 + charcorr.charcorr[ players[0].get_mains()[0][0] ].get( players[0].get_mains()[0][1], charcorr.charcorr[ players[0].get_mains()[0][0] ]["default"] )[0]) }}
+                        {{ (1/( 0.08869 * charcorr.charcorr[ players[0].get_mains()[0][0] ].get( players[0].get_mains()[0][1], charcorr.charcorr[ players[0].get_mains()[0][0] ]["default"] )[2] if charcorr.charcorr[ players[0].get_mains()[0][0] ].get( players[0].get_mains()[0][1], charcorr.charcorr[ players[0].get_mains()[0][0] ]["default"] )[2] else 0.08869 ))*(143.36404 + charcorr.charcorr[ players[0].get_mains()[0][0] ].get( players[0].get_mains()[0][1], charcorr.charcorr[ players[0].get_mains()[0][0] ]["default"] )[1]) }}
+                       )"
+         >
+         {% include "_covid/{}.svg.j2".format(covid.masks_filenames[players[0].get_mains()[0][0]][players[0].get_mains()[0][1]]) ignore missing %}
+      </g>
+     {% endif %}
       </g>
       <path
          style="opacity:1;fill:url(#linearGradient1903-5);fill-opacity:1;stroke-width:0.0486402;stop-color:#000000"
diff --git a/lokrez/templates/rebootlyon2020/template.svg.j2 b/lokrez/templates/rebootlyon2020/template.svg.j2
index 9fca3f4..d7e114b 100644
--- a/lokrez/templates/rebootlyon2020/template.svg.j2
+++ b/lokrez/templates/rebootlyon2020/template.svg.j2
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 {% import "rebootlyon2020/characters_corrections.j2" as charcorr %}
 {% if "covid" in options %}
-{% import "rebootlyon2020/covid/covid.j2" as covid %}
+{% import "_covid/covid.j2" as covid %}
 {% endif %}
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
@@ -837,7 +837,7 @@
                        {{ "{:.5f}".format((1/(0.07 if loop.index == 1 else 0.0615))*( (114 if loop.index==1 else 124) + charcorr.charcorr[p.get_mains()[0][0]].get( p.get_mains()[0][1], charcorr.charcorr[ p.get_mains()[0][0] ]["default"] )[1] )) }}
                        )"
          >
-         {% include "rebootlyon2020/covid/{}.svg.j2".format(covid.masks_filenames[p.get_mains()[0][0]][p.get_mains()[0][1]]) ignore missing %}
+         {% include "_covid/{}.svg.j2".format(covid.masks_filenames[p.get_mains()[0][0]][p.get_mains()[0][1]]) ignore missing %}
       </g>
      {% endif %}
         <rect