diff --git a/Makefile b/Makefile
index 59e95cb584b05b17cecc0db5b6fa25f99dfcfdd3..bb39584fdc0cd877928e54ac74fe5826f2c887b9 100644
--- a/Makefile
+++ b/Makefile
@@ -21,4 +21,4 @@ open:
 	firefox http://localhost/
 
 push:
-	git add public/ src/ && git commit -m "$(msg)" && git push origin HEAD
\ No newline at end of file
+	git add . && git commit -m "$(msg)" && git push origin HEAD
\ No newline at end of file
diff --git a/config.js b/config.js
index 2f677c61bc76a98d868dd805a3ee69803d66d649..9f0a7d9417e61a6696ad8ed66eedcd8ee0679575 100644
--- a/config.js
+++ b/config.js
@@ -1,13 +1 @@
-const ENV = "prod";
-
-let server_url;
-
-switch (ENV) {
-    case "dev":
-        server_url = "http://localhost";
-        break;
-    case "prod":
-        server_url = "http://kuadrado-software.fr";
-}
-
-module.exports = { server_url, in_construction: true };
+module.exports = { server_url: location.origin, in_construction: true };
diff --git a/public/education/education.js b/public/education/education.js
index 7000373e2c802703d2df725f2a96e5b26d1830a9..138b287ef92ac5ab8663877ab8f57423ef185772 100644
--- a/public/education/education.js
+++ b/public/education/education.js
@@ -1,17 +1,5 @@
 (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
-const ENV = "dev";
-
-let server_url;
-
-switch (ENV) {
-    case "dev":
-        server_url = "http://localhost";
-        break;
-    case "prod":
-        server_url = "http://kuadrado-software.fr";
-}
-
-module.exports = { server_url, in_construction: true };
+module.exports = { server_url: location.origin, in_construction: true };
 
 },{}],2:[function(require,module,exports){
 const { server_url } = require("./config");
diff --git a/public/games/games.js b/public/games/games.js
index d919a2a8bdaed5e8d4bd87d24a200d555cee9e86..fb275c848f4f88bf96b359444418be736fb13dff 100644
--- a/public/games/games.js
+++ b/public/games/games.js
@@ -1,17 +1,5 @@
 (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
-const ENV = "dev";
-
-let server_url;
-
-switch (ENV) {
-    case "dev":
-        server_url = "http://localhost";
-        break;
-    case "prod":
-        server_url = "http://kuadrado-software.fr";
-}
-
-module.exports = { server_url, in_construction: true };
+module.exports = { server_url: location.origin, in_construction: true };
 
 },{}],2:[function(require,module,exports){
 const { server_url } = require("./config");
@@ -166,9 +154,7 @@ module.exports = {
 
 function fetchjson(url) {
     return new Promise((resolve, reject) => {
-        const headers = new Headers();
-        headers.append("Accept", "application/json");
-        fetch(url, { mode: "no-cors", headers })
+        fetch(url)
             .then(r => r.json())
             .then(r => resolve(r))
             .catch(e => reject(e));
@@ -176,10 +162,8 @@ function fetchjson(url) {
 }
 
 function fetchtext(url) {
-    const headers = new Headers();
-    headers.append("Accept", "text/html");
     return new Promise((resolve, reject) => {
-        fetch(url, { mode: "no-cors", headers })
+        fetch(url)
             .then(r => r.text())
             .then(r => resolve(r))
             .catch(e => reject(e));
diff --git a/public/main.js b/public/main.js
index 4db5922f63c7a0dfe6a2b310d0f09363656b7942..29a26427a5447544db10906452ddfcb01c5b5ca7 100644
--- a/public/main.js
+++ b/public/main.js
@@ -1,17 +1,5 @@
 (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
-const ENV = "dev";
-
-let server_url;
-
-switch (ENV) {
-    case "dev":
-        server_url = "http://localhost";
-        break;
-    case "prod":
-        server_url = "http://kuadrado-software.fr";
-}
-
-module.exports = { server_url, in_construction: true };
+module.exports = { server_url: location.origin, in_construction: true };
 
 },{}],2:[function(require,module,exports){
 const { server_url } = require("./config");
@@ -435,9 +423,7 @@ module.exports = {
 
 function fetchjson(url) {
     return new Promise((resolve, reject) => {
-        const headers = new Headers();
-        headers.append("Accept", "application/json");
-        fetch(url, { mode: "no-cors", headers })
+        fetch(url)
             .then(r => r.json())
             .then(r => resolve(r))
             .catch(e => reject(e));
@@ -445,10 +431,8 @@ function fetchjson(url) {
 }
 
 function fetchtext(url) {
-    const headers = new Headers();
-    headers.append("Accept", "text/html");
     return new Promise((resolve, reject) => {
-        fetch(url, { mode: "no-cors", headers })
+        fetch(url)
             .then(r => r.text())
             .then(r => resolve(r))
             .catch(e => reject(e));
diff --git a/public/software-development/software-development.js b/public/software-development/software-development.js
index 277576e7b60d69e058267fb083eeed73da82106a..642120b57fbc5200a0d3b012259bc89fcefc773d 100644
--- a/public/software-development/software-development.js
+++ b/public/software-development/software-development.js
@@ -1,17 +1,5 @@
 (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
-const ENV = "dev";
-
-let server_url;
-
-switch (ENV) {
-    case "dev":
-        server_url = "http://localhost";
-        break;
-    case "prod":
-        server_url = "http://kuadrado-software.fr";
-}
-
-module.exports = { server_url, in_construction: true };
+module.exports = { server_url: location.origin, in_construction: true };
 
 },{}],2:[function(require,module,exports){
 const { server_url } = require("./config");
diff --git a/src/lib/fetch.js b/src/lib/fetch.js
index 4ad85bdda6e414baffd6f8e041c11f4fcc8289f5..b734de11918a09b30ee454d33860512d741117fa 100644
--- a/src/lib/fetch.js
+++ b/src/lib/fetch.js
@@ -2,9 +2,7 @@
 
 function fetchjson(url) {
     return new Promise((resolve, reject) => {
-        const headers = new Headers();
-        headers.append("Accept", "application/json");
-        fetch(url, { mode: "no-cors", headers })
+        fetch(url)
             .then(r => r.json())
             .then(r => resolve(r))
             .catch(e => reject(e));
@@ -12,10 +10,8 @@ function fetchjson(url) {
 }
 
 function fetchtext(url) {
-    const headers = new Headers();
-    headers.append("Accept", "text/html");
     return new Promise((resolve, reject) => {
-        fetch(url, { mode: "no-cors", headers })
+        fetch(url)
             .then(r => r.text())
             .then(r => resolve(r))
             .catch(e => reject(e));