Merge branch 'add-books' into 'master'

ajout mangas and co

See merge request !3

5 files changed, 851 insertions, 27 deletions

diff --git a/src/main/scala/reading/Books.scala b/src/main/scala/reading/Books.scala
index 3f88daf..68ca93c 100644
--- a/src/main/scala/reading/Books.scala
+++ b/src/main/scala/reading/Books.scala
@@ -333,7 +333,7 @@ object Books {
       year = "1977",
       period = None,
       genres = Seq(Comique),
-      themes = Seq(Humour, Famille, Animaux),
+      themes = Seq(Humour, Famille, Animal),
       programs = Seq(Resister),
       level = Facile
     ),
@@ -629,7 +629,7 @@ object Books {
       parts = 5,
       period = None,
       genres = Seq(Fantastique),
-      themes = Seq(Animaux, Nature),
+      themes = Seq(Animal, Nature),
       programs = Seq(),
       level = Moyen
     ),
@@ -878,7 +878,7 @@ object Books {
       parts = 7,
       period = None,
       genres = Seq(BD),
-      themes = Seq(Enfants, Humour, Animaux),
+      themes = Seq(Enfants, Humour, Animal),
       programs = Seq(),
       level = Facile
     ),
@@ -1352,6 +1352,774 @@ object Books {
       themes = Seq(Handicap, Humour, Famille),
       programs = Seq(Autrui),
       level = Moyen
+    ),
+    Book(
+      title = "Le Jour où j’ai rencontré un ange",
+      author = "Brigitte MINNE",
+      year = "xxx",
+      period = Some(Contemporain),
+      genres = Seq(),
+      themes = Seq(Adolescence, Deuil, Handicap),
+      programs = Seq(Autrui),
+      level = Facile
+    ),
+
+    Book(
+      title = "Délit de fuite",
+      author = "Christophe LEON",
+      year = "xxx",
+      period = Some(Contemporain),
+      genres = Seq(),
+      themes = Seq(Adolescence, Famille, Crime, Justice),
+      programs = Seq(Autrui),
+      level = Facile
+    ),
+
+    Book(
+      title = "Espions de famille",
+      author = "Thierry GAUDIN et Romain RONZEAU",
+      year = "xxx",
+      period = Some(Contemporain),
+      genres = Seq(BD),
+      themes = Seq(Adolescence, Famille, Espionnage),
+      programs = Seq(Autrui),
+      level = Facile
+    ),
+
+    Book(
+      title = "Le Voyage de Samson",
+      author = "Annette MIERSWA",
+      year = "xxx",
+      period = Some(Contemporain),
+      genres = Seq(),
+      themes = Seq(Animal, Deuil, Famille),
+      programs = Seq(Autrui),
+      level = Moyen
+    ),
+
+    Book(
+      title = "Histoire du garçon qui courait après son chien qui courait après sa balle",
+      author = "Hervé GIRAUD",
+      year = "xxx",
+      period = Some(Contemporain),
+      genres = Seq(),
+      themes = Seq(Deuil, Maladie, Animal, Famille, Mort),
+      programs = Seq(Autrui),
+      level = Facile
+    ),
+
+    Book(
+      title = "A Copier 100 fois",
+      author = "Antoine DOLE",
+      year = "xxx",
+      period = Some(Contemporain),
+      genres = Seq(),
+      themes = Seq(Difference, Exclusion, Famille, Violence, Ecole),
+      programs = Seq(Autrui),
+      level = Facile
+    ),
+
+    Book(
+      title = "Après la vague",
+      author = "Orianne CHARPENTIER",
+      year = "xxx",
+      period = Some(Contemporain),
+      genres = Seq(),
+      themes = Seq(Adolescence, Deuil, Famille, Mort),
+      programs = Seq(Autrui),
+      level = Facile
+    ),
+
+    Book(
+      title = "Le Retour de Martin GUERRE",
+      author = "JC CARRIERE, Daniel VIGNE",
+      year = "xxx",
+      period = Some(Contemporain),
+      genres = Seq(),
+      themes = Seq(Guerre, Famille),
+      programs = Seq(Autrui),
+      level = Facile
+    ),
+
+    Book(
+      title = "Robin des graffs",
+      author = "Muriel ZÜRCHER",
+      year = "xxx",
+      period = Some(Contemporain),
+      genres = Seq(Policier),
+      themes = Seq(Marginalite, Amitie),
+      programs = Seq(Ville),
+      level = Moyen
+    ),
+
+    Book(
+      title = "Maestro !",
+      author = "Xavier-Laurent PETIT",
+      year = "xxx",
+      period = Some(Contemporain),
+      genres = Seq(),
+      themes = Seq(Pauvrete, Famille, Violence, Dictature, Enfants, Musique),
+      programs = Seq(Reel),
+      level = Moyen
+    ),
+
+    Book(
+      title = "Le Horla, d’après l’œuvre de G. de Maupassant",
+      author = "Guillaume SOREL",
+      year = "xxx",
+      period = Some(Siecle19),
+      genres = Seq(BD, Fantastique),
+      themes = Seq(Folie),
+      programs = Seq(Reel),
+      level = Facile
+    ),
+
+    Book(
+      title = "Le Passage du diable",
+      author = "Anne FINE",
+      year = "xxx",
+      period = Some(Siecle19),
+      genres = Seq(Fantastique),
+      themes = Seq(Angoisse, Famille, Mensonge),
+      programs = Seq(Reel),
+      level = Moyen
+    ),
+
+    Book(
+      title = "La Folle rencontre de Flora et Max",
+      author = "Martin PAGE, Coline PIERRE",
+      year = "xxx",
+      period = Some(Contemporain),
+      genres = Seq(RomanEpistolaire),
+      themes = Seq(Amitie, Apprentissage, Exclusion),
+      programs = Seq(Valeurs),
+      level = Facile
+    ),
+
+    Book(
+      title = "L’Insigne d’argent",
+      author = "Korneï TCHOUKOVSKI",
+      year = "xxx",
+      period = Some(Siecle19),
+      genres = Seq(),
+      themes = Seq(Exclusion, Discrimination, Ecole),
+      programs = Seq(Valeurs),
+      level = Moyen
+    ),
+
+    Book(
+      title = "Mon Cher VOLTAIRE",
+      author = "Jean RENE",
+      year = "xxx",
+      period = Some(Lumieres),
+      genres = Seq(RomanEpistolaire),
+      themes = Seq(Litterature),
+      programs = Seq(Valeurs),
+      level = Facile
+    ),
+
+    Book(
+      title = "Tu ne sais rien de l’amour",
+      author = "Mikaël OLLIVIER",
+      year = "xxx",
+      period = Some(Contemporain),
+      genres = Seq(),
+      themes = Seq(Amour, Famille, Maladie, Mort, Sexualite),
+      programs = Seq(Valeurs),
+      level = Moyen
+    ),
+
+    Book(
+      title = "Maïté Coiffure",
+      author = "Marie-Aude MURAIL",
+      year = "xxx",
+      period = Some(Contemporain),
+      genres = Seq(),
+      themes = Seq(Adolescence, Ecole, Famille, Conflit),
+      programs = Seq(Valeurs),
+      level = Moyen
+    ),
+
+    Book(
+      title = "Sauveur et fils",
+      author = "Marie-Aude MURAIL",
+      year = "xxx",
+      period = Some(Contemporain),
+      genres = Seq(),
+      themes = Seq(Deuil, Famille, Metissage),
+      programs = Seq(Valeurs),
+      level = Moyen
+    ),
+
+    Book(
+      title = "Le Singe de Hartlepool",
+      author = "Jérémie MOREAU, Wilfrid LUPANO",
+      year = "xxx",
+      period = Some(Siecle19),
+      genres = Seq(BD),
+      themes = Seq(Animal, Discrimination, Violence, Racisme),
+      programs = Seq(Valeurs),
+      level = Facile
+    ),
+
+    Book(
+      title = "Refuges",
+      author = "Annelise HEURTIER",
+      year = "xxx",
+      period = Some(Contemporain),
+      genres = Seq(),
+      themes = Seq(Deuil, Migration, Famille, Adolescence),
+      programs = Seq(Valeurs),
+      level = Moyen
+    ),
+
+    Book(
+      title = "Tout revivre",
+      author = "Mélody GORNET",
+      year = "xxx",
+      period = Some(Contemporain),
+      genres = Seq(),
+      themes = Seq(Adolescence, Famille, Mort, Deuil, Violence, Ecole),
+      programs = Seq(Valeurs),
+      level = Facile
+    ),
+
+    Book(
+      title = "Une preuve d’amour",
+      author = "Valentine GOBY",
+      year = "xxx",
+      period = Some(Contemporain),
+      genres = Seq(),
+      themes = Seq(Amour, Famille, Migration, Amitie, Litterature),
+      programs = Seq(Valeurs),
+      level = Facile
+    ),
+    Book(
+      title = "Mots rumeurs, mots cutter",
+      author = "Charlotte BOUSQUET, Stéphanie RUBINI",
+      year = "xxx",
+      period = Some(Contemporain),
+      genres = Seq(BD),
+      themes = Seq(Adolescence, Internet, Amitie, Harcelement),
+      programs = Seq(Autrui, Valeurs),
+      level = Facile
+    ),
+
+    Book(
+      title = "Invisible",
+      author = "Charlotte BOUSQUET, Stéphanie RUBINI",
+      year = "xxx",
+      period = Some(Contemporain),
+      genres = Seq(BD),
+      themes = Seq(Adolescence, Amour, Suicide, Ecole, Laideur, Discrimination),
+      programs = Seq(Valeurs),
+      level = Facile
+    ),
+
+    Book(
+      title = "De la Part du diable",
+      author = "Aina BASSO",
+      year = "xxx",
+      period = Some(Lumieres),
+      genres = Seq(),
+      themes = Seq(Justice),
+      programs = Seq(Valeurs),
+      level = Moyen
+    ),
+
+    Book(
+      title = "Tabou",
+      author = "Frank ANDRIAT",
+      year = "xxx",
+      period = Some(Contemporain),
+      genres = Seq(),
+      themes = Seq(Adolescence, Suicide, Homosexualite, Ecole, Discrimination),
+      programs = Seq(Valeurs),
+      level = Facile
+    ),
+
+    Book(
+      title = "Avant l’ouragan",
+      author = "Jewell PARKER RHODES",
+      year = "xxx",
+      period = Some(Contemporain),
+      genres = Seq(Fantastique),
+      themes = Seq(Adolescence, Deuil),
+      programs = Seq(Valeurs),
+      level = Moyen
+    ),
+
+    Book(
+      title = "Kodhja",
+      author = "Thomas SCOTTO, Régis LEJONC",
+      year = "xxx",
+      period = Some(Contemporain),
+      genres = Seq(BD),
+      themes = Seq(Enfants, Initiation),
+      programs = Seq(SeRaconter),
+      level = Facile
+    ),
+
+    Book(
+      title = "Les ailes de la sylphide",
+      author = "Pascale MARET",
+      year = "xxx",
+      period = Some(Contemporain),
+      genres = Seq(Fantastique),
+      themes = Seq(Adolescence, Violence, Danse),
+      programs = Seq(SeRaconter),
+      level = Facile
+    ),
+
+    Book(
+      title = "Ajin",
+      author = "Tsuina MIURA",
+      year = "2015-2016",
+      parts = 8,
+      period = Some(Contemporain),
+      genres = Seq(Manga, SF),
+      themes = Seq(Adolescence, Mort, Violence, Conflit),
+      programs = Seq(Reel),
+      level = Moyen
+    ),
+
+    Book(
+      title = "Dragon Ball",
+      author = "Akira TORIYAMA",
+      year = "1993-2000",
+      parts = 16,
+      period = None,
+      genres = Seq(Manga),
+      themes = Seq(Combat, Conflit, Aventure, Apprentissage, Enfants),
+      programs = Seq(),
+      level = Facile
+    ),
+
+    Book(
+      title = "Ariol",
+      author = "Emmanuel GUIBERT",
+      year = "2011-2015",
+      parts = 10,
+      period = None,
+      genres = Seq(BD),
+      themes = Seq(Amitie, Famille, Humour, Ecole),
+      programs = Seq(Resister, Autrui),
+      level = Facile
+    ),
+
+    Book(
+      title = "Chroniques des vampires",
+      author = "Anne RICE",
+      year = "2004",
+      parts = 2,
+      period = Some(Siecle18),
+      genres = Seq(Fantastique),
+      themes = Seq(Vampire, Metamorphose),
+      programs = Seq(),
+      level = Difficile
+    ),
+
+    Book(
+      title = "Dragon Ball Z",
+      author = "Akira TORIYAMA",
+      year = "2008-2016",
+      parts = 26,
+      period = None,
+      genres = Seq(Manga),
+      themes = Seq(Combat, Conflit, Aventure),
+      programs = Seq(),
+      level = Facile
+    ),
+
+    Book(
+      title = "Les Enfants de la baleine",
+      author = "Abi UMEDA",
+      year = "2016-2017",
+      parts = 6,
+      period = None,
+      genres = Seq(Manga, Fantastique, SF),
+      themes = Seq(Sentiment, Difference, Mort, Poetique),
+      programs = Seq(),
+      level = Facile
+    ),
+
+    Book(
+      title = "Fairy Tail",
+      author = "Hiro MASHIMA",
+      year = "2008-2017",
+      parts = 55,
+      period = None,
+      genres = Seq(Manga, Fantastique),
+      themes = Seq(Magie, Amitie, Humour, Aventure),
+      programs = Seq(),
+      level = Facile
+    ),
+
+    Book(
+      title = "Le Bazar des mauvais rêves : nouvelles",
+      author = "Stephen KING",
+      year = "2016",
+      parts = 42,
+      period = None,
+      genres = Seq(Fantastique),
+      themes = Seq(Mort),
+      programs = Seq(SeRaconter),
+      level = Difficile
+    ),
+
+    Book(
+      title = "Le Guide junior",
+      author = "GOUPIL, DOUYE, et al.",
+      year = "2005-2016",
+      parts = 18,
+      period = None,
+      genres = Seq(BD),
+      themes = Seq(Enfants, Humour, Famille),
+      programs = Seq(Autrui),
+      level = Facile
+    ),
+
+    Book(
+      title = "Le Monde Secret de Sombreterre",
+      author = "Cassandra O'DONNELL",
+      year = "2016",
+      parts = 2,
+      period = None,
+      genres = Seq(Fantastique),
+      themes = Seq(Exclusion, Fantome, Aventure, Amitie, Magie),
+      programs = Seq(Heros, Autrui, VoyageEtAventure),
+      level = Facile
+    ),
+
+    Book(
+      title = "Malenfer",
+      author = "Cassandra O'DONNELL",
+      year = "2014-2015",
+      parts = 3,
+      period = None,
+      genres = Seq(Fantastique),
+      themes = Seq(Magie, Enfants, Aventure),
+      programs = Seq(UniversNouveaux),
+      level = Moyen
+    ),
+
+    Book(
+      title = "Le Temps des mitaines",
+      author = "Loic CLEMENT, Anne MONTEL",
+      year = "2014-2016",
+      parts = 2,
+      period = None,
+      genres = Seq(BD),
+      themes = Seq(Enquete, Amitie, Ecole, Famille, Enfants, Humour, Magie),
+      programs = Seq(UniversNouveaux),
+      level = Facile
+    ),
+
+    Book(
+      title = "Naruto",
+      author = "Masashi KISHIMOTO",
+      year = "2002-2016",
+      parts = 72,
+      period = None,
+      genres = Seq(Manga),
+      themes = Seq(Enfants, Apprentissage, Combat, Aventure),
+      programs = Seq(UniversNouveaux),
+      level = Moyen
+    ),
+
+    Book(
+      title = "One Piece",
+      author = "Eiichirô ODA",
+      year = "2013-2017",
+      parts = 81,
+      period = None,
+      genres = Seq(Manga),
+      themes = Seq(Pirate, Aventure, Humour, Combat, Apprentissage),
+      programs = Seq(UniversNouveaux, Heros),
+      level = Moyen
+    ),
+
+    Book(
+      title = "Platinum End",
+      author = "Tsugumi OHBA",
+      year = "2016",
+      parts = 3,
+      period = None,
+      genres = Seq(Manga),
+      themes = Seq(Mort, Magie, Conflit),
+      programs = Seq(),
+      level = Moyen
+    ),
+
+    Book(
+      title = "Susan HOPPER",
+      author = "Anne PLICHOTA, Cendrine WOLF",
+      year = "2013-2016",
+      parts = 2,
+      period = None,
+      genres = Seq(Fantastique),
+      themes = Seq(Fantome, Humour, Peur, Famille, Malediction),
+      programs = Seq(),
+      level = Moyen
+    ),
+
+    Book(
+      title = "La Déferlante",
+      author = "Michael BUCKLEY",
+      year = "2014-2016",
+      parts = 2,
+      period = None,
+      genres = Seq(SF),
+      themes = Seq(Conflit, Ecole, Americain, Violence, Amitie),
+      programs = Seq(),
+      level = Moyen
+    ),
+
+    Book(
+      title = "Les Mystères de LARISPEM",
+      author = "Lucie PIERRAT-PAJOT, Donatien MARY",
+      year = "2016",
+      period = Some(Siecle19),
+      genres = Seq(Uchronie),
+      themes = Seq(Histoire, Litterature, Complot),
+      programs = Seq(Ville),
+      level = Moyen
+    ),
+
+    Book(
+      title = "Les Petites reines",
+      author = "Clémentine BEAUVAIS",
+      year = "2015",
+      parts = 2,
+      period = Some(Contemporain),
+      genres = Seq(BD),
+      themes = Seq(Internet, Laideur, Humour, Harcelement, Amitie),
+      programs = Seq(Autrui, Ville),
+      level = Moyen
+    ),
+
+    Book(
+      title = "Tous les héros s'appellent Phénix",
+      author = "Nastasia RUGANI",
+      year = "2014",
+      period = Some(Contemporain),
+      genres = Seq(),
+      themes = Seq(Famille, Adolescence, Violence, Manipulation),
+      programs = Seq(),
+      level = Moyen
+    ),
+
+    Book(
+      title = "Brise glace",
+      author = "Jean-Philippe BLONDEL",
+      year = "2011",
+      period = Some(Contemporain),
+      genres = Seq(),
+      themes = Seq(Amitie, Deuil, Ecole, Musique, Adolescence),
+      programs = Seq(Autrui),
+      level = Facile
+    ),
+
+    Book(
+      title = "Terrienne",
+      author = "JC MOURLEVAT",
+      year = "2013",
+      period = Some(Contemporain),
+      genres = Seq(SF),
+      themes = Seq(Adolescence, Famille),
+      programs = Seq(),
+      level = Difficile
+    ),
+
+    Book(
+      title = "Le Temps des miracles",
+      author = "Anne-Laure BONDOUX",
+      year = "2009",
+      period = Some(Contemporain),
+      genres = Seq(),
+      themes = Seq(Enfants, Migration),
+      programs = Seq(),
+      level = Moyen
+    ),
+
+    Book(
+      title = "Le Combat d'hiver",
+      author = "JC MOURLEVAT",
+      year = "2006",
+      period = None,
+      genres = Seq(SF, Dystopie),
+      themes = Seq(Combat, Dictature, Adolescence, Amitie, Peur),
+      programs = Seq(),
+      level = Moyen
+    ),
+
+    Book(
+      title = "Les Larmes de l'assassin",
+      author = "Anne-Laure BONDOUX",
+      year = "2003",
+      period = None,
+      genres = Seq(),
+      themes = Seq(Adolescence, Crime, Amitie, Apprentissage),
+      programs = Seq(),
+      level = Moyen
+    ),
+
+    Book(
+      title = "Oh, boy !",
+      author = "Marie-Aude MURAIL",
+      year = "2000",
+      period = Some(Contemporain),
+      genres = Seq(),
+      themes = Seq(Deuil, Maladie, Homosexualite, Famille, Humour),
+      programs = Seq(Autrui),
+      level = Moyen
+    ),
+
+    Book(
+      title = "Skeleton Creek",
+      author = "Patrick CARMAN",
+      year = "2011-2012",
+      parts = 4,
+      period = Some(Contemporain),
+      genres = Seq(Policier),
+      themes = Seq(Enquete, Amitie, Internet, Peur),
+      programs = Seq(),
+      level = Facile
+    ),
+
+    Book(
+      title = "Le Manoir",
+      author = "Evelyne BRISOU-PELLEN",
+      year = "2013-2016",
+      parts = 8,
+      period = None,
+      genres = Seq(Fantastique),
+      themes = Seq(Enquete, Amitie, Fantome, Maladie),
+      programs = Seq(),
+      level = Difficile
+    ),
+
+    Book(
+      title = "Le Premier qui pleure a perdu",
+      author = "Sherman ALEXIE",
+      year = "2013",
+      period = Some(Contemporain),
+      genres = Seq(),
+      themes = Seq(Humour, Difference, Discrimination, Ecole, Adolescence, Famille),
+      programs = Seq(Valeurs, TraversSociete),
+      level = Moyen
+    ),
+
+    Book(
+      title = "Freak City",
+      author = "Kathrin Schrocke",
+      year = "2013",
+      period = Some(Contemporain),
+      genres = Seq(),
+      themes = Seq(Handicap, Amour, Adolescence),
+      programs = Seq(Autrui),
+      level = Moyen
+    ),
+
+    Book(
+      title = "Le Journal malgré lui de Henry K. LARSEN",
+      author = "Susin NIELSEN",
+      year = "2013",
+      period = None,
+      genres = Seq(JournalIntime),
+      themes = Seq(Ecole, Harcelement, Suicide, Deuil, Famille, Amitie, Adolescence),
+      programs = Seq(),
+      level = Moyen
+    ),
+
+    Book(
+      title = "Max",
+      author = "Sarah COHEN-SCALI",
+      year = "2013",
+      period = Some(Contemporain),
+      genres = Seq(),
+      themes = Seq(Dictature, Guerre, Eugenisme),
+      programs = Seq(AgirCite),
+      level = Difficile
+    ),
+
+    Book(
+      title = "Boys don't cry",
+      author = "Malorie BLACKMAN",
+      year = "2011",
+      period = Some(Contemporain),
+      genres = Seq(),
+      themes = Seq(Adolescence, Famille, Homosexualite, Apprentissage),
+      programs = Seq(),
+      level = Moyen
+    ),
+
+    Book(
+      title = "Le Monde dans la main",
+      author = "Mikaël OLLIVIER",
+      year = "2011",
+      period = Some(Contemporain),
+      genres = Seq(),
+      themes = Seq(Famille, Adolescence, Amour, Apprentissage, Secret),
+      programs = Seq(),
+      level = Moyen
+    ),
+
+    Book(
+      title = "Là où naissent les nuages",
+      author = "Annelise HEURTIER",
+      year = "2015",
+      period = Some(Contemporain),
+      genres = Seq(),
+      themes = Seq(Voyage, Famille, Adolescence, Initiation, Maladie, Pauvrete),
+      programs = Seq(VoyageEtAventure),
+      level = Moyen
+    ),
+
+    Book(
+      title = "Les Mondes de l'Alliance",
+      author = "David MOITET",
+      year = "2014-2015",
+      parts = 3,
+      period = None,
+      genres = Seq(SF),
+      themes = Seq(Famille, Aventure, Adolescence),
+      programs = Seq(),
+      level = Moyen
+    ),
+
+    Book(
+      title = "Le Suivant sur la liste",
+      author = "Manon FARGETTON",
+      year = "2014",
+      period = None,
+      genres = Seq(Thriller),
+      themes = Seq(Genetique, Manipulation, Adolescence),
+      programs = Seq(),
+      level = Moyen
+    ),
+
+    Book(
+      title = "Le Livre de Perle",
+      author = "Thimothée de FOMBELLE",
+      year = "2014",
+      period = Some(Siecle20),
+      genres = Seq(Merveilleux),
+      themes = Seq(Poetique, Magie, Amour),
+      programs = Seq(VisionsPoetiques),
+      level = Difficile
+    ),
+
+    Book(
+      title = "Ma Raison de vivre",
+      author = "Rebecca DONOVAN",
+      year = "2015-2016",
+      parts = 3,
+      period = None,
+      genres = Seq(),
+      themes = Seq(Adolescence, Amour, Famille, Mort, Amitie, Violence),
+      programs = Seq(),
+      level = Difficile
     )
   )
 }
diff --git a/src/main/scala/reading/models/Genre.scala b/src/main/scala/reading/models/Genre.scala
index 0e0e812..b5fc6c4 100644
--- a/src/main/scala/reading/models/Genre.scala
+++ b/src/main/scala/reading/models/Genre.scala
@@ -21,6 +21,8 @@ sealed trait Genre extends EnumEntry with Ordered[Genre] {
     case RomanAventure => "roman d'aventure"
     case Comique => "comique"
     case Dystopie => "dystopie"
+    case Uchronie => "uchronie"
+    case Manga => "manga"
     case Thriller => "thriller"
     case RomanEpistolaire => "roman épistolaire"
   }
@@ -41,5 +43,7 @@ object Genre extends Enum[Genre] {
   case object Comique extends Genre
   case object Thriller extends Genre
   case object Dystopie extends Genre
+  case object Uchronie extends Genre
+  case object Manga extends Genre
   case object RomanEpistolaire extends Genre
 }
diff --git a/src/main/scala/reading/models/Period.scala b/src/main/scala/reading/models/Period.scala
index 3003468..90d6015 100644
--- a/src/main/scala/reading/models/Period.scala
+++ b/src/main/scala/reading/models/Period.scala
@@ -9,7 +9,9 @@ sealed trait Period extends EnumEntry {
     case Antiquite => "Antiquité"
     case MA => "Moyen âge"
     case Renaissance => "Renaissance"
+    case Lumieres => "Lumières"
     case Louis14 => "Louis XIV"
+    case Siecle18 => "18ème siècle"
     case Siecle19 => "19ème siècle"
     case Siecle20 => "20ème siècle"
     case Annees50 => "années 50"
@@ -24,7 +26,9 @@ object Period extends Enum[Period] {
   case object Antiquite extends Period
   case object MA extends Period
   case object Renaissance extends Period
+  case object Lumieres extends Period
   case object Louis14 extends Period
+  case object Siecle18 extends Period
   case object Siecle19 extends Period
   case object Siecle20 extends Period
   case object Annees50 extends Period
diff --git a/src/main/scala/reading/models/Program.scala b/src/main/scala/reading/models/Program.scala
index 17385b4..1859db3 100644
--- a/src/main/scala/reading/models/Program.scala
+++ b/src/main/scala/reading/models/Program.scala
@@ -22,12 +22,12 @@ sealed trait Program extends EnumEntry with Ordered[Program] {
     case HommeEtNature => "L'être humain est-il maître de la nature ?"
 
     case DireAmour => "Dire l'amour"
-    case IndividuEtSociete => "Individu et société : confrontations de valeur ?"
-    case FictionEtReel => "La fiction pour interroger le réel"
+    case Valeurs => "Individu et société : confrontations de valeurs ?"
+    case Reel => "La fiction pour interroger le réel"
     case Informer => "Informer, s'informer, déformer ?"
     case Ville => "La ville, lieu de tous les possibles ?"
 
-    case RaconterRepresenter => "Se raconter, se représenter"
+    case SeRaconter => "Se raconter, se représenter"
     case TraversSociete => "Dénoncer les travers de la société"
     case VisionsPoetiques => "Visions poétiques du monde"
     case AgirCite => "Agir dans la cité : individu et pouvoir"
@@ -50,12 +50,12 @@ object Program extends Enum[Program] {
   case object HommeEtNature extends Program
 
   case object DireAmour extends Program
-  case object IndividuEtSociete extends Program
-  case object FictionEtReel extends Program
+  case object Valeurs extends Program
+  case object Reel extends Program
   case object Informer extends Program
   case object Ville extends Program
 
-  case object RaconterRepresenter extends Program
+  case object SeRaconter extends Program
   case object TraversSociete extends Program
   case object VisionsPoetiques extends Program
   case object AgirCite extends Program
@@ -67,8 +67,8 @@ object Program extends Enum[Program] {
     program match {
       case Monstre | RecitAventure | CreationPoetique | Resister => Sixieme
       case VoyageEtAventure | Autrui | UniversNouveaux | Heros | HommeEtNature => Cinquieme
-      case DireAmour | IndividuEtSociete | FictionEtReel | Informer | Ville => Quatrieme
-      case RaconterRepresenter | TraversSociete | VisionsPoetiques | AgirCite | ProgresReveScientifique => Troisieme
+      case DireAmour | Valeurs | Reel | Informer | Ville => Quatrieme
+      case SeRaconter | TraversSociete | VisionsPoetiques | AgirCite | ProgresReveScientifique => Troisieme
     }
   }
 }
diff --git a/src/main/scala/reading/models/Theme.scala b/src/main/scala/reading/models/Theme.scala
index 56fffce..116bff8 100644
--- a/src/main/scala/reading/models/Theme.scala
+++ b/src/main/scala/reading/models/Theme.scala
@@ -11,57 +11,81 @@ sealed trait Theme extends EnumEntry with Ordered[Theme] {
 
   def prettyPrint(): String = this match {
     case Amitie => "amitié"
+    case Angoisse => "angoisse"
     case Adolescence => "adolescence"
     case Americain => "américain"
     case Amour => "amour"
     case Animal => "animal"
+    case Apprentissage => "apprentissage"
     case Aventure => "aventure"
     case Beaute => "beaute"
     case Chevalerie => "chevalerie"
+    case Conflit => "conflit"
+    case Crime => "crime"
     case Discrimination => "discrimination"
+    case Dictature => "dictature"
     case Ecole => "école"
     case Enquete => "enquête"
     case Enfants => "enfants"
     case Emancipation => "émancipation"
     case Espionnage => "espionnage"
     case Folie => "folie"
+    case College => "collège"
     case Complot => "complot"
     case Combat => "combat"
     case Cour => "cour"
+    case Danse => "danse"
     case Deuil => "deuil"
+    case Difference => "différence"
     case Dragon => "dragon"
+    case Eugenisme => "eugénisme"
     case Exclusion => "exclusion"
     case Famille => "famille"
+    case Fantome => "fantôme"
     case Fratrie => "fratrie"
+    case Genetique => "génétique"
     case Guerre => "guerre"
     case Handicap => "handicap"
+    case Harcelement => "harcelement"
     case Histoire => "histoire"
     case Homosexualite => "Homosexualité"
     case Humour => "humour"
     case Initiation => "initiation"
     case Internet => "internet"
     case JeuVideo => "jeu vidéo"
+    case Justice => "justice"
     case Laideur => "laideur"
     case Litterature => "littérature"
+    case Maladie => "maladie"
     case Malediction => "malédiction"
+    case Manipulation => "manipulation"
     case Magie => "magie"
+    case Marginalite => "marginalite"
+    case Mensonge => "mensonge"
     case Metamorphose => "metamorphose"
+    case Metissage => "metissage"
+    case Migration => "migration"
     case Mort => "mort"
+    case Musique => "musique"
     case Mythologie => "mythologie"
     case Nature => "nature"
     case Parents => "parents"
+    case Pauvrete => "pauvrete"
     case Peur => "peur"
     case Pirate => "pirate"
     case Poetique => "poétique"
+    case Racisme => "racisme"
     case Reecriture => "réécriture"
-    case Conflit => "conflit"
     case Robot => "robot"
+    case Secret => "secret"
     case SegregationRaciale => "ségrégation raciale"
+    case Sentiment => "sexualité"
+    case Sexualite => "sexualité"
+    case Suicide => "suicide"
+    case Vampire => "vampire"
     case VieNocturne => "vie nocturne"
+    case Violence => "violence"
     case Voyage => "voyage"
-    case Animaux => "animaux"
-    case College => "collège"
-    case Maladie => "maladie"
   }
 }
 
@@ -72,15 +96,28 @@ object Theme extends Enum[Theme] {
   case object Americain extends Theme
   case object Amitie extends Theme
   case object Amour extends Theme
+  case object Angoisse extends Theme
   case object Animal extends Theme
+  case object Apprentissage extends Theme
   case object Aventure extends Theme
   case object Beaute extends Theme
+  case object Chevalerie extends Theme
+  case object Crime extends Theme
+  case object Danse extends Theme
+  case object Deuil extends Theme
+  case object Difference extends Theme
+  case object Discrimination extends Theme
+  case object Dictature extends Theme
   case object Ecole extends Theme
   case object Emancipation extends Theme
   case object Enfants extends Theme
   case object Enquete extends Theme
   case object Espionnage extends Theme
+  case object Eugenisme extends Theme
+  case object Exclusion extends Theme
+  case object Fantome extends Theme
   case object Folie extends Theme
+  case object College extends Theme
   case object Combat extends Theme
   case object Complot extends Theme
   case object Conflit extends Theme
@@ -88,36 +125,47 @@ object Theme extends Enum[Theme] {
   case object Dragon extends Theme
   case object Famille extends Theme
   case object Fratrie extends Theme
+  case object Genetique extends Theme
   case object Guerre extends Theme
+  case object Handicap extends Theme
+  case object Harcelement extends Theme
   case object Histoire extends Theme
   case object Homosexualite extends Theme
   case object Humour extends Theme
   case object Initiation extends Theme
+  case object Internet extends Theme
   case object JeuVideo extends Theme
+  case object Justice extends Theme
   case object Laideur extends Theme
   case object Litterature extends Theme
+  case object Maladie extends Theme
   case object Malediction extends Theme
+  case object Manipulation extends Theme
   case object Magie extends Theme
+  case object Marginalite extends Theme
+  case object Mensonge extends Theme
+  case object Metamorphose extends Theme
+  case object Metissage extends Theme
+  case object Migration extends Theme
+  case object Mort extends Theme
+  case object Musique extends Theme
   case object Mythologie extends Theme
   case object Nature extends Theme
   case object Parents extends Theme
+  case object Pauvrete extends Theme
   case object Peur extends Theme
   case object Pirate extends Theme
   case object Poetique extends Theme
+  case object Racisme extends Theme
+  case object Reecriture extends Theme
   case object Robot extends Theme
+  case object Secret extends Theme
   case object SegregationRaciale extends Theme
+  case object Sentiment extends Theme
+  case object Sexualite extends Theme
+  case object Suicide extends Theme
+  case object Vampire extends Theme
   case object VieNocturne extends Theme
+  case object Violence extends Theme
   case object Voyage extends Theme
-  case object Animaux extends Theme
-  case object College extends Theme
-  case object Deuil extends Theme
-  case object Internet extends Theme
-  case object Mort extends Theme
-  case object Reecriture extends Theme
-  case object Metamorphose extends Theme
-  case object Exclusion extends Theme
-  case object Chevalerie extends Theme
-  case object Discrimination extends Theme
-  case object Handicap extends Theme
-  case object Maladie extends Theme
 }