19 files changed, 28 insertions, 502 deletions
diff --git a/pages/bannersca.json b/pages/bannersca.json
deleted file mode 100644
index 105c5c0..0000000
--- a/pages/bannersca.json
+++ /dev/null
@@ -1,3 +0,0 @@
-[
-		"bannersca/virusscans.swig"
-]
diff --git a/pages/bannersca.swig b/pages/bannersca.swig
deleted file mode 100644
index a6e9361..0000000
--- a/pages/bannersca.swig
+++ /dev/null
@@ -1,25 +0,0 @@
-{#
-Copyright (c) 2013 Peter Lejeck <peter.lejeck@gmail.com>
-Copyright (c) 2015 Cupkle <cupkle@openmailbox.org>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#}
-
-{% for banner in bannersca %}
-	{% include banner %}
-{% endfor %}
diff --git a/pages/bannersca/donate.swig b/pages/bannersca/donate.swig
deleted file mode 100644
index d246b35..0000000
--- a/pages/bannersca/donate.swig
+++ /dev/null
@@ -1,39 +0,0 @@
-{#
-Copyright (c) 2013 Peter Lejeck <peter.lejeck@gmail.com>
-Copyright (c) 2015 Cupkle <cupkle@openmailbox.org>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#}
-
-<p class="alert alert-info">
-	<strong>pomf.se es un servici gratuït, però la nostra factura d'allotjament no ho és</strong> &mdash; necessitem al menys 100$ per mes. Les donacions ajuden a pomf.se a seguir sent gratuït, en línia i ràpid. Tot (quotes includes) està destinat a pagar l'allotjament.
-	<span class="donate-btns">
-		<a class="donate-btn donate-paypal" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=BHUVEZY96YZ6N" target="_BLANK">
-			<span class="icon icon-paypal"></span>
-			PayPal
-		</a>
-		<a class="donate-btn donate-bitcoin" href="bitcoin:1CrbCGSTFM5ccmjFoU4jRSQod44Ttu8nHY?label=pomf.se&amp;message=Hosting%20Bills" target="_BLANK">
-			<span class="icon icon-bitcoin"></span>
-			Bitcoin
-		</a>
-		<a class="donate-btn donate-flattr" href="https://flattr.com/submit/auto?user_id=neku&amp;url=http://pomf.se" target="_BLANK">
-			<span class="icon icon-flattr"></span>
-			Flattr
-		</a>
-	</span>
-</p>
diff --git a/pages/bannersca/virusscans.swig b/pages/bannersca/virusscans.swig
deleted file mode 100644
index 23244f9..0000000
--- a/pages/bannersca/virusscans.swig
+++ /dev/null
@@ -1,25 +0,0 @@
-{#
-Copyright (c) 2013 Peter Lejeck <peter.lejeck@gmail.com>
-Copyright (c) 2015 Cupkle <cupkle@openmailbox.org>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#}
-
-<p class="alert alert-info">
-	<strong>Fem ànalisis de virus diariament</strong> &mdash; si es detecta un arxiu infectat, serà borrat sense previ avís.
-</p>
diff --git a/pages/check_fileapica.swig b/pages/check_fileapica.swig
deleted file mode 100644
index aa8943e..0000000
--- a/pages/check_fileapica.swig
+++ /dev/null
@@ -1,25 +0,0 @@
-{#
-Copyright (c) 2013 Peter Lejeck <peter.lejeck@gmail.com>
-Copyright (c) 2015 Cupkle <cupkle@openmailbox.org>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#}
-
-<p id="no-file-api" class="alert alert-error">
-	<strong>El teu navegador és una merda.</strong> Instal·la el <a href="http://firefox.com/">Firefox</a> més recent o <a href="http://chrome.google.com/">Botnet</a> i torna &lt;3
-</p>
diff --git a/pages/check_script.swig b/pages/check_script.swig
index 2da9f79..224c547 100644
--- a/pages/check_script.swig
+++ b/pages/check_script.swig
@@ -20,5 +20,5 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #}
 
 <noscript>
-	<p class="alert alert-error"><a href="https://no.pantsu.cat">Javascript free version</a></p>
+	<p class="alert alert-error">This site requires JavaScript. Please enable JavaScript in your browser or use the <a href="nojs.html">JavaScript-free uploader</a>.</p>
 </noscript>
diff --git a/pages/check_scriptca.swig b/pages/check_scriptca.swig
deleted file mode 100644
index ac4737c..0000000
--- a/pages/check_scriptca.swig
+++ /dev/null
@@ -1,25 +0,0 @@
-{#
-Copyright (c) 2015 the Pantsu.cat developers <hostmaster@pantsu.cat>
-Copyright (c) 2015 Cupkle <cupkle@openmailbox.org>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#}
-
-<noscript>
-   <p class="alert alert-error"><a href="https://no.pantsu.cat">Versió sense Javascript</a></p>
-</noscript>
diff --git a/pages/faq.swig b/pages/faq.swig
index 2bd11de..fcedb56 100644
--- a/pages/faq.swig
+++ b/pages/faq.swig
@@ -1,6 +1,4 @@
 {#
-Copyright (c) 2013 Peter Lejeck <peter.lejeck@gmail.com>
-Copyright (c) 2014 Eric Johansson <neku@pomf.se>
 Copyright (c) 2015 the Pantsu.cat developers <hostmaster@pantsu.cat>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
@@ -25,21 +23,26 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 {% block title %}FAQ{% endblock %}
 {% block body %}
-<div class="jumbotron">
-	<h1>FAQ</h1>
-	{% include "nav.swig" %}
-</div>
-<ul>
-	<li>Pantsu does NOT support Internet Explorer and older versions of Firefox, Chrome, Opera and Safari.</li>
-	<li>Uploading tools for Pantsu can be found at Tools. (Currently working to update them all to work with pantsu.cat)</li>
-	<li>Max file size is {{max_upload_size}}MiB, hopefully I won't have to change this to a even lower number. (read: don't be an ass).</li>
-	<li>No Child porn, anything else goes until I get a lawsuit I guess. (unless its a virus, because that goes into the being an ass category).</li>
-	<li>All filetypes are allowed, ALL! (gif,exe,jpg,rar,ass,srt,etc,etc).</li>
-	<li>No data is collected or logged by us. This won't change. Cloudflare isn't in use</li>
-	<li>Please contact me at <a href="mailto:contact@pantsu.cat">contact@pantsu.cat</a> for any questions.</li>
-	<li>If you wish to send me any DMCA requests please contact me at <a href="mailto:abuse@pantsu.cat">abuse@pantsu.cat</a></li>
-	<li>If any changes to these policies happen you will be informed about them.</li>
-	<li>I will keep the site as transparent as possible. This will include any files that I remove will be publically listed and have a copy of the DMCA notice. For more information please visit the <a href="//transparency.pantsu.cat">transparency information</a> page.</li>
-</ul>
-{% include "banners.swig" %}
+<article>
+	<div class="jumbotron">
+		<h1><abbr title="Frequently asked questions">FAQ</abbr></h1>
+	</div>
+	<h2>What is Pantsu.cat?</h2>
+	<p><span role="definition"><dfn>Pantsu.cat</dfn> is a simple to use free file hosting service.</span> It lets you share your photos, documents, music, videos and more with others online.</p>
+	<h2>What content is allowed?</h2>
+	<p>Pantsu.cat welcomes uploading any content, as long as the content is legal in Australia and you have the legal right to make the content available on our service.</p>
+	<p>As an exception to this policy to prevent abuse, we do not allow malware on our service. Any malware that could be used to infect other computers may be removed from our service at our discretion.</p>
+	<h2>Do you keep logs of uploaded content?</h2>
+	<p>We don't collect or log any data of our users in respect for privacy. We only have files uploaded by our users.</p>
+	<h2>Can you remove my copyrighted content?</h2>
+	<p>Please submit your copyright takedown notice to <a href="mailto:abuse@pantsu.cat">abuse@pantsu.cat</a>. We will handle your notice within 24 hours and disable access to infringing content after receiving a notice compliant with the Copyright Act 1968 (Australia).</p>
+	<h2>Can you remove content that is defaming me or otherwise infringing my non-copyright rights?</h2>
+	<p>Pantsu.cat respects takedowns for other content when accompanied with a certified Australian court order. If you are unable to obtain the order, a preliminary injuction or court order is typically also sufficient. Please forward the notice to <a href="mailto:abuse@pantsu.cat">abuse@pantsu.cat</a>.</p>
+	<h2>Can you remove illegal content?</h2>
+	<p>Please contact the appropriate law enforcement agency if you notice illegal content hosted on Pantsu.cat. We have not been trained or qualified to investigate and fight crimes and enforce the law, so it's not appropriate to send accusations of illegal activity to us. <strong>You must contact the appropriate law enforcement office.</strong> They may then contact us if appropriate.</p>
+	<p>If you are an Australian law enforcement official and you need our assistance, please contact <a href="mailto:abuse@pantsu.cat">abuse@pantsu.cat</a>. If you are a law enforcement official from another country, we may voluntarily cooperate if the crime you are investigating would also be illegal in Australia.</p>
+	<h2>I have a question...</h2>
+	<p>Send us an email at <a href="mailto:contact@pantsu.cat">contact@pantsu.cat</a> and let's talk!</p>
+</article>
+{% include "nav.swig" %}
 {% endblock %}
diff --git a/pages/faqca.swig b/pages/faqca.swig
deleted file mode 100644
index 4debd8c..0000000
--- a/pages/faqca.swig
+++ /dev/null
@@ -1,46 +0,0 @@
-{#
-Copyright (c) 2013 Peter Lejeck <peter.lejeck@gmail.com>
-Copyright (c) 2014 Eric Johansson <neku@pomf.se>
-Copyright (c) 2015 the Pantsu.cat developers <hostmaster@pantsu.cat>
-Copyright (c) 2015 Cupkle <cupkle@openmailbox.org>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#}
-
-{% extends "layoutca.swig" %}
-
-{% block title %}FAQ{% endblock %}
-{% block body %}
-<div class="jumbotron">
-	<h1>FAQ</h1>
-	{% include "navca.swig" %}
-</div>
-<ul>
-	<li>Pantsu no soporta Internet Explorer o versions velles de Firefox, Chrome, Opera o Safari.</li>
-	<li>Existeixen estris de pujada per a Pantsu en <a href="/toolsca.html">Estris</a>.</li>
-	<li>El pes màxim per fitxer és de {{max_upload_size}}MiB. Per favor, no abuseu el servici.</li>
-	<li>No es permiteix pornografia infantil o virus.</li>
-	<li>Qualsevol tipus de fitxer està permitit (gif,exe,jpg,rar,ass,srt,etc,etc).</li>
-	<li>No guardem ningun tipus de dades sobre els usuaris, cosa que no canviarà. No utilitzem Cloudflare</li>
-	<li>Contacteu l'administrador amb l'adreça <a href="mailto:contact@pantsu.cat">contact@pantsu.cat</a> (en anglés).</li>
-	<li>Envieu qualsevol petició DMCA a <a href="mailto:abuse@pantsu.cat">abuse@pantsu.cat</a></li>
-	<li>Si canviem la nostra política, t'informarem.</li>
-	<li>La pàgina intenta ser el més transparent possible. Qualsevol arxiu borrat serà llistat públicament amb la còpia de l'avís DMCA. Per a més informació, visiteu <a href="//transparency.pantsu.cat">informació de transparència</a> page.</li>
-</ul>
-{% include "bannersca.swig" %}
-{% endblock %}
diff --git a/pages/indexca.swig b/pages/indexca.swig
deleted file mode 100644
index d7b468c..0000000
--- a/pages/indexca.swig
+++ /dev/null
@@ -1,37 +0,0 @@
-{#
-Copyright (c) 2013 Peter Lejeck <peter.lejeck@gmail.com>
-Copyright (c) 2015 the Pantsu.cat developers <hostmaster@pantsu.cat>
-Copyright (c) 2015 Cupkle <cupkle@openmailbox.org>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#}
-
-{% extends "layoutca.swig" %}
-
-{% block body %}
-<div class="jumbotron">
-	<h1>Pantsu~</h1>
-	<p class="lead">Màxima grandària de pujada {{max_upload_size}}MiB, llig la <a href="faqca.html">FAQ</a></p>
-	{% include "check_scriptca.swig" %}
-	{% include "check_fileapica.swig" %}
-	{% include "upload_formca.swig" %}
-</div>
-{% include "bannersca.swig" %}
-{% include "navca.swig" %}
-<script src="pomf.min.js"></script>
-{% endblock %}
diff --git a/pages/layoutca.swig b/pages/layoutca.swig
deleted file mode 100644
index 264cedd..0000000
--- a/pages/layoutca.swig
+++ /dev/null
@@ -1,38 +0,0 @@
-{#
-Copyright (c) 2013 Peter Lejeck <peter.lejeck@gmail.com>
-Copyright (c) 2015 the Pantsu.cat developers <hostmaster@pantsu.cat>
-Copyright (c) 2015 Cupkle <cupkle@openmailbox.org>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#}
-
-<!DOCTYPE html>
-<html lang="ca">
-	<head>
-		<meta charset="utf-8">
-		<meta name="viewport" content="width=device-width, initial-scale=1">
-		<title>Pantsu.cat &middot; {% block title %}Allotjament d'Arxius Kawaii{% endblock %}</title>
-		<link rel="icon" href="favicon.ico">
-		<link rel="stylesheet" href="pomf.min.css">
-	</head>
-	<body>
-		<div class="container">
-			{% block body %}Què cony fas ací, baka?{% endblock %}
-		</div>
-	</body>
-</html>
diff --git a/pages/nav.swig b/pages/nav.swig
index 90aec20..775174e 100644
--- a/pages/nav.swig
+++ b/pages/nav.swig
@@ -27,6 +27,5 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 		<li><a href="//git.pantsu.cat/pantsu/pomf">Git</a></li>
 		<li><a href="other.html">Other</a></li>
 		<li><a href="//transparency.pantsu.cat">Transparency</a></li>
-		<li lang="ca"><a href="indexca.html">Català</a></li>
 	</ul>
 </nav>
diff --git a/pages/navca.swig b/pages/navca.swig
deleted file mode 100644
index 748b421..0000000
--- a/pages/navca.swig
+++ /dev/null
@@ -1,33 +0,0 @@
-{#
-Copyright (c) 2015 the Pantsu.cat developers <hostmaster@pantsu.cat>
-Copyright (c) 2015 Cupkle <cupkle@openmailbox.org>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#}
-
-<nav>
-	<ul>
-		<li><a href="indexca.html">Pantsu</a></li>
-		<li><a href="//p.pantsu.cat/">Text</a></li>
-		<li><a href="toolsca.html">Estris</a></li>
-		<li><a href="//git.pantsu.cat/pantsu/pomf">Git</a></li>
-		<li><a href="otherca.html">Altres</a></li>
-		<li><a href="//transparency.pantsu.cat">Transparència</a></li>
-		<li lang="en"><a href="/">English</a></li>
-	</ul>
-</nav>
diff --git a/pages/nojsca.swig b/pages/nojsca.swig
deleted file mode 100644
index 76378ff..0000000
--- a/pages/nojsca.swig
+++ /dev/null
@@ -1,35 +0,0 @@
-{#
-Copyright (c) 2013 Peter Lejeck <peter.lejeck@gmail.com>
-Copyright (c) 2015 the Pantsu.cat developers <hostmaster@pantsu.cat>
-Copyright (c) 2015 Cupkle <cupkle@openmailbox.org>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#}
-
-{% extends "layoutca.swig" %}
-
-{% block body %}
-<div class="jumbotron">
-	<h1>Pantsu~</h1>
-	<p class="lead">Màxima grandària de pujada: {{max_upload_size}}MiB, llig la <a href="faqca.html">FAQ</a></p>
-	{% include "check_fileapica.swig" %}
-	{% include "upload_form_nojs.swig" %}
-</div>
-{% include "bannersca.swig" %}
-{% include "navca.swig" %}
-{% endblock %}
diff --git a/pages/otherca.swig b/pages/otherca.swig
deleted file mode 100644
index 9f963eb..0000000
--- a/pages/otherca.swig
+++ /dev/null
@@ -1,38 +0,0 @@
-{#
-Copyright (c) 2013 Peter Lejeck <peter.lejeck@gmail.com>
-Copyright (c) 2015 the Pantsu.cat developers <hostmaster@pantsu.cat>
-Copyright (c) 2015 Cupkle <cupkle@openmailbox.org>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#}
-
-{% extends "layoutca.swig" %}
-
-{% block title %}Altres Servicis{% endblock %}
-{% block body %}
-<div class="jumbotron">
-	<h1>Altres Servicis</h1>
-</div>
-<ul>
-	<li><a href="//git.pantsu.cat">Git</a></li>
-	<li><a href="firefox/">/g/uia de Firefox</a></li>
-	<li><a href="http://mg7aqol36qpx7oij.onion/">Servici Ocult</a>
-	<li><a href="//no.pantsu.cat">Versió sense JS</a>
-</ul>
-{% include "nav.swig" %}
-{% endblock %}
diff --git a/pages/tools.swig b/pages/tools.swig
index 1a23427..46306d1 100644
--- a/pages/tools.swig
+++ b/pages/tools.swig
@@ -27,7 +27,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 {% block body %}
 <div class="jumbotron">
 <h1>Pomf Tools</h1>
-{% include "nav.swig" %}
 </div>
 <section>
 	<h2>pomfload</h2>
@@ -51,13 +50,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 	<h2>1339secure</h2>
 	<dl>
 		<dt>Download</dt>
-		<dd><a href="https://git.pantsu.cat/pantsucat/pomfsecure">https://git.pantsu.cat/pantsucat/pomfsecure</a></dd>
+		<dd><a href="https://git.pantsu.cat/pantsu/1339secure">https://git.pantsu.cat/pantsu/1339secure</a></dd>
 		<dt>Contact</dt>
 		<dd><a href="mailto:adriankoshcha@teknik.io">adriankoshcha@teknik.io</a></dd>
 	</dl>
 </section>
 <section>
-	<h2>Sharex</h2>
+	<h2>ShareX</h2>
 	<dl>
 		<dt>Download</dt>
 		<dd><a href="https://code.google.com/p/sharex/">https://code.google.com/p/sharex/</a></dd>
@@ -72,7 +71,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 		<dd><a href="https://github.com/pantsu/gyazowin">https://github.com/pantsu/gyazowin</a></dd>
 		<dd><a href="https://i.pantsu.cat/hnpgjr.exe">https://i.pantsu.cat/hnpgjr.exe</a></dd>
 		<dt>Contact</dt>
-		<dd><a href="https://twitter.com/4vailable">https://twitter.com/4vailable</a></dd>
+		<dd><a href="https://twitter.com/4vail">https://twitter.com/4vail</a></dd>
 	</dl>
 </section>
+{% include "nav.swig" %}
 {% endblock %}
diff --git a/pages/toolsca.swig b/pages/toolsca.swig
deleted file mode 100644
index e037073..0000000
--- a/pages/toolsca.swig
+++ /dev/null
@@ -1,79 +0,0 @@
-{#
-Copyright (c) 2013, 2014 Peter Lejeck <peter.lejeck@gmail.com>
-Copyright (c) 2013, 2014 Eric Johansson <neku@pomf.se>
-Copyright (c) 2015 the Pantsu.cat developers <hostmaster@pantsu.cat>
-Copyright (c) 2015 Cupkle <cupkle@openmailbox.org>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#}
-
-{% extends "layoutca.swig" %}
-
-{% block title %}Estris{% endblock %}
-{% block body %}
-<div class="jumbotron">
-<h1>Pomf Tools</h1>
-{% include "nav.swig" %}
-</div>
-<section>
-	<h2>pomfload</h2>
-	<dl>
-		<dt>Descàrrega</dt>
-		<dd><a href="https://git.pantsu.cat/pantsu/pomfload">https://git.pantsu.cat/pantsu/pomfload</a></dd>
-		<dt>Contacte</dt>
-		<dd><a href="https://twitter.com/AnonymousLink">https://twitter.com/AnonymousLink</a></dd>
-	</dl>
-</section>
-<section>
-	<h2>limf</h2>
-	<dl>
-		<dt>Descàrrega</dt>
-		<dd><a href="https://github.com/lich/limf">https://github.com/lich/limf</a></dd>
-		<dt>Contacte</dt>
-		<dd><a href="http://lich.github.io/">http://lich.github.io/</a></dd>
-	</dl>
-</section>
-<section>
-	<h2>1339secure</h2>
-	<dl>
-		<dt>Descàrrega</dt>
-		<dd><a href="https://git.pantsu.cat/pantsucat/pomfsecure">https://git.pantsu.cat/pantsucat/pomfsecure</a></dd>
-		<dt>Contacte</dt>
-		<dd><a href="mailto:adriankoshcha@teknik.io">adriankoshcha@teknik.io</a></dd>
-	</dl>
-</section>
-<section>
-	<h2>Sharex</h2>
-	<dl>
-		<dt>Descàrrega</dt>
-		<dd><a href="https://code.google.com/p/sharex/">https://code.google.com/p/sharex/</a></dd>
-		<dt>Configuració</dt>
-		<dd><a href="https://p.pantsu.cat/view/raw/fcaeab90">https://p.pantsu.cat/view/raw/fcaeab90</a></dd>
-	</dl>
-</section>
-<section>
-	<h2>Client Gyazo (com el de Puush)</h2>
-	<dl>
-		<dt>Descàrrega</dt>
-		<dd><a href="https://github.com/pantsu/gyazowin">https://github.com/pantsu/gyazowin</a></dd>
-		<dd><a href="https://i.pantsu.cat/hnpgjr.exe">https://i.pantsu.cat/hnpgjr.exe</a></dd>
-		<dt>Contacte</dt>
-		<dd><a href="https://twitter.com/4vailable">https://twitter.com/4vailable</a></dd>
-	</dl>
-</section>
-{% endblock %}
diff --git a/pages/upload_form_nojs.swig b/pages/upload_form_nojs.swig
index 378a1d5..1952a0d 100644
--- a/pages/upload_form_nojs.swig
+++ b/pages/upload_form_nojs.swig
@@ -1,5 +1,4 @@
 {#
-Copyright (c) 2013 Peter Lejeck <peter.lejeck@gmail.com>
 Copyright (c) 2015 the Pantsu.cat developers <hostmaster@pantsu.cat>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
@@ -20,8 +19,7 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #}
 
-<form enctype="multipart/form-data" method="post" action="upload.php">
-	<input type="hidden" name="output" value="html">
+<form enctype="multipart/form-data" method="post" action="upload.php?output=html">
 	<input type="file" name="files[]" multiple data-max-size="{{max_upload_size}}MiB">
 	<input type="submit" value="Submit">
 </form> 
diff --git a/pages/upload_formca.swig b/pages/upload_formca.swig
deleted file mode 100644
index 2ba2210..0000000
--- a/pages/upload_formca.swig
+++ /dev/null
@@ -1,26 +0,0 @@
-{#
-Copyright (c) 2013 Peter Lejeck <peter.lejeck@gmail.com>
-Copyright (c) 2015 the Pantsu.cat developers <hostmaster@pantsu.cat>
-Copyright (c) 2015 Cupkle <cupkle@openmailbox.org>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#}
-
-<button id="upload-btn" class="btn" type="button">Selecciona o arrastra fitxers(s) ací</button>
-<input type="file" id="upload-input" name="files[]" multiple data-max-size="{{max_upload_size}}MiB">
-<ul id="upload-filelist"></ul>