diff --git a/package-lock.json b/package-lock.json
index d214dba..8f72fce 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "skizzle",
-	"version": "1.2.0",
+	"version": "2.0.0-alpha",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
@@ -1750,6 +1750,11 @@
 				}
 			}
 		},
+		"cache-service-cache-module": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/cache-service-cache-module/-/cache-service-cache-module-2.0.1.tgz",
+			"integrity": "sha512-Woh8hheJs6m0Mm5kuqtji/8S/Lh5vyE9hh3E4nCp3ah85CJ4Y4/yegjcUe0kEzW14ZjAE46UJBp3FOsZNVmmGA=="
+		},
 		"cacheable-request": {
 			"version": "6.1.0",
 			"resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz",
@@ -6239,6 +6244,14 @@
 				}
 			}
 		},
+		"superagent-cache": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/superagent-cache/-/superagent-cache-3.1.1.tgz",
+			"integrity": "sha512-jNGCNfj6nSQhiSNNqmhOvwFzsizc1Wd4eioHKH4lmgJptkTKBcq5oaBEGQPWsHiF5RtvIbcOXN/wvur7O1xaug==",
+			"requires": {
+				"cache-service-cache-module": "2.x"
+			}
+		},
 		"superagent-proxy": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/superagent-proxy/-/superagent-proxy-2.1.0.tgz",
diff --git a/rollup.config.js b/rollup.config.js
index f63c84b..f8b9cac 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -25,12 +25,14 @@ export default {
 		nodePolyfills(),
 		svelte({
 			compilerOptions: {
-				// enable run-time checks when not in production
 				dev: !production,
 			},
 			preprocess: createPreprocessors(!production),
 		}),
-		css({ output: 'bundle.css' }),
+		css({
+			output: 'bundle.css',
+			sourceMap: !production,
+		}),
 		resolve({
 			browser: true,
 			dedupe: ['svelte'],
diff --git a/src/components/AzureDevOps/AzureDevOps.svelte b/src/components/AzureDevOps/AzureDevOps.svelte
index 1162733..48c9d00 100644
--- a/src/components/AzureDevOps/AzureDevOps.svelte
+++ b/src/components/AzureDevOps/AzureDevOps.svelte
@@ -10,16 +10,18 @@
 	import SearchResults from 'components/SearchResults';
 	import FollowedRepositories from 'components/FollowedRepositories';
 	import Search from 'components/Search';
-	import type { RepositoryType } from 'models/skizzle';
+	import type { ProfileType, RepositoryType } from 'models/skizzle';
 
 	let search: string = '';
 
-	const onSearchSubmit = (repositories: RepositoryType[]) => (
+	const onSearchSubmit = (profile: ProfileType) => async (
 		query: string,
-	): void => {
+	) => {
 		search = query;
 
-		fetchedAzureDevOpsRepositories = repositories.filter(
+		const result = await Service.getRepositories(ProviderEnum.AzureDevOps, { profile });
+
+		fetchedAzureDevOpsRepositories = result.filter(
 			({ projectName, name }) =>
 				name.toLocaleLowerCase().includes(search.toLocaleLowerCase()) ||
 				projectName.toLocaleLowerCase().includes(search.toLocaleLowerCase()),
@@ -44,31 +46,29 @@
 			<AccountSummary {profile} />
 		</section>
 		<div class="content">
-			{#await Service.getRepositories(ProviderEnum.AzureDevOps, { profile })}
-			<p class="loader">Chargement de la liste des repositories...</p>
-			{:then repositories}
-				<section>
-					<AccountTitle>Suivre un nouveau repository</AccountTitle>
-					<p class="intro">
-						Cherchez le nom de son projet et/ou repository associé.
-					</p>
-					<Search
-						onSubmit={onSearchSubmit(repositories)}
-						onCancel={onSearchCancel}
-						disabled={$isFetchingData}
-						placeholder="Rechercher un projet ou un repos"
-					/>
+			<section>
+				<AccountTitle>Suivre un nouveau repository</AccountTitle>
+				<p class="intro">
+					Cherchez le nom de son projet et/ou repository associé.
+				</p>
+				<Search
+					onSubmit={onSearchSubmit(profile)}
+					onCancel={onSearchCancel}
+					disabled={$isFetchingData}
+					placeholder="Rechercher un projet ou un repos"
+				/>
 
-					{#if search}
+				{#if search}
+					{#if $isFetchingData}
+						<p>Recherche en cours...</p>
+					{:else}
 						<SearchResults {search} repos={fetchedAzureDevOpsRepositories} />
 					{/if}
-				</section>
-				<section>
-					<FollowedRepositories {profile} />
-				</section>
-			{:catch}
-				<p class="error">Fetching profile failed.</p>
-			{/await}
+				{/if}
+			</section>
+			<section>
+				<FollowedRepositories {profile} />
+			</section>
 		</div>
 	{:catch}
 		<p class="error">Fetching profile failed.</p>
diff --git a/src/components/FollowedRepositories/FollowedRepositories.svelte b/src/components/FollowedRepositories/FollowedRepositories.svelte
index d4d8dc7..f34ea24 100644
--- a/src/components/FollowedRepositories/FollowedRepositories.svelte
+++ b/src/components/FollowedRepositories/FollowedRepositories.svelte
@@ -29,7 +29,6 @@
 		Vos repositories suivis
 		<button
 			title="Partager votre liste"
-			disabled={$isFetchingData}
 			on:click={() => (shareDisplayed = true)}
 		><Icons.Share /></button>
 	</AccountTitle>
@@ -53,7 +52,6 @@
 								repository.gitUrl,
 								`L'url du repository est copiée dans le presse-papiers.`,
 							)}
-						disabled={$isFetchingData}
 						title="Copier l'url de ce repository"
 					>
 						<Icons.Copy />
@@ -74,7 +72,6 @@
 			<ImportExport
 				{followedRepositories}
 				bind:shareDisplayed
-				provider={profile.provider}
 			/>
 		</Modale>
 	{/if}
diff --git a/src/components/ImportExport/ImportExport.svelte b/src/components/ImportExport/ImportExport.svelte
index 8376d87..52df9d1 100644
--- a/src/components/ImportExport/ImportExport.svelte
+++ b/src/components/ImportExport/ImportExport.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { v4 as uuidv4 } from 'uuid';
-  import { isFetchingData, notifications, pullRequests, repositories } from 'shared/stores/default.store';
+  import { notifications, pullRequests, repositories } from 'shared/stores/default.store';
 	import { HighlightSvelte } from "svelte-highlight";
   import { json } from "svelte-highlight/languages";
 	import Tabs from 'components/Tabs';
@@ -8,12 +8,10 @@
   import { copyToClipboard, isJson } from 'shared/utils';
   import Icons from 'components/icons';
   import type { RepositoryType, ProviderEnum } from 'models/skizzle';
-  
   import 'svelte-highlight/styles/dark.css';
-import { Service } from 'services';
+  import { Service } from 'services';
 
   export let followedRepositories: RepositoryType[];
-  export let provider: ProviderEnum;
   export let shareDisplayed: boolean;
 
   let currentTab: string = 'import';
@@ -77,7 +75,6 @@ import { Service } from 'services';
     <button
     class="copy"
         on:click={() => copyToClipboard(JSON.stringify(getExportCode(), undefined, 2), 'Code copié dans le presse-papier.')}
-        disabled={$isFetchingData}
         title="Copier l'url de ce repository"
       >
       <Icons.Copy />
diff --git a/src/components/SearchResults/SearchResults.svelte b/src/components/SearchResults/SearchResults.svelte
index 5c94e1a..decc119 100644
--- a/src/components/SearchResults/SearchResults.svelte
+++ b/src/components/SearchResults/SearchResults.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { checkRepository } from 'utils';
-	import { isFetchingData, repositories } from 'shared/stores/default.store';
+	import { repositories } from 'shared/stores/default.store';
 	import type { RepositoryType } from 'models/skizzle/RepositoryType';
 
 	export let search: string;
@@ -70,11 +70,13 @@
 						type="checkbox"
 						id={repository.repositoryId}
 						checked={$repositories.some(x => x.repositoryId === repository.repositoryId)}
-						on:change={event => checkRepository(event, repository)}
-						disabled={$isFetchingData} />
+						on:change={event => checkRepository(event, repository)} />
 					<label
 						class="follow"
-						for={repository.repositoryId}>{$repositories.some(x => x.repositoryId === repository.repositoryId) ? 'Ne plus suivre' : 'Suivre'}</label>
+						for={repository.repositoryId}
+					>
+						{$repositories.some(x => x.repositoryId === repository.repositoryId) ? 'Ne plus suivre' : 'Suivre'}
+					</label>
 				</li>
 			{/each}
 		</ul>
diff --git a/src/components/Settings/Settings.svelte b/src/components/Settings/Settings.svelte
index 1e8b656..6baed6f 100644
--- a/src/components/Settings/Settings.svelte
+++ b/src/components/Settings/Settings.svelte
@@ -56,6 +56,17 @@
 			</select>
 		</Fieldset>
 
+		<Fieldset
+			title="Proxy"
+		>
+			<label for="proxy">Serveur et port (ex: http://localhost:3000) : </label>
+			<input
+				id="proxy"
+				type="url"
+				bind:value={$settings.proxy}
+			/>
+		</Fieldset>
+
 		<Fieldset
 			title="Theme"
 			intro="Choisissez un theme pour l'interface de Skizzle."
diff --git a/src/components/Tabs/Tabs.svelte b/src/components/Tabs/Tabs.svelte
index f05caa6..7333e6f 100644
--- a/src/components/Tabs/Tabs.svelte
+++ b/src/components/Tabs/Tabs.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
 	import Icons from 'components/icons';
-	import { isFetchingData } from 'shared/stores/default.store';
 	export let data: any;
 	export let onChange: (value: any) => void;
 	export let current: any;
@@ -15,7 +14,6 @@
 			class="tab"
 			class:current={current === tab || Object.keys(data).length === 1}
 			on:click={() => onChange(tab)}
-			disabled={$isFetchingData}
 		>
 			{#if data[tab].icon}
 				<svelte:component this={data[tab].icon} />
diff --git a/src/electron/electron.ts b/src/electron/electron.ts
index 46f6084..9f2952a 100644
--- a/src/electron/electron.ts
+++ b/src/electron/electron.ts
@@ -17,6 +17,7 @@ import type { SettingsType } from '../models/skizzle/SettingsType';
 import { SkizzleUpdaterEnum } from '../models/skizzle/SkizzleUpdaterEnum';
 import type { ExportType } from '../models/skizzle/ExportType';
 import { WindowEnum } from '../models/skizzle/WindowEnum';
+import { requester } from './requester';
 
 try {
 	require('electron-reloader')(module);
@@ -76,9 +77,7 @@ const createWindow = () => {
 		window = null;
 	});
 
-	if (!app.isPackaged) {
-		window.webContents.openDevTools();
-	}
+	window.webContents.openDevTools({ mode: 'detach' });
 
 	//@ts-ignore
 	window.on('render-process-gone', () => hangOrCrash(window));
@@ -373,6 +372,14 @@ if (!gotTheLock) {
 		},
 	);
 
+	ipcMain.handle('request', async (event, args) => {
+		const { url, options, settings } = JSON.parse(args);
+
+		options['user-agent'] = window.webContents.session.getUserAgent();
+
+		return requester(url, options, settings);
+	});
+
 	ipcMain.on('notifier', (event, arg) => {
 		if (Notification.isSupported()) {
 			const iconName =
diff --git a/src/electron/requester.ts b/src/electron/requester.ts
new file mode 100644
index 0000000..fb4f6d0
--- /dev/null
+++ b/src/electron/requester.ts
@@ -0,0 +1,24 @@
+import type { SettingsType } from '../models/skizzle/SettingsType';
+import type { HeaderType } from '../models/skizzle/HeaderType';
+
+var superagent = require('superagent');
+require('superagent-proxy')(superagent);
+
+export const requester = async (
+	url: string,
+	headers?: HeaderType,
+	settings?: SettingsType,
+) => {
+	try {
+		const result = await superagent
+			.get(url)
+			.retry(3)
+			.proxy(settings.proxy)
+			.set('User-Agent', headers['user-agent'])
+			.auth(headers?.authorization, { type: 'bearer' });
+
+		return result.body;
+	} catch (error) {
+		throw new Error(error);
+	}
+};
diff --git a/src/models/skizzle/HeaderType.ts b/src/models/skizzle/HeaderType.ts
new file mode 100644
index 0000000..6f1bdb7
--- /dev/null
+++ b/src/models/skizzle/HeaderType.ts
@@ -0,0 +1,6 @@
+export type HeaderType = {
+	accept?: string;
+	'content-type'?: string;
+	authorization?: string;
+	'user-agent'?: string;
+};
diff --git a/src/models/skizzle/index.ts b/src/models/skizzle/index.ts
index e1a255f..f34bbc9 100644
--- a/src/models/skizzle/index.ts
+++ b/src/models/skizzle/index.ts
@@ -10,6 +10,7 @@ import type { ReviewType } from './ReviewType';
 import type { SettingsType } from './SettingsType';
 import type { NotificationType } from './NotificationType';
 import type { ExportType } from './ExportType';
+import type { HeaderType } from './HeaderType';
 
 import { ProviderEnum } from './ProviderEnum';
 import { ThemeEnum } from './ThemeEnum';
@@ -32,6 +33,7 @@ export type {
 	UserType,
 	NotificationType,
 	ExportType,
+	HeaderType,
 };
 
 export { ProviderEnum, ThemeEnum, Views, SkizzleUpdaterEnum, WindowEnum };
diff --git a/src/requesters/OAuthAzureDevOps.requester.ts b/src/requesters/OAuthAzureDevOps.requester.ts
index 1e08b37..ada04de 100644
--- a/src/requesters/OAuthAzureDevOps.requester.ts
+++ b/src/requesters/OAuthAzureDevOps.requester.ts
@@ -16,19 +16,18 @@ import type {
 	AzureDevOpsReviewApiType,
 	AzureDevOpsReviewsApiType,
 } from 'models/api';
+import type { HeaderType } from 'models/skizzle';
 import type { OAuthAzureDevOpsConfigType } from 'providers/OAuthAzureDevOpsConfig.provider';
 import { Requester } from './Requester';
 
 export class OAuthAzureDevOpsRequester extends Requester<OAuthAzureDevOpsConfigType> {
 	private readonly API_VERSION = '6.1-preview';
 
-	protected getHeader(config: OAuthAzureDevOpsConfigType): HeadersInit {
-		const headers = new window.Headers();
-
-		headers.append('Content-Type', 'application/json');
-		headers.append('Authorization', `bearer ${config.access_token}`);
-
-		return headers;
+	protected getHeader(config: OAuthAzureDevOpsConfigType): HeaderType {
+		return {
+			'content-type': 'application/json',
+			authorization: config.access_token,
+		};
 	}
 
 	public async getProfile(userId: string): Promise<AzureDevOpsProfileApiType> {
@@ -41,9 +40,6 @@ export class OAuthAzureDevOpsRequester extends Requester<OAuthAzureDevOpsConfigT
 		return (
 			await super.fetch<AzureDevOpsDescriptorApiType>(
 				`https://vssps.dev.azure.com/_apis/graph/descriptors/${userId}?api-version=${this.API_VERSION}`,
-				{
-					cache: true,
-				},
 			)
 		).value;
 	}
@@ -55,9 +51,6 @@ export class OAuthAzureDevOpsRequester extends Requester<OAuthAzureDevOpsConfigT
 		return (
 			await super.fetch<AzureDevOpsAvatarApiType>(
 				`https://vssps.dev.azure.com/${organizationName}/_apis/graph/Subjects/${descriptor}/avatars?size=large&api-version=${this.API_VERSION}`,
-				{
-					cache: true,
-				},
 			)
 		).value;
 	}
diff --git a/src/requesters/OAuthGithub.requester.ts b/src/requesters/OAuthGithub.requester.ts
index 74bf6d7..9d8b21e 100644
--- a/src/requesters/OAuthGithub.requester.ts
+++ b/src/requesters/OAuthGithub.requester.ts
@@ -10,17 +10,16 @@ import type {
 	GithubReviewApiType,
 	GithubReviewsApiType,
 } from 'models/api';
+import type { HeaderType } from 'models/skizzle';
 import type { OAuthGithubConfigType } from 'providers/OAuthGithubConfig.provider';
 import { Requester } from './Requester';
 
 export class OAuthGithubRequester extends Requester<OAuthGithubConfigType> {
-	protected getHeader(config: OAuthGithubConfigType): HeadersInit {
-		const headers = new window.Headers();
-
-		headers.append('Accept', 'application/vnd.github.v3+json');
-		headers.append('Authorization', `bearer ${config.access_token}`);
-
-		return headers;
+	protected getHeader(config: OAuthGithubConfigType): HeaderType {
+		return {
+			accept: 'application/vnd.github.v3+json',
+			authorization: config.access_token,
+		};
 	}
 
 	public async getProfile(): Promise<GithubProfileApiType> {
@@ -74,7 +73,7 @@ export class OAuthGithubRequester extends Requester<OAuthGithubConfigType> {
 		pullRequest?: string,
 	): Promise<GithubCommentApiType[]> {
 		return super.fetch<GithubCommentsApiType>(
-			`https://api.github.com/repos/${owner}/${repository}/issues/${pullRequest}/comments?sort=updated`,
+			`https://api.github.com/repos/${owner}/${repository}/pulls/${pullRequest}/comments?sort=updated`,
 		);
 	}
 
diff --git a/src/requesters/Requester.ts b/src/requesters/Requester.ts
index 8738ba9..cefa6da 100644
--- a/src/requesters/Requester.ts
+++ b/src/requesters/Requester.ts
@@ -1,16 +1,12 @@
-import type { ProviderEnum } from 'models/skizzle';
+import type { HeaderType, ProviderEnum } from 'models/skizzle';
 import type { OAuthConfigType } from 'providers';
 import { client, clientHasProvider } from 'shared/stores/authentication.store';
-import { isLoading, offline } from 'shared/stores/default.store';
-import { authorize } from 'shared/token';
+import { isLoading, offline, settings } from 'shared/stores/default.store';
 import { get } from 'svelte/store';
-import ky from 'ky';
-import type { Dictionary } from 'shared/utils';
+const app = require('electron').ipcRenderer;
 
 export abstract class Requester<T extends OAuthConfigType> {
 	private readonly provider: ProviderEnum;
-	private caches: Dictionary<any> = {};
-
 	constructor(provider: ProviderEnum) {
 		this.provider = provider;
 	}
@@ -19,10 +15,7 @@ export abstract class Requester<T extends OAuthConfigType> {
 		return clientHasProvider(this.provider) && !!config?.access_token;
 	}
 
-	protected async fetch<S>(
-		url: string,
-		options?: { cache: boolean },
-	): Promise<S> {
+	protected async fetch<S>(url: string): Promise<S> {
 		const isOffline = get(offline);
 		const isFetchingToken = get(isLoading);
 		const config = get(client)[this.provider] as T;
@@ -30,41 +23,18 @@ export abstract class Requester<T extends OAuthConfigType> {
 		if (!isOffline && this.clientHasProvider(config) && !isFetchingToken) {
 			const headers = this.getHeader(config);
 
-			const result = ky.get(url, {
-				retry: {
-					methods: ['get'],
-					limit: 3,
-				},
-				hooks: {
-					afterResponse: [
-						(input, options, response) => {
-							if (response.status === 403 || response.status === 203) {
-								client.update(n => ({
-									...n,
-									[this.provider]: {},
-								}));
-
-								authorize(
-									this.provider,
-									response.status === 403 || response.status === 203,
-								);
-							}
-						},
-					],
-				},
-				cache: options && options.cache ? 'force-cache' : 'no-store',
-				headers,
-			});
-
-			const data = await result.json<S>();
-
-			this.caches[url] = data;
+			const data = (await app.invoke(
+				'request',
+				JSON.stringify({
+					url,
+					options: headers,
+					settings: get(settings),
+				}),
+			)) as S;
 
 			return data;
-		} else {
-			return this.caches[url];
 		}
 	}
 
-	protected abstract getHeader(config: T): HeadersInit;
+	protected abstract getHeader(config: T): HeaderType;
 }
diff --git a/src/services/OAuthGithub.service.ts b/src/services/OAuthGithub.service.ts
index aa9ac71..934d1a2 100644
--- a/src/services/OAuthGithub.service.ts
+++ b/src/services/OAuthGithub.service.ts
@@ -83,10 +83,6 @@ export class OAuthGithubService implements IService {
 					pullRequest.number.toString(),
 				);
 
-				comments = comments.filter(
-					comment => comment.user.type === GithubUserEnum.User,
-				);
-
 				let reviewers = await this.requester.getReviews(
 					owner,
 					name,
diff --git a/src/shared/token.ts b/src/shared/token.ts
index cad483e..ca20634 100644
--- a/src/shared/token.ts
+++ b/src/shared/token.ts
@@ -32,6 +32,7 @@ export const getToken = async <T extends OAuthConfigType>(
 				[provider]: {
 					...n[provider],
 					...result,
+					current_date: new Date(),
 				},
 			}));
 		}
diff --git a/src/shared/utils.ts b/src/shared/utils.ts
index 9066333..0175ad4 100644
--- a/src/shared/utils.ts
+++ b/src/shared/utils.ts
@@ -27,9 +27,12 @@ export const getDateStr = (date: Date): string => {
 		Math.abs((date.getTime() - today.getTime()) / oneDay),
 	);
 
+	const hours = `${date.getHours()}`.padStart(2, '0');
+	const minutes = `${date.getMinutes()}`.padStart(2, '0');
+
 	switch (diffDays) {
 		case 0:
-			return `Aujourd'hui à ${date.getHours()}:${date.getMinutes()}`;
+			return `Aujourd'hui à ${hours}:${minutes}`;
 		case 1:
 			return 'Hier';
 		default:
diff --git a/src/utils.ts b/src/utils.ts
index f374606..11d093a 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -6,8 +6,6 @@ export const checkRepository = async (
 	{ target },
 	repository: RepositoryType,
 ) => {
-	console.log({ repository });
-
 	const { checked } = target as HTMLInputElement;
 
 	if (checked) {