diff --git a/config.php b/config.php
index 896afdf..9c4ffd0 100644
--- a/config.php
+++ b/config.php
@@ -1,7 +1,7 @@
 <?php
 
 $BASEDIR = "{$_SERVER['REQUEST_SCHEME']}://{$_SERVER['SERVER_NAME']}$port" . dirname($_SERVER['SCRIPT_NAME']);
-$SCANDIR = "scans";
-$STYLESHEETDIR = "stylesheets";
+$SCANSDIR = "scans";
+$STYLESHEETSDIR = "stylesheets";
 
-$lanScanCmd = "sudo nmap -PSmicrosoft-ds -F -T5 -oX - --stylesheet $BASEDIR/$STYLESHEETDIR/lanScan.xsl";
\ No newline at end of file
+$lanScanCmd = "sudo nmap -PSmicrosoft-ds -F -T5 -oX - --stylesheet $BASEDIR/$STYLESHEETSDIR/lanScan.xsl";
\ No newline at end of file
diff --git a/scan.php b/scan.php
index fe9ab85..9502452 100644
--- a/scan.php
+++ b/scan.php
@@ -7,15 +7,13 @@ if ($lan) {
   $cmd = "$lanScanCmd $lan";
 
   if (!file_exists($SCANSDIR)) mkdir($SCANSDIR);
-  $filname = str_replace("/", "!", $lan);
-  $path = "$SCANSDIR/$filname.xml";
+  $filename = str_replace("/", "!", $lan);
+  $path = "$SCANSDIR/$filename.xml";
 
-  if (!file_exists($path)) {
-    $cmd .= " | tee '$path'";
-  }
+  if (!file_exists($path)) $cmd .= " | tee '$path'";
 
   header('Content-type: text/xml');
-  system($cmd, $retcode);
+  system("$cmd", $retcode);
 }
 
 exit();
\ No newline at end of file
diff --git a/stylesheets/lanScan.xsl b/stylesheets/lanScan.xsl
index 1ad84d4..db939e2 100644
--- a/stylesheets/lanScan.xsl
+++ b/stylesheets/lanScan.xsl
@@ -4,68 +4,95 @@
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
   version="1.1">
 
-  <xsl:output method="html" encoding="UTF-8"/>
-  <xsl:output indent="yes"/>
-  <xsl:strip-space elements='*'/>
+  <xsl:import href="services.xsl" />
 
-  <xsl:variable name="original" select="substring-before(substring-after(processing-instruction('xml-stylesheet'),'original='), '&amp;')"/>
-  <xsl:variable name="init" select="document($original)/nmaprun"/>
+  <xsl:output method="html" encoding="UTF-8" />
+  <xsl:output indent="yes" />
+  <xsl:strip-space elements='*' />
+
+  <xsl:variable name="stylesheetURL"
+    select="substring-before(substring-after(processing-instruction('xml-stylesheet'),'href=&quot;'), '&quot;')" />
+  <xsl:variable name="base" select="concat($stylesheetURL, '/../../')" />
 
   <xsl:template match="nmaprun">
+    <xsl:variable name="targets" select="substring-after(@args, '.xsl ')" />
+    <xsl:variable
+      name="current" select="." />
+    <xsl:variable name="init"
+      select="document(concat($base, 'scans/', $targets, '.xml'))/nmaprun" />
+
     <html lang="fr">
-    <head>
-      <meta charset="utf-8"/>
-      <title>lanScan</title>
-      <link rel="icon" href="favicon.ico"/>
-      <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/fomantic-ui@2.9.3/dist/semantic.min.css"/>
-      <link href="https://cdn.jsdelivr.net/npm/@yaireo/tagify/dist/tagify.css" rel="stylesheet" type="text/css"/>
-      <link href="https://cdn.datatables.net/v/se/jszip-3.10.1/dt-2.1.8/b-3.1.2/b-html5-3.1.2/b-print-3.1.2/cr-2.0.4/fc-5.0.3/fh-4.0.1/r-3.0.3/datatables.min.css" rel="stylesheet"/>
-      <link rel="stylesheet" type="text/css" href="style.css" />
-      <script src="https://code.jquery.com/jquery-3.7.1.js"></script>
-      <script src="https://cdnjs.cloudflare.com/ajax/libs/fomantic-ui/2.9.2/semantic.min.js"></script>
-      <script src="https://cdn.jsdelivr.net/npm/@yaireo/tagify"></script>
-      <script src="https://cdn.jsdelivr.net/npm/@yaireo/tagify/dist/tagify.polyfills.min.js"></script>
-      <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
-      <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
-      <script src="https://cdn.datatables.net/v/se/jszip-3.10.1/dt-2.1.8/b-3.1.2/b-html5-3.1.2/b-print-3.1.2/cr-2.0.4/fc-5.0.3/fh-4.0.1/r-3.0.3/datatables.min.js"></script>
-      <script>
-DataTable.ext.type.detect.unshift(function (d) {
-    return /[\d]+\.[\d]+\.[\d]+\.[\d]+/.test(d)
-        ? 'ipv4-address'
-        : null;
-});
-    
-DataTable.ext.type.order['ipv4-address-pre'] = function (ipAddress) {
-    [a, b, c, d] = ipAddress.split(".").map(Number)
-    return 16777216*a + 65536*b + 256*c + d;
-};
-      </script>
-    </head>
+      <head>
+        <meta charset="utf-8" />
+        <title>lanScan - <xsl:value-of select="$targets" /></title>
+        <base href="{$base}" />
+        <link rel="icon" href="favicon.ico" />
+        <link rel="stylesheet" type="text/css"
+          href="https://cdn.jsdelivr.net/npm/fomantic-ui@2.9.3/dist/semantic.min.css" />
+        <link href="https://cdn.jsdelivr.net/npm/@yaireo/tagify/dist/tagify.css" rel="stylesheet"
+          type="text/css" />
+        <link
+          href="https://cdn.datatables.net/v/se/jszip-3.10.1/dt-2.1.8/b-3.1.2/b-html5-3.1.2/b-print-3.1.2/cr-2.0.4/fc-5.0.3/fh-4.0.1/r-3.0.3/datatables.min.css"
+          rel="stylesheet" />
+        <link rel="stylesheet" type="text/css" href="style.css" />
+        <script src="https://code.jquery.com/jquery-3.7.1.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/fomantic-ui/2.9.2/semantic.min.js"></script>
+        <script src="https://cdn.jsdelivr.net/npm/@yaireo/tagify"></script>
+        <script src="https://cdn.jsdelivr.net/npm/@yaireo/tagify/dist/tagify.polyfills.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/pdfmake.min.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.7/vfs_fonts.js"></script>
+        <script
+          src="https://cdn.datatables.net/v/se/jszip-3.10.1/dt-2.1.8/b-3.1.2/b-html5-3.1.2/b-print-3.1.2/cr-2.0.4/fc-5.0.3/fh-4.0.1/r-3.0.3/datatables.min.js"></script>
+        <script>
+          DataTable.ext.type.detect.unshift(function (d) {
+          return /[\d]+\.[\d]+\.[\d]+\.[\d]+/.test(d)
+          ? 'ipv4-address'
+          : null;
+          });
 
-    <body>
-      <nav class="ui inverted secondary menu">
-        <a href="." class="button item teal logo">lan<svg class="logo" version="1.1" id="Layer_1" x="0px" y="0px" viewBox="0 0 24 24" xml:space="preserve" width="40" height="40" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg"><defs id="defs206"></defs><g id="g998" transform="matrix(0,0.04687491,-0.04687491,0,24,2.2682373e-5)"><g id="g147"><g id="g145"><path d="m 322.065,92.046 c -46.24,0 -83.851,37.619 -83.851,83.857 v 168.712 c 0,25.224 -21.148,45.745 -46.372,45.745 -25.224,0 -46.372,-20.521 -46.372,-45.745 V 199.464 h -38.114 v 145.151 c 0,46.24 38.246,83.859 84.486,83.859 46.24,0 84.486,-37.619 84.486,-83.859 V 175.903 c 0,-25.223 20.514,-45.743 45.737,-45.743 25.223,0 45.737,20.521 45.737,45.743 v 134.092 h 38.114 V 175.903 c 0,-46.239 -37.611,-83.857 -83.851,-83.857 z" id="path143"></path></g></g><g id="g153"><g id="g151"><path d="M 144.198,0 H 108.625 C 98.101,0 89.568,8.746 89.568,19.271 c 0,1.157 0.121,2.328 0.318,3.598 h 73.052 c 0.197,-1.27 0.318,-2.441 0.318,-3.598 C 163.256,8.746 154.723,0 144.198,0 Z" id="path149"></path></g></g><g id="g159"><g id="g157"><path d="m 420.183,486.591 h -71.731 c -0.626,2.541 -0.978,4.077 -0.978,6.176 0,10.525 8.532,19.234 19.057,19.234 h 35.573 c 10.525,0 19.057,-8.709 19.057,-19.234 0,-2.098 -0.352,-3.635 -0.978,-6.176 z" id="path155"></path></g></g><g id="g165"><g id="g163"><rect x="87.027" y="41.925999" width="80.040001" height="138.481" id="rect161"></rect></g></g><g id="g171"><g id="g169"><rect x="344.93301" y="329.052" width="80.040001" height="138.481" id="rect167"></rect></g></g><g id="g173"></g><g id="g175"></g><g id="g177"></g><g id="g179"></g><g id="g181"></g><g id="g183"></g><g id="g185"></g><g id="g187"></g><g id="g189"></g><g id="g191"></g><g id="g193"></g><g id="g195"></g><g id="g197"></g><g id="g199"></g><g id="g201"></g></g></svg>can</a>
-      </nav>
+          DataTable.ext.type.order['ipv4-address-pre'] = function (ipAddress) {
+          [a, b, c, d] = ipAddress.split(".").map(Number)
+          return 16777216*a + 65536*b + 256*c + d;
+          };
+        </script>
+      </head>
 
-      <main class="ui main container">
-      <table id="scanResultsTable" style="width:100%" role="grid" class="ui inverted sortable small table">
-        <thead>
-          <tr>
-            <th>Etat</th>
-            <th>Adresse IP</th>
-            <th>Nom</th>
-            <th>Fabricant</th>
-            <th class="six wide">Services</th>
-            <th>Scanner les services</th>
-          </tr>
-        </thead>
-        <tbody>
-          <xsl:apply-templates select="host | $init/host[not(address/@addr=$current/host/address/@addr)][not(status/@state='down')]"/>
-        </tbody>
-      </table>
-      </main>
+      <body>
+        <nav class="ui inverted secondary menu">
+          <a href="." class="button item logo">lan<svg class="logo" version="1.1" id="Layer_1"
+              x="0px" y="0px" viewBox="0 0 24 24" xml:space="preserve" width="40" height="40"
+              xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg"><defs id="defs206"></defs><g id="g998" transform="matrix(0,0.04687491,-0.04687491,0,24,2.2682373e-5)"><g id="g147"><g id="g145"><path d="m 322.065,92.046 c -46.24,0 -83.851,37.619 -83.851,83.857 v 168.712 c 0,25.224 -21.148,45.745 -46.372,45.745 -25.224,0 -46.372,-20.521 -46.372,-45.745 V 199.464 h -38.114 v 145.151 c 0,46.24 38.246,83.859 84.486,83.859 46.24,0 84.486,-37.619 84.486,-83.859 V 175.903 c 0,-25.223 20.514,-45.743 45.737,-45.743 25.223,0 45.737,20.521 45.737,45.743 v 134.092 h 38.114 V 175.903 c 0,-46.239 -37.611,-83.857 -83.851,-83.857 z" id="path143"></path></g></g><g id="g153"><g id="g151"><path d="M 144.198,0 H 108.625 C 98.101,0 89.568,8.746 89.568,19.271 c 0,1.157 0.121,2.328 0.318,3.598 h 73.052 c 0.197,-1.27 0.318,-2.441 0.318,-3.598 C 163.256,8.746 154.723,0 144.198,0 Z" id="path149"></path></g></g><g id="g159"><g id="g157"><path d="m 420.183,486.591 h -71.731 c -0.626,2.541 -0.978,4.077 -0.978,6.176 0,10.525 8.532,19.234 19.057,19.234 h 35.573 c 10.525,0 19.057,-8.709 19.057,-19.234 0,-2.098 -0.352,-3.635 -0.978,-6.176 z" id="path155"></path></g></g><g id="g165"><g id="g163"><rect x="87.027" y="41.925999" width="80.040001" height="138.481" id="rect161"></rect></g></g><g id="g171"><g id="g169"><rect x="344.93301" y="329.052" width="80.040001" height="138.481" id="rect167"></rect></g></g><g id="g173"></g><g id="g175"></g><g id="g177"></g><g id="g179"></g><g id="g181"></g><g id="g183"></g><g id="g185"></g><g id="g187"></g><g id="g189"></g><g id="g191"></g><g id="g193"></g><g id="g195"></g><g id="g197"></g><g id="g199"></g><g id="g201"></g></g></svg>
+    can</a>
+        </nav>
 
-      <script>
+        <main class="ui main container inverted segment">
+          <h1>
+            <xsl:value-of select="$targets" />
+          </h1>
+
+          <table id="scanResultsTable" style="width:100%" role="grid"
+            class="ui sortable small table">
+            <thead>
+              <tr>
+                <th style="width: min-width">Etat</th>
+                <th>Adresse IP</th>
+                <th>Nom</th>
+                <th>Fabricant</th>
+                <th class="six wide">Services</th>
+                <th style="width: min-width"></th>
+              </tr>
+            </thead>
+            <tbody>
+              <xsl:apply-templates
+                select="$current/host | $init/host[not(address/@addr=$current/host/address/@addr)][not(status/@state='down')]">
+                <xsl:with-param name="init" select="$init" />
+                <xsl:with-param name="current" select="$current" />
+              </xsl:apply-templates>
+            </tbody>
+          </table>
+        </main>
+
+        <script>
 var table = $('#scanResultsTable').DataTable({
     buttons    : ['copy', 'excel', 'pdf'],
     fixedHeader: true,
@@ -93,12 +120,79 @@ function hostScanning(link) {
         position   : 'bottom right',
     })
 }
-      </script>
-    
-    </body>
+        </script>
 
-  </html>
-</xsl:template>
+      </body>
+
+    </html>
+  </xsl:template>
+
+  <xsl:template match="host">
+    <xsl:param name="init" />
+  <xsl:param name="current" />
+  <xsl:variable name="addr"
+      select="address/@addr" />
+  <xsl:variable name="initHost"
+      select="$init/host[address/@addr=$addr]" />
+  <xsl:variable name="currentHost"
+      select="$current/host[address/@addr=$addr]" />
+  <xsl:variable name="hostAddress">
+      <xsl:choose>
+        <xsl:when test="hostnames/hostname/@name">
+          <xsl:value-of select="hostnames/hostname/@name" />
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="address/@addr" />
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+  <tr>
+      <xsl:attribute name="class">
+        <xsl:choose>
+          <xsl:when test="$currentHost/status/@state='up'">positive</xsl:when>
+          <xsl:otherwise>negative</xsl:otherwise>
+        </xsl:choose>
+      </xsl:attribute>
+      <td>
+        <xsl:choose>
+          <xsl:when test="$currentHost">
+            <div>
+              <xsl:attribute name="class">
+                <xsl:text>ui mini circular label </xsl:text>
+                        <xsl:choose>
+                  <xsl:when test="$currentHost/status/@state='up'">green</xsl:when>
+                  <xsl:otherwise>red</xsl:otherwise>
+                </xsl:choose>
+              </xsl:attribute>
+              <xsl:value-of select="$currentHost/status/@state" />
+            </div>
+          </xsl:when>
+          <xsl:otherwise><div class="ui red circular label">down</div></xsl:otherwise>
+        </xsl:choose>
+      </td>
+      <td>
+        <xsl:value-of select="address/@addr" />
+      </td>
+      <td>
+        <b>
+          <xsl:value-of select="substring-before(hostnames/hostname/@name, '.')" />
+        </b>
+        <xsl:if test="substring-after(hostnames/hostname/@name, '.')">
+          <wbr />.<xsl:value-of select="substring-after(hostnames/hostname/@name, '.')" />
+        </xsl:if>
+      </td>
+      <td>
+        <xsl:value-of select="address[@addrtype='mac']/@vendor" />
+      </td>
+      <td></td>
+      <td>
+        <a class="ui mini icon teal icon button">
+          <xsl:attribute name="href">scan.php?host=<xsl:value-of select="address/@addr" /></xsl:attribute>
+          <i class="search plus icon"></i>
+        </a>
+      </td>
+    </tr>
+  </xsl:template>
 
 
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/stylesheets/service.xsl b/stylesheets/services.xsl
similarity index 100%
rename from stylesheets/service.xsl
rename to stylesheets/services.xsl
