diff --git a/cpanfile b/cpanfile
index f22187c..e375c94 100644
--- a/cpanfile
+++ b/cpanfile
@@ -8,6 +8,7 @@ requires 'Mojolicious::Plugin::StaticCache';
 requires 'Mojolicious::Plugin::CSPHeader';
 requires 'Mojolicious::Plugin::FiatTux::Helpers', '== 0.06', url => 'https://framagit.org/fiat-tux/mojolicious/mojolicious-plugin-fiattux-helpers/-/archive/0.06/mojolicious-plugin-fiattux-helpers-0.06.tar.gz';
 requires 'Mojolicious::Plugin::FiatTux::GrantAccess', '== 0.05', url => 'https://framagit.org/fiat-tux/mojolicious/mojolicious-plugin-fiattux-grantaccess/-/archive/0.05/mojolicious-plugin-fiattux-grantaccess-0.05.tar.gz';
+requires 'Mojolicious::Plugin::FiatTux::Themes', '== 0.02', url => 'https://framagit.org/fiat-tux/mojolicious/mojolicious-plugin-fiattux-themes/-/archive/0.02/mojolicious-plugin-fiattux-themes-0.02.tar.gz';
 requires 'Filesys::DiskUsage';
 requires 'Switch';
 requires 'Locale::Maketext';
diff --git a/lib/Lufi.pm b/lib/Lufi.pm
index 2e41533..aeacf05 100644
--- a/lib/Lufi.pm
+++ b/lib/Lufi.pm
@@ -51,15 +51,7 @@ sub startup {
 
 
     # Themes handling
-    shift @{$self->renderer->paths};
-    shift @{$self->static->paths};
-    if ($config->{theme} ne 'default') {
-        my $theme = $self->home->rel_file('themes/'.$config->{theme});
-        push @{$self->renderer->paths}, $theme.'/templates' if -d $theme.'/templates';
-        push @{$self->static->paths}, $theme.'/public' if -d $theme.'/public';
-    }
-    push @{$self->renderer->paths}, $self->home->rel_file('themes/default/templates');
-    push @{$self->static->paths}, $self->home->rel_file('themes/default/public');
+    $self->plugin('FiatTux::Themes');
 
     # Mail config
     my $mail_config = {
diff --git a/lib/Mounter.pm b/lib/Mounter.pm
index 4d43d3c..3d5d455 100644
--- a/lib/Mounter.pm
+++ b/lib/Mounter.pm
@@ -59,12 +59,7 @@ sub startup {
     $self->plugin('Lufi::Plugin::Helpers');
 
     # Themes handling
-    shift @{$self->static->paths};
-    if ($config->{theme} ne 'default') {
-        my $theme = $self->home->rel_file('themes/'.$config->{theme});
-        push @{$self->static->paths}, $theme.'/public' if -d $theme.'/public';
-    }
-    push @{$self->static->paths}, $self->home->rel_file('themes/default/public');
+    $self->plugin('FiatTux::Themes');
 
     $self->plugin('Mount' => {$config->{prefix} => File::Spec->catfile($Bin, '..', 'script', 'application')});
 }