diff --git a/Source/.gitignore b/Source/.gitignore
index 0d574d1..0a1d39d 100644
--- a/Source/.gitignore
+++ b/Source/.gitignore
@@ -30,7 +30,3 @@
 
 # ...and this LabPal plots file if you use LabPal
 !labpal-plots.pdf
-
-# Don't version auto-generated LaTeX files
-preamble*.inc.tex
-postamble*.inc.tex
diff --git a/Source/paper.tex b/Source/paper.tex
index 4fed330..732144d 100755
--- a/Source/paper.tex
+++ b/Source/paper.tex
@@ -1,4 +1,4 @@
-%%  ***************************************************************************
+%% ***************************************************************************
 %% My paper
 %%
 %% Authors: Emmett Brown, Marty McFly, Biff Tannen
@@ -9,23 +9,12 @@
 %%
 %% This paper is an instance of the PaperShell template. For more
 %% information, please visit https://github.com/sylvainhalle/PaperShell
-%%  ***************************************************************************
+%% ***************************************************************************
 %% ---------------------------
-%% Author preamble. Uncomment the one corresponding to the
-%% stylesheet you want. **Don't forget to also uncomment the proper
-%% line for the postamble at the end!!**
+%% Author preamble. The contents of this file change depending on the
+%% paper class you choose.
 %% ---------------------------
-%\input{preamble-aaai.inc.tex}
-%\input{preamble-acm.inc.tex}
-\input{preamble-acm-journal.inc.tex}
-%\input{preamble-easychair.inc.tex}
-%\input{preamble-elsarticle.inc.tex}
-%\input{preamble-ieee.inc.tex}
-%\input{preamble-ieee-journal.inc.tex}
-%\input{preamble-lipics.inc.tex}
-%\input{preamble-lncs.inc.tex}
-%\input{preamble-stvr.inc.tex}
-%\input{preamble-svjour.inc.tex}
+\input{preamble.inc.tex}
 
 %% ---------------------------
 %% If you wish to include additional packages, define new environments or
@@ -64,20 +53,9 @@ \section{Donec id eros non nisl pharetra} %% {{{
 %% }}} --- Section
 
 %% ---------------------------
-%% Bibliography. Uncomment the one corresponding to the
-%% stylesheet you want.
+%% Bibliography and postamble
 %% ---------------------------
-%\input{postamble-aaai.inc.tex}
-%\input{postamble-acm.inc.tex}
-\input{postamble-acm-journal.inc.tex}
-%\input{postamble-easychair.inc.tex}
-%\input{postamble-elsarticle.inc.tex}
-%\input{postamble-ieee.inc.tex}
-%\input{postamble-ieee-journal.inc.tex}
-%\input{postamble-lipics.inc.tex}
-%\input{postamble-lncs.inc.tex}
-%\input{postamble-stvr.inc.tex}
-%\input{postamble-svjour.inc.tex}
+\input{postamble.inc.tex}
 
 \end{document}
 
diff --git a/generate-preamble.php b/set-style.php
similarity index 93%
rename from generate-preamble.php
rename to set-style.php
index b79e8ef..3e61597 100755
--- a/generate-preamble.php
+++ b/set-style.php
@@ -18,24 +18,17 @@
  **************************************************************************/
 
 // Version
-$version_string = "1.9.2";
+$version_string = "2.0";
 $autogen_comment = "%% This file was autogenerated by PaperShell v$version_string on ".date("Y-m-d H:i:s")."\n%% https://github.com/sylvainhalle/PaperShell\n%% DO NOT EDIT!";
 
 // Read author-title file
 $input_filename = "authors.txt";
 $out_folder = "Source/";
 
-// Just show version number; used by satellite scripts to show the same version
-// as the main program
-if (count($argv) > 0 && $argv[1] === "--show-version")
-{
-	echo $version_string;
-	exit(0);
-}
-
 // Read default config settings. All these settings can be modified with
 // settings.inc.php. Do not modify them here.
 $config = array(
+	"style"           => "",
 	"tex-name"        => "paper",
 	"bib-name"        => "paper",
 	"short-title"     => "",
@@ -71,6 +64,30 @@
 {
   include("settings.inc.php");
 }
+
+// Just show version number; used by satellite scripts to show the same version
+// as the main program
+$to_set = "";
+for ($i = 1; $i < count($argv); $i++)
+{
+	$arg = $argv[$i];
+	if ($arg === "--show-version")
+	{
+		echo $version_string;
+		exit(0);
+	}
+	$config["style"] = strtolower($arg);
+}
+$generated = false;
+if ($config["style"] === "")
+{
+	// No style was provided. Stop.
+	echo "No style has been provided. Usage:\n";
+	echo "php set-style.php <style>\n";
+	exit(1);
+}
+
+// Some setup based on config
 $hr_draft = "";
 if ($config["disable-hr"] == true)
 {
@@ -134,8 +151,10 @@
   $microtype_string = "\n\usepackage{microtype}       % Better handling of typo";
 }
 
+if ($config["style"] === "lncs")
 { // Springer LNCS {{{
   
+  $generated = true;
   // Preamble
   $bib_style = empty($config["bib-style"]) ? "splncs03" : $config["bib-style"];
   $out = "";
@@ -208,7 +227,7 @@
   {
     $out .= "\\begin{abstract}\n\\input{abstract.tex}\n\\end{abstract}\n";
   }
-  file_put_contents($out_folder."preamble-lncs.inc.tex", $out);
+  file_put_contents($out_folder."preamble.inc.tex", $out);
   
   // Postamble
   $out = "";
@@ -221,11 +240,13 @@
   $out .= "\\bibliography{".$config["bib-name"]."}\n";
   $out .= "\\input{appendices.tex}\n";
   $out .= "\\end{document}\n";
-  file_put_contents($out_folder."postamble-lncs.inc.tex", $out);
+  file_put_contents($out_folder."postamble.inc.tex", $out);
 } // }}}
 
+if ($config["style"] === "ieee")
 { // IEEE Conference Proceedings {{{
   
+  $generated = true;
   // Preamble
   $bib_style = empty($config["bib-style"]) ? "abbrv" : $config["bib-style"];
   $out = "";
@@ -296,12 +317,12 @@
   {
     $out .= "\\begin{abstract}\n\\input{abstract.tex}\n\\end{abstract}\n";
   }
-  file_put_contents($out_folder."preamble-ieee.inc.tex", $out);
+  file_put_contents($out_folder."preamble.inc.tex", $out);
   
   // IEEE Journal: just replace conf by journal in documentclass
   $out = str_replace("\\documentclass[conference", "\\documentclass[journal", $out);
   $out .= "\n% Fixing bug in the definition of \\markboth in IEEEtran class\n% See http://tex.stackexchange.com/a/88864\n\\makeatletter\n\\let\\l@ENGLISH\\l@english\n\\makeatother\n";
-  file_put_contents($out_folder."preamble-ieee-journal.inc.tex", $out);
+  file_put_contents($out_folder."preamble.inc.tex", $out);
   
   // Postamble
   $out = "";
@@ -314,14 +335,16 @@
   $out .= "\\bibliography{".$config["bib-name"]."}\n";
   $out .= "\\input{appendices.tex}\n";
   $out .= "\\end{document}\n";
-  file_put_contents($out_folder."postamble-ieee.inc.tex", $out);
+  file_put_contents($out_folder."postamble.inc.tex", $out);
   
   // IEEE Journal: samething
-  file_put_contents($out_folder."postamble-ieee-journal.inc.tex", $out);
+  file_put_contents($out_folder."postamble.inc.tex", $out);
 } // }}}
 
+if ($config["style"] === "acmconf")
 { // ACM Conferences {{{
   
+  $generated = true;
   // Preamble
   $bib_style = empty($config["bib-style"]) ? "abbrv" : $config["bib-style"];
   $out = "";
@@ -404,7 +427,7 @@
   $out .= "\\input{acm-ccs.tex}\n";
   $out .= "\\keywords{".$config["keywords"]."%\n}\n\n";
   $out .= "\\maketitle\n";
-  file_put_contents($out_folder."preamble-acm.inc.tex", $out);
+  file_put_contents($out_folder."preamble.inc.tex", $out);
   
   // Postamble
   $out = "";
@@ -417,11 +440,13 @@
   $out .= "\\bibliography{".$config["bib-name"]."}\n";
   $out .= "\\input{appendices.tex}\n";
   $out .= "\\end{document}\n";
-  file_put_contents($out_folder."postamble-acm.inc.tex", $out);
+  file_put_contents($out_folder."postamble.inc.tex", $out);
 } // }}}
 
+if ($config["style"] === "elsevier")
 { // Elsevier article {{{
   
+  $generated = true;
   // Preamble
   $bib_style = empty($config["bib-style"]) ? "elsarticle-num" : $config["bib-style"];
   $out = "";
@@ -491,7 +516,7 @@
     $out .= "\\begin{abstract}\n\\input{abstract.tex}\n\\end{abstract}\n";
   }
   $out .= "\\end{frontmatter}\n";
-  file_put_contents($out_folder."preamble-elsarticle.inc.tex", $out);
+  file_put_contents($out_folder."preamble.inc.tex", $out);
   
   // Postamble
   $out = "";
@@ -505,11 +530,13 @@
   $out .= "\\bibliography{".$config["bib-name"]."}\n";
   $out .= "\\input{appendices.tex}\n";
   $out .= "\\end{document}\n";
-  file_put_contents($out_folder."postamble-elsarticle.inc.tex", $out);
+  file_put_contents($out_folder."postamble.inc.tex", $out);
 } // }}}
 
+if ($config["style"] === "springer")
 { // Springer journal {{{
   
+  $generated = true;
   // Preamble
   $bib_style = empty($config["bib-style"]) ? "abbrv" : $config["bib-style"];
   $out = "";
@@ -594,7 +621,7 @@
   {
     $out .= "\\begin{abstract}\n\\input{abstract.tex}\n\\end{abstract}\n";
   }
-  file_put_contents($out_folder."preamble-svjour.inc.tex", $out);
+  file_put_contents($out_folder."preamble.inc.tex", $out);
   
   // Postamble
   $out = "";
@@ -607,11 +634,13 @@
   $out .= "\\bibliography{".$config["bib-name"]."}\n";
   $out .= "\\input{appendices.tex}\n";
   $out .= "\\end{document}\n";
-  file_put_contents($out_folder."postamble-svjour.inc.tex", $out);
+  file_put_contents($out_folder."postamble.inc.tex", $out);
 } // }}}
 
+if ($config["style"] === "aaai")
 { // AAAI {{{
   
+  $generated = true;
   // Preamble
   $bib_style = empty($config["bib-style"]) ? "aaai" : $config["bib-style"];
   $out = "";
@@ -702,7 +731,7 @@
     $out .= "\\input{abstract.tex}\n";
     $out .= "\\end{quote}\n\\end{abstract}\n";
   }
-  file_put_contents($out_folder."preamble-aaai.inc.tex", $out);
+  file_put_contents($out_folder."preamble.inc.tex", $out);
   
   // Postamble
   $out = "";
@@ -715,11 +744,13 @@
   $out .= "\\bibliography{".$config["bib-name"]."}\n";
   $out .= "\\input{appendices.tex}\n";
   $out .= "\\end{document}\n";
-  file_put_contents($out_folder."postamble-aaai.inc.tex", $out);
+  file_put_contents($out_folder."postamble.inc.tex", $out);
 } // }}}
 
+if ($config["style"] === "acmjour")
 { // ACM "small trim" journals {{{
   
+  $generated = true;
   // Preamble
   $bib_style = empty($config["bib-style"]) ? "ACM-Reference-Format-Journals" : $config["bib-style"];
   $out = "";
@@ -808,7 +839,7 @@
   $out .= "\\input{acm-ccs.tex}\n";
   $out .= "\\keywords{".$config["keywords"]."%\n}\n\n";
   $out .= "\\maketitle\n";
-  file_put_contents($out_folder."preamble-acm-journal.inc.tex", $out);
+  file_put_contents($out_folder."preamble.inc.tex", $out);
   
   // Postamble
   $out = "";
@@ -823,12 +854,15 @@
   $out .= "\\input{appendices.tex}\n";
   $out .= "% History dates\n\\received{".date("F Y")."}{".date("F Y")."}{".date("F Y")."}\n";
   $out .= "\\end{document}\n";
-  file_put_contents($out_folder."postamble-acm-journal.inc.tex", $out);
+  file_put_contents($out_folder."postamble.inc.tex", $out);
 }
 
 // }}}
 
+if ($config["style"] === "eptcs")
 { // EPTCS {{{
+  
+  $generated = true;
   // Preamble
   $bib_style = empty($config["bib-style"]) ? "abbrv" : $config["bib-style"];
   $out = "";
@@ -912,7 +946,7 @@
   {
     $out .= "\\begin{abstract}\n\\input{abstract.tex}\n\\end{abstract}\n";
   }
-  file_put_contents($out_folder."preamble-eptcs.inc.tex", $out);
+  file_put_contents($out_folder."preamble.inc.tex", $out);
   
   // Postamble
   $out = "";
@@ -925,11 +959,13 @@
   $out .= "\\bibliography{".$config["bib-name"]."}\n";
   $out .= "\\input{appendices.tex}\n";
   $out .= "\\end{document}\n";
-  file_put_contents($out_folder."postamble-eptcs.inc.tex", $out);
+  file_put_contents($out_folder."postamble.inc.tex", $out);
 } // }}}
 
+if ($config["style"] === "stvr")
 { // Wiley STVR {{{
   
+  $generated = true;
   // Preamble
   $bib_style = empty($config["bib-style"]) ? "wileyj" : $config["bib-style"];
   $short_title =  empty($config["short-title"]) ? $title : $config["short-title"];
@@ -1013,7 +1049,7 @@
   {
     $out .= "\\begin{abstract}\n\\input{abstract.tex}\n\\end{abstract}\n";
   }
-  file_put_contents($out_folder."preamble-stvr.inc.tex", $out);
+  file_put_contents($out_folder."preamble.inc.tex", $out);
   
   // Postamble
   $out = "";
@@ -1026,11 +1062,13 @@
   $out .= "\\bibliography{".$config["bib-name"]."}\n";
   $out .= "\\input{appendices.tex}\n";
   $out .= "\\end{document}\n";
-  file_put_contents($out_folder."postamble-stvr.inc.tex", $out);
+  file_put_contents($out_folder."postamble.inc.tex", $out);
 } // }}}
 
+if ($config["style"] === "lipics")
 { // LIPIcs {{{
   
+  $generated = true;
   // Preamble
   $bib_style = empty($config["bib-style"]) ? "plainurl" : $config["bib-style"];
   $out = "";
@@ -1122,7 +1160,7 @@
   {
     $out .= "\\begin{abstract}\n\\input{abstract.tex}\n\\end{abstract}\n";
   }
-  file_put_contents($out_folder."preamble-lipics.inc.tex", $out);
+  file_put_contents($out_folder."preamble.inc.tex", $out);
   
   // Postamble
   $out = "";
@@ -1136,10 +1174,13 @@
   $out .= "\\bibliography{".$config["bib-name"]."}\n";
   $out .= "\\input{appendices.tex}\n";
   $out .= "\\end{document}\n";
-  file_put_contents($out_folder."postamble-lipics.inc.tex", $out);
+  file_put_contents($out_folder."postamble.inc.tex", $out);
 } // }}}
 
+if ($config["style"] === "easychair")
 { // EasyChair Proceedings {{{
+  
+  $generated = true;
   $easychair_type_string = "";
   if (!empty($config["easychair-type"]))
   {
@@ -1228,7 +1269,7 @@
   {
     $out .= "\\begin{abstract}\n\\input{abstract.tex}\n\\end{abstract}\n";
   }
-  file_put_contents($out_folder."preamble-easychair.inc.tex", $out);
+  file_put_contents($out_folder."preamble.inc.tex", $out);
   
   // Postamble
   $out = "";
@@ -1241,11 +1282,20 @@
   $out .= "\\bibliography{".$config["bib-name"]."}\n";
   $out .= "\\input{appendices.tex}\n";
   $out .= "\\end{document}\n";
-  file_put_contents($out_folder."postamble-easychair.inc.tex", $out);
+  file_put_contents($out_folder."postamble.inc.tex", $out);
 } // }}}
 
-
-echo "\nDone. Go to the Source folder and type `make' to compile the paper.\n";
+if ($generated)
+{
+	echo "\nDone. Go to the Source folder and type `make' to compile the paper.\n";
+	exit(0);
+}
+else
+{
+	echo "Invalid style. Available styles are: lncs, ieee, acmconf, elsevier,\n";
+	echo "springer, aaai, acmjour, eptcs, stvr, lipics, easychair.\n";
+	exit(1);
+}
 
 /**
  * Guesses an author's initials
diff --git a/settings.inc.php b/settings.inc.php
index 4cabd55..d1cb60b 100755
--- a/settings.inc.php
+++ b/settings.inc.php
@@ -1,6 +1,14 @@
 <?php
 // You can override any defaults by setting values here
 $config = array_merge($config, array(
+	
+	/*
+	 * The style to generate when calling set-style.php. Instead of
+	 * providing it at the command line, you can set it by default here
+	 * and call the script without any argument.
+	 */
+	//"style" => "lncs",
+	
 	/*
 	 * The affiliations. This should be an array of arrays, where
 	 * the first sub-array corresponds to institution 1 in authors.txt,