diff --git a/.gitignore b/.gitignore
index 272173e..95e7408 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,5 @@ node_modules
 .vercel
 .output
 *.swp
-*/*.swp
\ No newline at end of file
+*/*.swp
+src/lib/db/*.sqlite
diff --git a/src/lib/components/Date.svelte b/src/lib/components/Date.svelte
index cd1a22e..bfb8bc5 100644
--- a/src/lib/components/Date.svelte
+++ b/src/lib/components/Date.svelte
@@ -1,13 +1,13 @@
 <script>
 	import { templates } from '$lib/templates/templates';
-	import { date, multiplier } from '$lib/stores/store';
+	import { date, newdate, multiplier } from '$lib/stores/store';
 	import { convertDate } from '$lib/convertDate';
 	/** @type number */ export let templateIndex;
 
-	/** @type {string} */ let newdate;
+	// /** @type {string} */ let newdate;
 
 	$: if ($date !== '') {
-		newdate = convertDate($date);
+		$newdate = convertDate($date);
 	}
 </script>
 
@@ -27,7 +27,7 @@
       line-height: {templates[templateIndex].date.lineHeight}px;
     "
 	>
-		{newdate}
+		{$newdate}
 	</div>
 {/if}
 
diff --git a/src/lib/components/Heading.svelte b/src/lib/components/Heading.svelte
index facdce8..d90dda5 100644
--- a/src/lib/components/Heading.svelte
+++ b/src/lib/components/Heading.svelte
@@ -29,5 +29,6 @@
 	.heading {
 		position: absolute;
 		overflow: hidden;
+		text-transform: uppercase;
 	}
 </style>
diff --git a/src/lib/components/Subtitle.svelte b/src/lib/components/Subtitle.svelte
index 4e657d6..c9ea460 100644
--- a/src/lib/components/Subtitle.svelte
+++ b/src/lib/components/Subtitle.svelte
@@ -33,5 +33,6 @@
 		display: flex;
 		justify-content: center;
 		align-items: start;
+		text-transform: uppercase;
 	}
 </style>
diff --git a/src/lib/components/Text.svelte b/src/lib/components/Text.svelte
index 636b0de..b626e14 100644
--- a/src/lib/components/Text.svelte
+++ b/src/lib/components/Text.svelte
@@ -5,6 +5,7 @@
 		subtitle,
 		content,
 		date,
+		newdate,
 		time,
 		weekday,
 		address,
@@ -28,9 +29,20 @@
 	{#if checked}
 		<div class="text" contenteditable="true">
 			<p>Estimada/o amiga/o:</p>
-			<p>El {$weekday.toLowerCase()}, {textDate}, celebramos el acto '{$title}' en {$city}.</p>
+			<p>
+				El {$weekday.toLowerCase()}, {textDate}, celebramos el acto <strong>'{$title}'</strong> en {$city}.
+			</p>
 			<p>Como siempre, la entrada es gratuita hasta completar aforo.</p>
-			<p>El acto comienza a las {$time}.</p>
+			<ul>
+				<li>
+					<p style="white-space: pre-wrap;">
+						<strong>Lugar</strong>:<br />{$address}<br /><em>{$city}</em>
+					</p>
+				</li>
+				<li>
+					<p><strong>Fecha</strong>:<br />{$newdate}<br />{$time}</p>
+				</li>
+			</ul>
 			<p>{@html $content}</p>
 		</div>
 	{/if}
@@ -47,9 +59,12 @@
 		background-color: #fff;
 	}
 	p {
-		margin-bottom: 1rem;
+		margin: 1rem 0;
 	}
 	label {
 		color: #333;
 	}
+	li {
+		margin: 1rem 0;
+	}
 </style>
diff --git a/src/lib/components/Title.svelte b/src/lib/components/Title.svelte
index b26b7bc..c63007f 100644
--- a/src/lib/components/Title.svelte
+++ b/src/lib/components/Title.svelte
@@ -33,5 +33,6 @@
 		display: flex;
 		justify-content: center;
 		align-items: center;
+		text-transform: uppercase;
 	}
 </style>
diff --git a/src/lib/stores/store.js b/src/lib/stores/store.js
index 095a9b6..3f4ba50 100644
--- a/src/lib/stores/store.js
+++ b/src/lib/stores/store.js
@@ -5,6 +5,7 @@ export const heading = writable("");
 export const subtitle = writable("");
 export const content = writable("");
 export const date = writable("");
+export const newdate = writable("");
 export const time = writable("");
 export const weekday = writable("");
 export const address = writable("");
diff --git a/src/lib/templates/verde.js b/src/lib/templates/verde.js
index 23ba566..cba0d54 100644
--- a/src/lib/templates/verde.js
+++ b/src/lib/templates/verde.js
@@ -11,32 +11,32 @@ export const verde = {
     right: 20,
     fontSize: 24,
     color: "white",
-    fontFamily: "'Alegreya Sans SC', sans-serif",
+    fontFamily: "'Roboto', sans-serif",
     lineHeight: 32,
     textAlign: "left",
-    fontWeight: 700
+    fontWeight: 400
   },
   title: {
     top: 150,
     height: 86,
     left: 132,
     right: 16,
-    fontSize: 40,
+    fontSize: 32,
     color: "white",
-    fontFamily: "'Alegreya Sans SC', sans-serif",
+    fontFamily: "'Roboto', sans-serif",
     lineHeight: 40,
     textAlign: "center",
     fontWeight: 700
   },
   subtitle: {
     top: 300,
-    height: 72,
+    height: 60,
     left: 132,
     right: 16,
-    fontSize: 24,
+    fontSize: 20,
     color: "firebrick",
-    fontFamily: "'Alegreya Sans SC', sans-serif",
-    lineHeight: 32,
+    fontFamily: "'Roboto', sans-serif",
+    lineHeight: 28,
     textAlign: "center",
     fontWeight: 400
   },
@@ -47,7 +47,7 @@ export const verde = {
     right: 320,
     fontSize: 14,
     color: "#222",
-    fontFamily: "'Helvetica', sans-serif",
+    fontFamily: "'Roboto', sans-serif",
     lineHeight: 18,
     textAlign: "left",
     fontWeight: 400
@@ -59,7 +59,7 @@ export const verde = {
     right: 32,
     fontSize: 18,
     color: "#fff",
-    fontFamily: "sans-serif",
+    fontFamily: "'Roboto', sans-serif",
     lineHeight: 32,
     textAlign: "center",
     fontWeight: 700
@@ -71,7 +71,7 @@ export const verde = {
     right: 32,
     fontSize: 32,
     color: "#fff",
-    fontFamily: "sans-serif",
+    fontFamily: "'Roboto', sans-serif",
     lineHeight: 32,
     textAlign: "center",
     fontWeight: 700
@@ -83,7 +83,7 @@ export const verde = {
     right: 32,
     fontSize: 24,
     color: "#fff",
-    fontFamily: "sans-serif",
+    fontFamily: "'Roboto', sans-serif",
     lineHeight: 32,
     textAlign: "center",
     fontWeight: 700
@@ -95,20 +95,20 @@ export const verde = {
     right: 300,
     fontSize: 18,
     color: "#91b756",
-    fontFamily: "sans-serif",
+    fontFamily: "'Roboto', sans-serif",
     lineHeight: 22,
     textAlign: "center",
     fontWeight: 700
   },
   city: {
     top: 690,
-    height: 24,
+    height: 30,
     left: 32,
     right: 300,
     fontSize: 24,
     color: "#91b756",
-    fontFamily: "sans-serif",
-    lineHeight: 24,
+    fontFamily: "'Roboto', sans-serif",
+    lineHeight: 30,
     textAlign: "center",
     fontWeight: 700
   },