diff --git a/var/www/modules/hashDecoded/Flask_hashDecoded.py b/var/www/modules/hashDecoded/Flask_hashDecoded.py
index 1c5f8e89..f775d058 100644
--- a/var/www/modules/hashDecoded/Flask_hashDecoded.py
+++ b/var/www/modules/hashDecoded/Flask_hashDecoded.py
@@ -60,6 +60,15 @@ def list_sparkline_values(date_range_sparkline, hash):
         sparklines_value.append(int(nb_seen_this_day))
     return sparklines_value
 
+def list_sparkline_pgp_values(date_range_sparkline, type_id, key_id):
+    sparklines_value = []
+    for date_day in date_range_sparkline:
+        nb_seen_this_day = r_serv_metadata.hget('pgp:{}:{}'.format(type_id, date_day), key_id)
+        if nb_seen_this_day is None:
+            nb_seen_this_day = 0
+        sparklines_value.append(int(nb_seen_this_day))
+    return sparklines_value
+
 def get_file_icon(estimated_type):
     file_type = estimated_type.split('/')[0]
     # set file icon
@@ -92,6 +101,48 @@ def get_file_icon_text(estimated_type):
 
     return file_icon_text
 
+def get_pgp_id_icon_text(type_id):
+    # set file icon
+    if type_id == 'key':
+        file_icon_text = '\uf084'
+    elif type_id == 'name':
+        file_icon_text = '\uf507'
+    elif type_id == 'mail':
+        file_icon_text = '\uf1fa'
+    else:
+        file_icon_text = '\uf249'
+    return file_icon_text
+
+def verify_pgp_type_id(type_id):
+    if type_id in ['key', 'name', 'mail']:
+        return True
+    else:
+        return False
+
+def get_key_id_metadata(type_id, key_id):
+    key_id_metadata = {}
+    if r_serv_metadata.exists('pgp_metadata_{}:{}'.format(type_id, key_id)):
+        key_id_metadata['first_seen'] = r_serv_metadata.hget('pgp_metadata_{}:{}'.format(type_id, key_id), 'first_seen')
+        key_id_metadata['first_seen'] = '{}/{}/{}'.format(key_id_metadata['first_seen'][0:4], key_id_metadata['first_seen'][4:6], key_id_metadata['first_seen'][6:8])
+        key_id_metadata['last_seen'] = r_serv_metadata.hget('pgp_metadata_{}:{}'.format(type_id, key_id), 'last_seen')
+        key_id_metadata['last_seen'] = '{}/{}/{}'.format(key_id_metadata['last_seen'][0:4], key_id_metadata['last_seen'][4:6], key_id_metadata['last_seen'][6:8])
+        key_id_metadata['nb_seen'] = r_serv_metadata.scard('pgp_{}:{}'.format(type_id, key_id))
+    return key_id_metadata
+
+def get_all_pgp_from_item(item_path):
+    all_pgp_dump = set()
+    if item_path is not None:
+        res = r_serv_metadata.smembers('item_pgp_key:{}'.format(item_path))
+        for pgp_dump in res:
+            all_pgp_dump.add( (pgp_dump, 'key') )
+        res = r_serv_metadata.smembers('item_pgp_name:{}'.format(item_path))
+        for pgp_dump in res:
+            all_pgp_dump.add( (pgp_dump, 'name') )
+        res = r_serv_metadata.smembers('item_pgp_mail:{}'.format(item_path))
+        for pgp_dump in res:
+            all_pgp_dump.add( (pgp_dump, 'mail') )
+    return all_pgp_dump
+
 def one():
     return 1
 
@@ -105,6 +156,14 @@ def all_hash_search():
     show_decoded_files = request.form.get('show_decoded_files')
     return redirect(url_for('hashDecoded.hashDecoded_page', date_from=date_from, date_to=date_to, type=type, encoding=encoding, show_decoded_files=show_decoded_files))
 
+@hashDecoded.route("/hashDecoded/all_pgp_dump_search", methods=['POST'])
+def all_pgp_dump_search():
+    date_from = request.form.get('date_from')
+    date_to = request.form.get('date_to')
+    type_id = request.form.get('type')
+    show_decoded_files = request.form.get('show_decoded_files')
+    return redirect(url_for('hashDecoded.pgpdump_page', date_from=date_from, date_to=date_to, type_id=type_id, show_decoded_files=show_decoded_files))
+
 
 @hashDecoded.route("/hashDecoded/", methods=['GET'])
 def hashDecoded_page():
@@ -706,5 +765,288 @@ def update_vt_result():
         # TODO FIXME make json response
         return jsonify()
 
+## PGPDump ##
+
+@hashDecoded.route("/decoded/pgpdump", methods=['GET'])
+def pgpdump_page():
+    date_from = request.args.get('date_from')
+    date_to = request.args.get('date_to')
+    type_id = request.args.get('type_id')
+
+    show_decoded_files = request.args.get('show_decoded_files')
+
+    if type_id == 'All types':
+        type_id = None
+
+    # verify type input
+    if type_id is not None:
+        #retrieve char
+        type_id = type_id.replace(' ', '')
+        if not verify_pgp_type_id(type_id):
+            type_id = None
+
+    date_range = []
+    if date_from is not None and date_to is not None:
+        #change format
+        try:
+            if len(date_from) != 8:
+                date_from = date_from[0:4] + date_from[5:7] + date_from[8:10]
+                date_to = date_to[0:4] + date_to[5:7] + date_to[8:10]
+            date_range = substract_date(date_from, date_to)
+        except:
+            pass
+
+    if not date_range:
+        date_range.append(datetime.date.today().strftime("%Y%m%d"))
+        date_from = date_range[0][0:4] + '-' + date_range[0][4:6] + '-' + date_range[0][6:8]
+        date_to = date_from
+
+    else:
+        date_from = date_from[0:4] + '-' + date_from[4:6] + '-' + date_from[6:8]
+        date_to = date_to[0:4] + '-' + date_to[4:6] + '-' + date_to[6:8]
+
+    # display day type bar chart
+    if len(date_range) == 1 and type is None:
+        daily_type_chart = True
+        daily_date = date_range[0]
+    else:
+        daily_type_chart = False
+        daily_date = None
+
+    if type_id is None:
+        all_type_id = ['key', 'name', 'mail']
+    else:
+        all_type_id = type_id
+
+    l_pgp_dump = set()
+    if show_decoded_files:
+        for date in date_range:
+            if isinstance(all_type_id, str):
+                l_dump = r_serv_metadata.hkeys('pgp:{}:{}'.format(all_type_id, date))
+                if l_dump:
+                    for dump in l_dump:
+                        l_pgp_dump.add( (dump, all_type_id) )
+            else:
+                for typ_id in all_type_id:
+                    l_dump = r_serv_metadata.hkeys('pgp:{}:{}'.format(typ_id, date))
+                    if l_dump:
+                        for dump in l_dump:
+                            l_pgp_dump.add( (dump, typ_id) )
+
+
+    num_day_sparkline = 6
+    date_range_sparkline = get_date_range(num_day_sparkline)
+
+    sparkline_id = 0
+    pgp_metadata = {}
+    for dump_res in l_pgp_dump:
+        dump_id, typ_id = dump_res
+
+        pgp_metadata[dump_id] = get_key_id_metadata(typ_id, dump_id)
+
+        if pgp_metadata[dump_id]:
+            pgp_metadata[dump_id]['type_id'] = typ_id
+            #file_icon = get_file_icon(estimated_type)
+
+            pgp_metadata[dump_id]['sparklines_data'] = list_sparkline_pgp_values(date_range_sparkline, typ_id, dump_id)
+            pgp_metadata[dump_id]['sparklines_id'] = sparkline_id
+            sparkline_id += 1
+
+    l_type = ['key', 'name', 'mail']
+
+    return render_template("PgpDecoded.html", l_pgpdump=pgp_metadata,
+                                                l_type=l_type, type_id=type_id, daily_type_chart=daily_type_chart, daily_date=daily_date,
+                                                date_from=date_from, date_to=date_to, show_decoded_files=show_decoded_files)
+
+
+
+
+
+@hashDecoded.route('/decoded/show_pgpdump')
+def show_pgpdump():
+    type_id = request.args.get('type_id')
+    key_id = request.args.get('key_id')
+
+    if verify_pgp_type_id(type_id):
+        key_id_metadata = get_key_id_metadata(type_id, key_id)
+        if key_id_metadata:
+
+            num_day_sparkline = 6
+            date_range_sparkline = get_date_range(num_day_sparkline)
+
+            sparkline_values = list_sparkline_pgp_values(date_range_sparkline, type_id, key_id)
+            return render_template('showPgpDump.html', key_id=key_id, type_id=type_id,
+                            key_id_metadata=key_id_metadata,
+                            sparkline_values=sparkline_values)
+        else:
+            return '404'
+    else:
+        return 'error'
+
+@hashDecoded.route('/decoded/pgp_dump_graph_node_json')
+def pgp_dump_graph_node_json():
+    type_id = request.args.get('type_id')
+    key_id = request.args.get('key_id')
+
+    if key_id is not None and verify_pgp_type_id(type_id):
+
+        nodes_set_pgp_dump = set()
+        nodes_set_paste = set()
+        links_set = set()
+
+        pgp_id_metadata = get_key_id_metadata(type_id, key_id)
+
+        #key_id = '</b><script>alert("Hello! I am an alert box!!");</script>'
+
+        nodes_set_pgp_dump.add((key_id, 1, type_id, pgp_id_metadata['first_seen'], pgp_id_metadata['last_seen'], pgp_id_metadata['nb_seen']))
+
+        #get related paste
+        l_pastes = r_serv_metadata.smembers('pgp_{}:{}'.format(type_id, key_id))
+        for paste in l_pastes:
+            nodes_set_paste.add((paste, 2))
+            links_set.add((key_id, paste))
+
+            l_pgpdump = get_all_pgp_from_item(paste)
+            for pgp_dump_with_type in l_pgpdump:
+                pgp_dump, pgp_type_id = pgp_dump_with_type
+                if pgp_dump != key_id:
+
+                    pgp_id_metadata = get_key_id_metadata(pgp_type_id, pgp_dump)
+
+                    nodes_set_pgp_dump.add((pgp_dump, 3, pgp_type_id, pgp_id_metadata['first_seen'], pgp_id_metadata['last_seen'], pgp_id_metadata['nb_seen']))
+                    links_set.add((pgp_dump, paste))
+
+        nodes = []
+        for node in nodes_set_pgp_dump:
+            nodes.append({"id": node[0], "group": node[1], "first_seen": node[3], "last_seen": node[4], "nb_seen_in_paste": node[5], 'icon': get_pgp_id_icon_text(node[2]),"url": url_for('hashDecoded.showHash', hash=node[0]), 'hash': True})
+        for node in nodes_set_paste:
+            nodes.append({"id": node[0], "group": node[1],"url": url_for('showsavedpastes.showsavedpaste', paste=node[0]), 'hash': False})
+        links = []
+        for link in links_set:
+            links.append({"source": link[0], "target": link[1]})
+        json = {"nodes": nodes, "links": links}
+        return jsonify(json)
+
+    else:
+        return jsonify({})
+
+@hashDecoded.route('/hashDecoded/pgp_graph_line_json')
+def pgp_graph_line_json():
+    type_id = request.args.get('type_id')
+    key_id = request.args.get('key_id')
+    date_from = request.args.get('date_from')
+    date_to = request.args.get('date_to')
+
+    # verify input
+    if key_id is not None and verify_pgp_type_id(type_id) and r_serv_metadata.exists('pgp_metadata_{}:{}'.format(type_id, key_id)):
+
+        if date_from is None or date_to is None:
+            nb_days_seen_in_pastes = 30
+        else:
+            # # TODO: # FIXME:
+            nb_days_seen_in_pastes = 30
+
+        date_range_seen_in_pastes = get_date_range(nb_days_seen_in_pastes)
+
+        json_seen_in_paste = []
+        for date in date_range_seen_in_pastes:
+            nb_seen_this_day = r_serv_metadata.zscore('hash_date:'+date, hash)
+            if nb_seen_this_day is None:
+                nb_seen_this_day = 0
+            date = date[0:4] + '-' + date[4:6] + '-' + date[6:8]
+            json_seen_in_paste.append({'date': date, 'value': int(nb_seen_this_day)})
+
+        return jsonify(json_seen_in_paste)
+    else:
+        return jsonify()
+
+@hashDecoded.route('/decoded/pgp_range_type_json')
+def pgp_range_type_json():
+    date_from = request.args.get('date_from')
+    date_to = request.args.get('date_to')
+
+    date_range = []
+    if date_from is not None and date_to is not None:
+        #change format
+        if len(date_from) != 8:
+            date_from = date_from[0:4] + date_from[5:7] + date_from[8:10]
+            date_to = date_to[0:4] + date_to[5:7] + date_to[8:10]
+        date_range = substract_date(date_from, date_to)
+
+    if not date_range:
+        date_range.append(datetime.date.today().strftime("%Y%m%d"))
+
+    range_type = []
+
+    list_type_id = ['key', 'name', 'mail']
+
+
+    if len(date_range) == 1:
+        for type_id in list_type_id:
+            day_type = {}
+            day_type['key'] = 0
+            day_type['name'] = 0
+            day_type['mail'] = 0
+            day_type['date'] = type_id
+            num_day_type_id = 0
+            all_keys = r_serv_metadata.hvals('pgp:{}:{}'.format(type_id, date_range[0]))
+            if all_keys:
+                for val in all_keys:
+                    num_day_type_id += int(val)
+            day_type[type_id]= num_day_type_id
+
+            #if day_type[type_id] != 0:
+            range_type.append(day_type)
+
+    else:
+        # display type_id
+        for date in date_range:
+            day_type = {}
+            day_type['date']= date[0:4] + '-' + date[4:6] + '-' + date[6:8]
+            for type_id in list_type_id:
+                num_day_type_id = 0
+                all_keys = r_serv_metadata.hvals('pgp:{}:{}'.format(type_id, date))
+                if all_keys:
+                    for val in all_keys:
+                        num_day_type_id += int(val)
+                day_type[type_id]= num_day_type_id
+            range_type.append(day_type)
+
+    return jsonify(range_type)
+
+@hashDecoded.route('/decoded/pgp_by_type_json') ####################################
+def pgp_by_type_json():
+    type_id = request.args.get('type_id')
+
+    #retrieve + char
+    type_id = type_id.replace(' ', '+')
+
+    num_day_type = 30
+    date_range = get_date_range(num_day_type)
+
+    #verify input
+    if verify_pgp_type_id(type_id):
+
+        r_serv_metadata.smembers('hash_all_type'):
+            type_value = []
+            all_decoder = r_serv_metadata.smembers('all_decoder')
+
+            range_decoder = []
+            for date in date_range:
+                day_decoder = {}
+                day_decoder['date']= date[0:4] + '-' + date[4:6] + '-' + date[6:8]
+                for decoder in all_decoder:
+                    num_day_decoder = r_serv_metadata.zscore(decoder+'_type:'+type, date)
+                    if num_day_decoder is None:
+                        num_day_decoder = 0
+                    day_decoder[decoder]= num_day_decoder
+                range_decoder.append(day_decoder)
+
+
+
+        return jsonify(range_decoder)
+    else:
+        return jsonify()
+
 # ========= REGISTRATION =========
 app.register_blueprint(hashDecoded, url_prefix=baseUrl)
diff --git a/var/www/modules/hashDecoded/templates/PgpDecoded.html b/var/www/modules/hashDecoded/templates/PgpDecoded.html
new file mode 100644
index 00000000..da568936
--- /dev/null
+++ b/var/www/modules/hashDecoded/templates/PgpDecoded.html
@@ -0,0 +1,657 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <title>Decoded - AIL</title>
+	<link rel="icon" href="{{ url_for('static', filename='image/ail-icon.png') }}">
+
+  <!-- Core CSS -->
+	<link href="{{ url_for('static', filename='css/bootstrap4.min.css') }}" rel="stylesheet">
+	<link href="{{ url_for('static', filename='css/font-awesome.min.css') }}" rel="stylesheet">
+	<link href="{{ url_for('static', filename='css/dataTables.bootstrap.min.css') }}" rel="stylesheet">
+	<link href="{{ url_for('static', filename='css/daterangepicker.min.css') }}" rel="stylesheet">
+
+  <!-- JS -->
+	<script src="{{ url_for('static', filename='js/jquery.js')}}"></script>
+	<script src="{{ url_for('static', filename='js/popper.min.js')}}"></script>
+	<script src="{{ url_for('static', filename='js/bootstrap4.min.js')}}"></script>
+	<script src="{{ url_for('static', filename='js/jquery.dataTables.min.js')}}"></script>
+	<script src="{{ url_for('static', filename='js/dataTables.bootstrap.min.js')}}"></script>
+	<script language="javascript" src="{{ url_for('static', filename='js/moment.min.js') }}"></script>
+	<script language="javascript" src="{{ url_for('static', filename='js/jquery.daterangepicker.min.js') }}"></script>
+	<script language="javascript" src="{{ url_for('static', filename='js/d3.min.js') }}"></script>
+
+	<style>
+		.input-group .form-control {
+			position: unset;
+		}
+		.line {
+  		fill: none;
+  		stroke: #000;
+  		stroke-width: 2.0px;
+		}
+		.bar {
+      fill: steelblue;
+    }
+    .bar:hover{
+      fill: brown;
+			cursor: pointer;
+    }
+		.bar_stack:hover{
+			cursor: pointer;
+    }
+		.pie_path:hover{
+			cursor: pointer;
+		}
+		.svgText {
+  		pointer-events: none;
+		}
+		div.tooltip {
+			position: absolute;
+			text-align: center;
+			padding: 2px;
+			font: 12px sans-serif;
+			background: #ebf4fb;
+			border: 2px solid #b7ddf2;
+			border-radius: 8px;
+			pointer-events: none;
+			color: #000000;
+		}
+	</style>
+</head>
+<body>
+
+	{% include 'nav_bar.html' %}
+
+	<div class="container-fluid">
+		<div class="row">
+
+			{% include 'decoded/menu_sidebar.html' %}
+
+			<div class="col-12 col-lg-10" id="core_content">
+
+				<div class="row">
+					<div class="col-xl-10">
+						<div class="mt-1" id="barchart_type">
+						</div>
+					</div>
+
+					<div class="col-xl-2">
+
+						<div class="card mb-3 mt-2" style="background-color:#d9edf7;">
+						  <div class="card-body text-center py-2">
+						    <h6 class="card-title" style="color:#286090;">Select a date range :</h5>
+								<form action="{{ url_for('hashDecoded.all_pgp_dump_search') }}" id="hash_selector_form" method='post'>
+									<div class="input-group" id="date-range-from">
+										<div class="input-group-prepend"><span class="input-group-text"><i class="far fa-calendar-alt" aria-hidden="true"></i></span></div>
+										<input class="form-control" id="date-range-from-input" placeholder="yyyy-mm-dd" value="{{ date_from }}" name="date_from" autocomplete="off">
+									</div>
+									<div class="input-group" id="date-range-to">
+										<div class="input-group-prepend"><span class="input-group-text"><i class="far fa-calendar-alt" aria-hidden="true"></i></span></div>
+										<input class="form-control" id="date-range-to-input" placeholder="yyyy-mm-dd" value="{{ date_to }}" name="date_to" autocomplete="off">
+									</div>
+									<div class="mt-1" style="font-size: 14px;color:#286090;">Type ID :</div>
+									<select class="custom-select" name="type">
+										<option>All types</option>
+										{% for typ in l_type %}
+											{% if type_id|string() == typ|string() %}
+											<option selected>{{ typ }}</option>
+											{% else %}
+											<option>{{ typ }}</option>
+											{% endif %}
+										{% endfor %}
+									</select>
+									<div class="form-check my-1">
+										<input class="form-check-input" type="checkbox" id="checkbox-input-show" name="show_decoded_files" value="True" {% if show_decoded_files %}checked{% endif %}>
+										<label class="form-check-label" for="checkbox-input-show">
+											<div style="color:#286090; font-size: 14px;">
+												Show dumped keys <i class="fas fa-key"></i>
+											</div>
+										</label>
+									</div>
+									<button class="btn btn-primary" style="text-align:center;">
+										<i class="fas fa-copy"></i> Search
+									</button>
+								<form>
+						  </div>
+						</div>
+
+						<div id="pie_chart_encoded">
+						</div>
+						<div id="pie_chart_top5_types">
+						</div>
+					</div>
+				</div>
+
+				{% if  l_pgpdump|length != 0 %}
+						{% if date_from|string == date_to|string %}
+							<h3> {{ date_from }} Dumped Keys: </h3>
+						{% else %}
+							<h3> {{ date_from }} to {{ date_to }} Dumped Keys: </h3>
+						{% endif %}
+						<table id="tableb64" class="table table-striped table-bordered">
+							<thead class="bg-dark text-white">
+								<tr>
+										<th>type id</th>
+										<th>key id</th>
+										<th>first seen</th>
+										<th>last seen</th>
+										<th>nb paste</th>
+										<th>Sparkline</th>
+								</tr>
+							</thead>
+							<tbody style="font-size: 15px;">
+							{% for pgp_dump in l_pgpdump %}
+									<tr>
+										<td><i class="fas {{ er }}"></i>&nbsp;&nbsp;{{ l_pgpdump[pgp_dump]['type_id'] }}</td>
+										<td><a target="_blank" href="{{ url_for('hashDecoded.show_pgpdump') }}?type_id={{ l_pgpdump[pgp_dump]['type_id'] }}&key_id={{ pgp_dump }}">{{ pgp_dump }}</a></td>
+										<td>{{ l_pgpdump[pgp_dump]['first_seen'] }}</td>
+										<td>{{ l_pgpdump[pgp_dump]['last_seen'] }}</td>
+										<td>{{ l_pgpdump[pgp_dump]['nb_seen'] }}</td>
+										<td id="sparklines_{{ l_pgpdump[pgp_dump]['sparklines_id'] }}" style="text-align:center;"></td>
+									</tr>
+							{% endfor %}
+							</tbody>
+						</table>
+					{% else %}
+						{% if show_decoded_files %}
+							{% if date_from|string == date_to|string %}
+							<h3> {{ date_from }}, No Dumped Keys</h3>
+							{% else %}
+							<h3> {{ date_from }} to {{ date_to }}, No Dumped Keys</h3>
+							{% endif %}
+						{% endif %}
+					{% endif %}
+				</div>
+
+			</div>
+		</div>
+	</div>
+
+<script>
+		var chart = {};
+    $(document).ready(function(){
+				$("#page-Decoded").addClass("active");
+        $("#nav_dashboard_pgp").addClass("active");
+
+				$('#date-range-from').dateRangePicker({
+						separator : ' to ',
+						getValue: function()
+						{
+								if ($('#date-range-from-input').val() && $('#date-range-to').val() )
+										return $('#date-range-from-input').val() + ' to ' + $('#date-range-to').val();
+								else
+										return '';
+						},
+						setValue: function(s,s1,s2)
+						{
+								$('#date-range-from-input').val(s1);
+								$('#date-range-to-input').val(s2);
+						}
+					});
+					$('#date-range-to').dateRangePicker({
+							separator : ' to ',
+							getValue: function()
+							{
+									if ($('#date-range-from-input').val() && $('#date-range-to').val() )
+											return $('#date-range-from-input').val() + ' to ' + $('#date-range-to').val();
+									else
+											return '';
+							},
+							setValue: function(s,s1,s2)
+							{
+									$('#date-range-from-input').val(s1);
+									$('#date-range-to-input').val(s2);
+							}
+					});
+
+					$('#tableb64').DataTable({
+							"aLengthMenu": [[5, 10, 15, -1], [5, 10, 15, "All"]],
+							"iDisplayLength": 10,
+							"order": [[ 3, "desc" ]]
+					});
+
+					{% if  type %}
+					//chart.stackBarChart =barchart_type_stack("{{ url_for('hashDecoded.pgp_by_type_json') }}?type_id={{type}}", 'id');
+					{% elif  daily_type_chart %}
+					chart.stackBarChart =barchart_type_stack("{{ url_for('hashDecoded.pgp_range_type_json') }}?date_from={{daily_date}}&date_to={{daily_date}}", 'id');
+					{% else %}
+					chart.stackBarChart = barchart_type_stack("{{ url_for('hashDecoded.pgp_range_type_json') }}?date_from={{date_from}}&date_to={{date_to}}", 'id');
+					{% endif %}
+
+					//draw_pie_chart("pie_chart_encoded" ,"{{ url_for('hashDecoded.decoder_type_json') }}?date_from={{date_from}}&date_to={{date_to}}&type={{type}}", "{{ url_for('hashDecoded.hashDecoded_page') }}?date_from={{date_from}}&date_to={{date_to}}&type={{type}}&encoding=");
+					//draw_pie_chart("pie_chart_top5_types" ,"{{ url_for('hashDecoded.top5_type_json') }}?date_from={{date_from}}&date_to={{date_to}}&type={{type}}", "{{ url_for('hashDecoded.hashDecoded_page') }}?date_from={{date_from}}&date_to={{date_to}}&type=");
+
+					chart.onResize();
+					$(window).on("resize", function() {
+							chart.onResize();
+					});
+  });
+
+function toggle_sidebar(){
+	if($('#nav_menu').is(':visible')){
+		$('#nav_menu').hide();
+		$('#side_menu').removeClass('border-right')
+		$('#side_menu').removeClass('col-lg-2')
+		$('#core_content').removeClass('col-lg-10')
+	}else{
+		$('#nav_menu').show();
+		$('#side_menu').addClass('border-right')
+		$('#side_menu').addClass('col-lg-2')
+		$('#core_content').addClass('col-lg-10')
+	}
+}
+</script>
+<script>
+//var data = [6,3,3,2,5,3,9];
+
+// a sparklines plot
+function sparklines(id, points) {
+    var width = 100, height = 60;
+
+    var data = []
+    for (i = 0; i < points.length; i++) {
+        data[i] = {
+            'x': i,
+            'y': +points[i]
+        }
+    }
+
+    var x = d3.scaleLinear()
+        .range([0, width - 10])
+        .domain([0,5]);
+
+    var y = d3.scaleLinear()
+        .range([height, 0])
+        .domain([0,10]);
+
+    var line = d3.line()
+                .x(function(d) {return x(d.x)})
+                .y(function(d) {return y(d.y)});
+
+    d3.select("#"+id).append('svg')
+            .attr('width', width)
+            .attr('height', height)
+         .append('path')
+            .attr('class','line')
+            .datum(data)
+            .attr('d', line);
+
+}
+</script>
+<script>
+	{% for pgp_dump in l_pgpdump %}
+		sparklines("sparklines_{{ l_pgpdump[pgp_dump]['sparklines_id'] }}", {{ l_pgpdump[pgp_dump]['sparklines_data'] }})
+	{% endfor %}
+</script>
+
+<script>
+var margin = {top: 20, right: 100, bottom: 55, left: 45},
+				width  = 1000 - margin.left - margin.right,
+				height = 500  - margin.top  - margin.bottom;
+var x = d3.scaleBand().rangeRound([0, width]).padding(0.1);
+
+var y = d3.scaleLinear().rangeRound([height, 0]);
+
+var xAxis = d3.axisBottom(x);
+
+var yAxis = d3.axisLeft(y);
+
+var color = d3.scaleOrdinal(d3.schemeSet3);
+
+var svg = d3.select("#barchart_type").append("svg")
+				.attr("id", "thesvg")
+				.attr("viewBox", "0 0 1000 500")
+				.attr("width",  width  + margin.left + margin.right)
+				.attr("height", height + margin.top  + margin.bottom)
+			.append("g")
+				.attr("transform", "translate(" + margin.left + "," + margin.top + ")");
+
+function barchart_type_stack(url, id) {
+
+  d3.json(url)
+    .then(function(data){
+
+			var labelVar = 'date';  //A
+		  var varNames = d3.keys(data[0])
+		      .filter(function (key) { return key !== labelVar;}); //B
+
+		  data.forEach(function (d) { //D
+		    var y0 = 0;
+		    d.mapping = varNames.map(function (name) {
+		      return {
+		        name: name,
+		        label: d[labelVar],
+		        y0: y0,
+		        y1: y0 += +d[name]
+		      };
+		    });
+		    d.total = d.mapping[d.mapping.length - 1].y1;
+		  });
+
+		  x.domain(data.map(function (d) { return (d.date); })); //E
+		  y.domain([0, d3.max(data, function (d) { return d.total; })]);
+
+			svg.append("g")
+        .attr("class", "x axis")
+        .attr("transform", "translate(0," + height + ")")
+        .call(xAxis)
+				.selectAll("text")
+					.attr("class", "bar")
+					{% if  date_from|string == date_to|string and type is none %}
+						.on("click", function (d) { window.location.href = "{{ url_for('hashDecoded.pgpdump_page') }}?date_from={{date_from}}&date_to={{date_to}}&type_id="+d })
+						.attr("transform", "rotate(-18)" )
+					{% elif  date_from|string == date_to|string and type is not none %}
+						.on("click", function (d) { window.location.href = "{{ url_for('hashDecoded.pgpdump_page') }}?date_from="+d+'&date_to='+d })
+						.attr("transform", "rotate(-18)" )
+					{% else %}
+						.on("click", function (d) { window.location.href = "{{ url_for('hashDecoded.pgpdump_page') }}?date_from="+d+'&date_to='+d })
+						.attr("transform", "rotate(-40)" )
+					{% endif %}
+					.style("text-anchor", "end");
+
+    	svg.append("g")
+        .attr("class", "y axis")
+        .call(yAxis)
+      	.append("text")
+        	.attr("transform", "rotate(-90)")
+        	.attr("y", 6)
+        	.attr("dy", ".71em")
+        	.style("text-anchor", "end");
+
+			var selection = svg.selectAll(".series")
+		    .data(data)
+		    .enter().append("g")
+		      .attr("class", "series")
+		      .attr("transform", function (d) { return "translate(" + x((d.date)) + ",0)"; });
+
+			selection.selectAll("rect")
+	      .data(function (d) { return d.mapping; })
+	    .enter().append("rect")
+				.attr("class", "bar_stack")
+	      .attr("width", x.bandwidth())
+	      .attr("y", function (d) { return y(d.y1); })
+	      .attr("height", function (d) { return y(d.y0) - y(d.y1); })
+	      .style("fill", function (d) { return color(d.name); })
+	      .style("stroke", "grey")
+	      .on("mouseover", function (d) { showPopover.call(this, d); })
+				.on("mouseout", function (d) { removePopovers(); })
+				{% if  date_from|string == date_to|string and type is none %}
+					.on("click", function(d){ window.location.href = "{{ url_for('hashDecoded.pgpdump_page') }}" +'?date_from={{date_from}}&date_to={{date_to}}&type_id='+d.label+'&encoding='+d.name; });
+				{% elif  date_from|string == date_to|string and type is not none %}
+					.on("click", function(d){ window.location.href = "{{ url_for('hashDecoded.pgpdump_page') }}" +'?type_id={{type_id}}&date_from='+d.label+'&date_to='+d.label+'&encoding='+d.name; });
+				{% else %}
+					.on("click", function(d){ window.location.href = "{{ url_for('hashDecoded.pgpdump_page') }}" +'?type_id='+ d.name +'&date_from='+d.label+'&date_to='+d.label; });
+				{% endif %}
+
+				data.forEach(function(d) {
+					if(d.total != 0){
+						svg.append("text")
+								.attr("class", "bar")
+								.attr("dy", "-.35em")
+								.attr('x', x(d.date) + x.bandwidth()/2)
+								.attr('y', y(d.total))
+								{% if  date_from|string == date_to|string and type is none %}
+									.on("click", function () {window.location.href = "{{ url_for('hashDecoded.pgpdump_page') }}"+'?date_from={{date_from}}&date_to={{date_to}}&type_id='+d.date })
+								{% elif  date_from|string == date_to|string and type is not none %}
+									.on("click", function () {window.location.href = "{{ url_for('hashDecoded.pgpdump_page') }}?type_id={{type_id}}&date_from="+d.date+'&date_to='+d.date })
+								{% else %}
+									.on("click", function () {window.location.href = "{{ url_for('hashDecoded.pgpdump_page') }}"+'?date_from='+d.date+'&date_to='+d.date })
+								{% endif %}
+								.style("text-anchor", "middle")
+								.text(d.total);
+					}
+				});
+
+			drawLegend(varNames);
+    });
+
+}
+
+function drawLegend (varNames) {
+    var legend = svg.selectAll(".legend")
+        .data(varNames.slice().reverse())
+      .enter().append("g")
+        .attr("class", "legend")
+        .attr("transform", function (d, i) { return "translate(0," + i * 20 + ")"; });
+
+    legend.append("rect")
+        .attr("x", 943)
+        .attr("width", 10)
+        .attr("height", 10)
+        .style("fill", color)
+        .style("stroke", "grey");
+
+    legend.append("text")
+				.attr("class", "svgText")
+        .attr("x", 941)
+        .attr("y", 6)
+        .attr("dy", ".35em")
+        .style("text-anchor", "end")
+        .text(function (d) { return d; });
+}
+
+function removePopovers () {
+    $('.popover').each(function() {
+      $(this).remove();
+    });
+  }
+
+function showPopover (d) {
+  $(this).popover({
+    title: "<b><span id='tooltip-id-name-bar'></span></b>",
+    placement: 'top',
+    container: 'body',
+    trigger: 'manual',
+    html : true,
+    content: function() {
+      return "<span id='tooltip-id-label'></span>" +
+            "<br/>num: <span id='tooltip-id-value-bar'></span>"; }
+  });
+  $(this).popover('show');
+  $("#tooltip-id-name-bar").text(d.name);
+  $("#tooltip-id-label").text(d.label);
+  $("#tooltip-id-value-bar").text(d3.format(",")(d.value ? d.value: d.y1 - d.y0));
+}
+
+chart.onResize = function () {
+    var aspect = 1000 / 500, chart = $("#thesvg");
+    var targetWidth = chart.parent().width();
+    chart.attr("width", targetWidth);
+    chart.attr("height", targetWidth / aspect);
+  }
+
+window.chart = chart;
+
+</script>
+
+<script>
+function draw_pie_chart(id, url_json, pie_on_click_url) {
+
+		var width_pie = 200;
+		var height_pie = 200;
+		var padding_pie = 10;
+		var opacity_pie = .8;
+
+		var radius_pie = Math.min(width_pie - padding_pie, height_pie - padding_pie) / 2;
+		//var color_pie = d3.scaleOrdinal(d3.schemeCategory10);
+		var color_pie = d3.scaleOrdinal(d3.schemeSet3);
+
+		var div_pie = d3.select("body").append("div")
+				.attr("class", "tooltip")
+				.style("opacity", 0);
+
+		var svg_pie = d3.select("#"+id)
+				.append('svg')
+				.attr("width", '100%')
+				.attr("height", '100%')
+				.attr('viewBox','0 0 '+Math.min(width_pie,height_pie) +' '+Math.min(width_pie,height_pie) )
+				.attr('preserveAspectRatio','xMinYMin')
+
+
+		var g_pie = svg_pie.append('g')
+				.attr('transform', 'translate(' + (width_pie/2) + ',' + (height_pie/2) + ')');
+
+		var arc_pie = d3.arc()
+				.innerRadius(0)
+				.outerRadius(radius_pie);
+
+		d3.json(url_json)
+			.then(function(data){
+
+			var pie_pie = d3.pie()
+					.value(function(d) { return d.value; })
+					.sort(null);
+
+			var path_pie = g_pie.selectAll('path')
+				  .data(pie_pie(data))
+				  .enter()
+				  .append("g")
+				  .append('path')
+				  .attr('d', arc_pie)
+				  .attr('fill', (d,i) => color_pie(i))
+					.attr('class', 'pie_path')
+					.on("mouseover", mouseovered_pie)
+					.on("mouseout", mouseouted_pie)
+					.on("click", function (d) {window.location.href = pie_on_click_url+d.data.name })
+				  .style('opacity', opacity_pie)
+				  .style('stroke', 'white');
+			});
+
+
+		function mouseovered_pie(d) {
+      //remove old content
+      $("#tooltip-id-name").remove();
+      $("#tooltip-id-value").remove();
+
+			// tooltip
+			var content;
+
+			content = "<b><span id='tooltip-id-name'></span></b><br/>"+
+								"<br/>"+
+								"<i>Decoded</i>: <span id='tooltip-id-value'></span><br/>"
+
+			div_pie.transition()
+				.duration(200)
+				.style("opacity", .9);
+			div_pie.html(content)
+				.style("left", (d3.event.pageX) + "px")
+				.style("top", (d3.event.pageY - 28) + "px");
+
+      $("#tooltip-id-name").text(d.data.name);
+      $("#tooltip-id-value").text(d.data.value);
+		}
+
+		function mouseouted_pie() {
+			div_pie.transition()
+				.duration(500)
+				.style("opacity", 0);
+		}
+}
+
+</script>
+
+
+
+<script>
+function barchart_type(url, id) {
+
+
+  var margin = {top: 20, right: 20, bottom: 70, left: 40};
+
+  var width = 960 - margin.left - margin.right;
+  var height = 500 - margin.top - margin.bottom;
+
+  var x = d3.scaleBand().rangeRound([0, width]).padding(0.1);
+  var y = d3.scaleLinear().rangeRound([height, 0]);
+
+  var xAxis = d3.axisBottom(x)
+    //.tickFormat(d3.time.format("%Y-%m"));
+
+  var yAxis = d3.axisLeft(y)
+    .ticks(10);
+
+/*var svg = d3.select(id).append("svg")
+      .attr("width", width + margin.left + margin.right)
+      .attr("height", height + margin.top + margin.bottom)
+			.attr("id", "thesvg")
+      .append("g")
+        .attr("transform",
+          "translate(" + margin.left + "," + margin.top + ")");*/
+
+
+  d3.json(url)
+    .then(function(data){
+
+        data.forEach(function(d) {
+          d.value = +d.value;
+        });
+
+				x.domain(data.map(function(d) { return d.date; }));
+        y.domain([0, d3.max(data, function(d) { return d.value; })]);
+
+        var label = svg.append("g")
+            .attr("class", "x axis")
+            .attr("transform", "translate(0," + height + ")")
+            .call(xAxis)
+          .selectAll("text")
+            .style("text-anchor", "end")
+            .attr("dx", "-.8em")
+            .attr("dy", "-.55em")
+						{% if  daily_type_chart %}
+						.attr("transform", "rotate(-20)" );
+						{% else %}
+						.attr("transform", "rotate(-70)" )
+						.attr("class", "bar")
+						.on("click", function (d) { window.location.href = "{{ url_for('hashDecoded.hashDecoded_page') }}"+'?date_from='+d+'&date_to='+d });
+						{% endif %}
+
+        svg.append("g")
+            .attr("class", "y axis")
+            .call(yAxis)
+          .append("text")
+            .attr("transform", "rotate(-90)")
+            .attr("y", 6)
+            .attr("dy", ".71em")
+            .style("text-anchor", "end")
+            .text("Value ($)");
+
+        var bar = svg.selectAll("bar")
+            .data(data)
+          .enter().append("rect")
+            .attr("class", "bar")
+            //.style("fill", "steelblue")
+						.attr("x", function(d) { return x(d.date); })
+            .attr("width", x.bandwidth())
+            .attr("y", function(d) { return y(d.value); })
+            .attr("height", function(d) { return height - y(d.value); })
+						{% if  type %}
+            .on("click", function(d){ window.location.href = "{{ url_for('hashDecoded.hashDecoded_page') }}" +'?type={{type}}&date_from='+ d.date +'&date_to='+ d.date; });
+						{% endif  %}
+						{% if  daily_type_chart %}
+						.on("click", function(d){ window.location.href = "{{ url_for('hashDecoded.hashDecoded_page') }}" +'?type='+d.date+'&date_from={{ daily_date }}&date_to={{ daily_date }}'; });
+						{% endif  %}
+
+
+        data.forEach(function(d) {
+          if(d.value != 0){
+            svg.append("text")
+                .attr("class", "bar")
+                .attr("dy", "-.35em")
+                //.text(function(d) { return d.value; });
+                .text(d.value)
+								.style("text-anchor", "middle")
+								.attr('x', x(d.date) + x.bandwidth()/2)
+                .attr('y', y(d.value));
+          }
+        });
+
+    });
+
+}
+</script>
+
+
+</body>
+
+</html>
diff --git a/var/www/modules/hashDecoded/templates/hashDecoded.html b/var/www/modules/hashDecoded/templates/hashDecoded.html
index bf0a12bf..e031530a 100644
--- a/var/www/modules/hashDecoded/templates/hashDecoded.html
+++ b/var/www/modules/hashDecoded/templates/hashDecoded.html
@@ -493,16 +493,19 @@ function removePopovers () {
 
 function showPopover (d) {
   $(this).popover({
-    title: d.name,
+    title: "<b><span id='tooltip-id-name-bar'></span></b>",
     placement: 'top',
     container: 'body',
     trigger: 'manual',
     html : true,
     content: function() {
-      return d.label +
-            "<br/>num: " + d3.format(",")(d.value ? d.value: d.y1 - d.y0); }
+      return "<span id='tooltip-id-label'></span>" +
+            "<br/>num: <span id='tooltip-id-value-bar'></span>"; }
   });
-  $(this).popover('show')
+  $(this).popover('show');
+  $("#tooltip-id-name-bar").text(d.name);
+  $("#tooltip-id-label").text(d.label);
+  $("#tooltip-id-value-bar").text(d3.format(",")(d.value ? d.value: d.y1 - d.y0));
 }
 
 chart.onResize = function () {
@@ -571,13 +574,16 @@ function draw_pie_chart(id, url_json, pie_on_click_url) {
 
 
 		function mouseovered_pie(d) {
+      //remove old content
+      $("#tooltip-id-name").remove();
+      $("#tooltip-id-value").remove();
 
 			// tooltip
 			var content;
 
-			content = "<b>"+d.data.name+"</b>"+"<br/>"+
+			content = "<b><span id='tooltip-id-name'></span></b><br/>"+
 								"<br/>"+
-								"<i>Decoded</i>: "+d.data.value+"<br/>"
+								"<i>Decoded</i>: <span id='tooltip-id-value'></span><br/>"
 
 			div_pie.transition()
 				.duration(200)
@@ -585,6 +591,9 @@ function draw_pie_chart(id, url_json, pie_on_click_url) {
 			div_pie.html(content)
 				.style("left", (d3.event.pageX) + "px")
 				.style("top", (d3.event.pageY - 28) + "px");
+
+      $("#tooltip-id-name").text(d.data.name);
+      $("#tooltip-id-value").text(d.data.value);
 		}
 
 		function mouseouted_pie() {
diff --git a/var/www/modules/hashDecoded/templates/showHash.html b/var/www/modules/hashDecoded/templates/showHash.html
index 45faf5c8..c7cac4d8 100644
--- a/var/www/modules/hashDecoded/templates/showHash.html
+++ b/var/www/modules/hashDecoded/templates/showHash.html
@@ -171,8 +171,8 @@
 								</div>
 								<div class="card-body text-center">
 									{% for encoding in list_hash_decoder %}
-									<button class="btn" disabled>
-										{{encoding['encoding']}} <span class="badge">{{encoding['nb_seen']}}</span>
+									<button class="btn btn-outline-dark" disabled>
+										{{encoding['encoding']}} <span class="badge badge-dark">{{encoding['nb_seen']}}</span>
 									</button>
 									{% endfor %}
 								</div>
@@ -398,8 +398,7 @@ d3.json(url)
 	node.append('text')
 		  .attr('text-anchor', 'middle')
 		  .attr('dominant-baseline', 'central')
-		  .attr("class", "graph_node_icon")
-    	.attr('font-family', 'FontAwesome')
+		  .attr("class", "graph_node_icon fa")
     	.attr('font-size', '8px' )
 			.attr('pointer-events', 'none')
     	.text(function(d) {
@@ -475,24 +474,36 @@ function mouseovered(d) {
 var content;
 
 if(d.hash == true){
-	content = "<b>"+d.id+"</b>"+"<br/>"+
+	content = "<b><span id='tooltip-id-name'></span></b><br/>"+
 						"<br/>"+
-						"<i>First seen</i>: "+d.first_seen+"<br/>"+
-						"<i>Last seen</i>: "+d.last_seen+"<br/>"+
-						"<i>nb_seen_in_paste</i>: "+d.nb_seen_in_paste+"<br/>"+
-						"<i>Size (kb)</i>: "+d.size+"<br/>"+
-						"<br/>"+
-						"<i>Estimated type</i>: "+d.estimated_type;
-} else {
-	content = "<b>"+d.id+"</b>"+"<br/>";
-}
+						"<i>First seen</i>: <span id='tooltip-id-first_seen'></span><br/>"+
+						"<i>Last seen</i>: <span id='tooltip-id-last_seen'></span><br/>"+
+						"<i>nb_seen</i>: <span id='tooltip-id-nb_seen'></span>";
 
 	div.transition()
-		.duration(200)
-		.style("opacity", .9);
+		 .duration(200)
+				.style("opacity", .9);
 	div.html(content)
-		.style("left", (d3.event.pageX) + "px")
-		.style("top", (d3.event.pageY - 28) + "px");
+		 .style("left", (d3.event.pageX) + "px")
+		 .style("top", (d3.event.pageY - 28) + "px");
+
+	$("#tooltip-id-name").text(d.id);
+	$("#tooltip-id-first_seen").text(d.first_seen);
+	$("#tooltip-id-last_seen").text(d.last_seen);
+	$("#tooltip-id-nb_seen").text(d.nb_seen_in_paste);
+
+} else {
+	content = "<b><span id='tooltip-id-name'></span></b><br/>";
+
+	div.transition()
+		 .duration(200)
+				.style("opacity", .9);
+	div.html(content)
+		 .style("left", (d3.event.pageX) + "px")
+		 .style("top", (d3.event.pageY - 28) + "px");
+
+	$("#tooltip-id-name").text(d.id);
+}
 
 	//links
 	/*link.style("stroke-opacity", function(o) {
diff --git a/var/www/modules/hashDecoded/templates/showPgpDump.html b/var/www/modules/hashDecoded/templates/showPgpDump.html
new file mode 100644
index 00000000..8f7b05aa
--- /dev/null
+++ b/var/www/modules/hashDecoded/templates/showPgpDump.html
@@ -0,0 +1,569 @@
+<!DOCTYPE html>
+<html>
+
+	<head>
+	  <meta charset="utf-8">
+
+	  <title>AIL - framework</title>
+		<link rel="icon" href="{{ url_for('static', filename='image/ail-icon.png') }}">
+
+	  <!-- Core CSS -->
+		<link href="{{ url_for('static', filename='css/bootstrap4.min.css') }}" rel="stylesheet">
+		<link href="{{ url_for('static', filename='css/font-awesome.min.css') }}" rel="stylesheet">
+
+	  <!-- JS -->
+		<script src="{{ url_for('static', filename='js/jquery.js')}}"></script>
+		<script src="{{ url_for('static', filename='js/popper.min.js')}}"></script>
+		<script src="{{ url_for('static', filename='js/bootstrap4.min.js')}}"></script>
+		<script language="javascript" src="{{ url_for('static', filename='js/d3.min.js') }}"></script>
+
+		<style>
+		line.link {
+			stroke: #666;
+		}
+		line.link:hover{
+			stroke: red;
+			stroke-width: 2px
+		}
+		.line_sparkline {
+			fill: none;
+			stroke: #000;
+			stroke-width: 2.0px;
+		}
+		.node {
+			pointer-events: all;
+		}
+
+		circle {
+			stroke: none;
+		}
+
+		.graph_text_node {
+			font: 8px sans-serif;
+			pointer-events: none;
+		}
+
+		.graph_node_icon {
+			pointer-events: none;
+		}
+
+		.node text {
+			font: 8px sans-serif;
+			pointer-events: auto;
+		}
+
+		div.tooltip {
+			position: absolute;
+			text-align: center;
+			padding: 2px;
+			font: 12px sans-serif;
+			background: #ebf4fb;
+			border: 2px solid #b7ddf2;
+			border-radius: 8px;
+			pointer-events: none;
+			color: #000000;
+		}
+
+		.graph_panel {
+			padding: unset;
+		}
+
+		.line_graph {
+		  fill: none;
+		  stroke: steelblue;
+		  stroke-width: 2px;
+			stroke-linejoin: round;
+			stroke-linecap: round;
+			stroke-width: 1.5;
+			/*attr('stroke', '#bcbd22').*/
+		}
+		</style>
+	</head>
+	<body>
+
+		{% include 'nav_bar.html' %}
+
+		<div class="container-fluid">
+			<div class="row">
+
+				{% include 'decoded/menu_sidebar.html' %}
+
+				<div class="col-12 col-lg-10" id="core_content">
+
+					<div class="card my-3">
+						<div class="card-header" style="background-color:#d9edf7;font-size: 15px">
+							<h4 class="text-secondary">{{ key_id }} :</h4>
+							<ul class="list-group mb-2">
+								<li class="list-group-item py-0">
+									<div class="row">
+										<div class="col-md-10">
+											<table class="table">
+												<thead>
+													<tr>
+														<th>type</th>
+														<th>First_seen</th>
+														<th>Last_seen</th>
+														<th>Nb seen</th>
+													</tr>
+												</thead>
+												<tbody>
+													<tr>
+														<td><i class="fas {{ d }}"></i>&nbsp;&nbsp;{{ type_id }}</td>
+														<td>{{ key_id_metadata['first_seen'] }}</td>
+														<td>{{ key_id_metadata['last_seen'] }}</td>
+														<td>{{ key_id_metadata['nb_seen'] }}</td>
+													</tr>
+												</tbody>
+											</table>
+										</div>
+										<div class="col-md-1">
+											<div id="sparkline"></div>
+										</div>
+									</div>
+								</li>
+							</ul>
+						</div>
+					</div>
+
+					<div class="row">
+						<div class="col-xl-10">
+
+							<div class="card mb-3">
+								<div class="card-header">
+									<i class="fas fa-project-diagram"></i> Graph
+								</div>
+								<div class="card-body graph_panel">
+									<div id="graph">
+									</div>
+								</div>
+							</div>
+						</div>
+
+						<div class="col-xl-2">
+
+							<div class="card my-3">
+								<div class="card-header">
+									<i class="fas fa-project-diagram"></i> Graph
+								</div>
+								<div class="card-body text-center px-0 py-0">
+									<button class="btn btn-primary my-4" onclick="resize_graph();">
+										<i class="fas fa-sync"></i>&nbsp;Resize Graph
+									</button>
+
+
+									<ul class="list-group">
+										<li class="list-group-item list-group-item-info"><i class="fas fa-info-circle fa-2x"></i></li>
+										<li class="list-group-item text-left">
+											<p>Double click on a node to open Hash/Paste<br><br>
+												<svg height="12" width="12"><g class="nodes"><circle cx="6" cy="6" r="6" fill="orange"></circle></g></svg>
+												Current Hash<br>
+												<svg height="12" width="12"><g class="nodes"><circle cx="6" cy="6" r="6" fill="rgb(141, 211, 199)"></circle></g></svg>
+												Hashes<br>
+												<svg height="12" width="12"><g class="nodes"><circle cx="6" cy="6" r="6" fill="#1f77b4"></circle></g></svg>
+												Pastes
+											</p>
+										</li>
+										<li class="list-group-item list-group-item-info">
+											Hash Types:
+										</li>
+										<li class="list-group-item text-left">
+											<i class="fas fa-key"></i>  Key<br>
+											<i class="fas fa-user-tag"></i>  Name<br>
+											<i class="fas fa-at"></i>  Mail<br>
+										</li>
+									</ul>
+								</div>
+							</div>
+						</div>
+					</div>
+
+					<div class="card">
+						<div class="card-header">
+							<i class="fas fa-chart-bar"></i> Graph
+						</div>
+						<div class="panel-body ">
+							<div id="graph_line">
+							</div>
+						</div>
+					</div>
+
+				</div>
+			</div>
+		</div>
+
+<script>
+var all_graph = {};
+$(document).ready(function(){
+		$("#page-Decoded").addClass("active");
+		sparklines("sparkline", {{ sparkline_values }})
+
+		all_graph.node_graph = create_graph("{{ url_for('hashDecoded.pgp_dump_graph_node_json') }}?type_id={{type_id}}&key_id={{key_id}}");
+		all_graph.line_chart = create_line_chart('graph_line', "{{ url_for('hashDecoded.pgp_graph_line_json') }}?type_id={{type_id}}&key_id={{key_id}}");
+		all_graph.onResize();
+});
+
+$(window).on("resize", function() {
+		all_graph.onResize();
+});
+
+function toggle_sidebar(){
+	if($('#nav_menu').is(':visible')){
+		$('#nav_menu').hide();
+		$('#side_menu').removeClass('border-right')
+		$('#side_menu').removeClass('col-lg-2')
+		$('#core_content').removeClass('col-lg-10')
+	}else{
+		$('#nav_menu').show();
+		$('#side_menu').addClass('border-right')
+		$('#side_menu').addClass('col-lg-2')
+		$('#core_content').addClass('col-lg-10')
+	}
+}
+</script>
+
+<script>
+	function resize_graph() {
+		zoom.translateTo(svg_node, 200, 200);
+		zoom.scaleTo(svg_node, 2);
+	}
+
+</script>
+<script>
+//var data = [6,3,3,2,5,3,9];
+
+// a sparklines plot
+function sparklines(id, points) {
+    var width_spark = 100, height_spark = 60;
+
+    var data = []
+    for (i = 0; i < points.length; i++) {
+        data[i] = {
+            'x': i,
+            'y': +points[i]
+        }
+    }
+
+    var x = d3.scaleLinear()
+        .range([0, width_spark - 10])
+        .domain([0,5]);
+
+    var y = d3.scaleLinear()
+        .range([height_spark, 0])
+        .domain([0,10]);
+
+    var line = d3.line()
+                .x(function(d) {return x(d.x)})
+                .y(function(d) {return y(d.y)});
+
+    d3.select("#"+id).append('svg')
+            .attr('width', width_spark)
+            .attr('height', height_spark)
+         .append('path')
+            .attr('class','line_sparkline')
+            .datum(data)
+            .attr('d', line);
+
+}
+</script>
+
+<script>
+var width = 400,
+		height = 400;
+
+var link;
+
+var zoom = d3.zoom()
+	.scaleExtent([.2, 10])
+	.on("zoom", zoomed);
+
+//var transform = d3.zoomIdentity;
+
+var color = d3.scaleOrdinal(d3.schemeCategory10);
+
+var div = d3.select("body").append("div")
+		.attr("class", "tooltip")
+		.style("opacity", 0);
+
+var simulation = d3.forceSimulation()
+		.force("link", d3.forceLink().id(function(d) { return d.id; }))
+		.force("charge", d3.forceManyBody())
+		.force("center", d3.forceCenter(width / 2, height / 2));
+		//.on("tick", ticked);
+
+var svg_node = d3.select("#graph").append("svg")
+		.attr("id", "graph_div")
+		.attr("width", width)
+		.attr("height", height)
+		.call(d3.zoom().scaleExtent([1, 8]).on("zoom", zoomed))
+		.on("dblclick.zoom", null)
+
+var container_graph = svg_node.append("g");
+		//.attr("transform", "translate(40,0)")
+		//.attr("transform", "scale(2)");
+
+function create_graph(url){
+
+d3.json(url)
+.then(function(data){
+
+	link = container_graph.append("g")
+	.selectAll("line")
+	.data(data.links)
+	.enter().append("line")
+		.attr("class", "link");
+		//.attr("stroke-width", function(d) { return Math.sqrt(d.value); })
+
+	var node = container_graph.selectAll(".node")
+				.data(data.nodes)
+			.enter().append("g")
+			.attr("class", "nodes")
+			.on("dblclick", doubleclick)
+			.on("click", click)
+			.on("mouseover", mouseovered)
+			.on("mouseout", mouseouted)
+			.call(d3.drag()
+					.on("start", drag_start)
+					.on("drag", dragged)
+					.on("end", drag_end));
+
+
+	node.append("circle")
+			.attr("r", function(d) {
+				return (d.hash) ? 6 : 5; })
+			.attr("fill", function(d) {
+				if(!d.hash){ return color(d.group);}
+				if(d.group == 1){ return "orange";}
+				return "rgb(141, 211, 199)"; });
+
+	node.append('text')
+		  .attr('text-anchor', 'middle')
+		  .attr('dominant-baseline', 'central')
+		  .attr("class", "graph_node_icon fa")
+    	.attr('font-size', '8px' )
+			.attr('pointer-events', 'none')
+    	.text(function(d) {
+				if(d.hash){
+					return d.icon
+				} });
+
+	zoom.translateTo(svg_node, 200, 200);
+	zoom.scaleTo(svg_node, 2);
+
+/*	node.append("text")
+		      .attr("dy", 3)
+					.attr("dx", 7)
+					.attr("class", "graph_text_node")
+		      //.style("text-anchor", function(d) { return d.children ? "end" : "start"; })
+		      .text(function(d) { return d.id; });*/
+
+	simulation
+			.nodes(data.nodes)
+			.on("tick", ticked);
+
+	simulation.force("link")
+			.links(data.links);
+
+	function ticked() {
+		link
+				.attr("x1", function(d) { return d.source.x; })
+				.attr("y1", function(d) { return d.source.y; })
+				.attr("x2", function(d) { return d.target.x; })
+				.attr("y2", function(d) { return d.target.y; });
+
+		/*node
+				.attr("cx", function(d) { return d.x; })
+				.attr("cy", function(d) { return d.y; });*/
+		node.attr("transform", function(d) { return "translate(" + d.x + "," + d.y + ")"; });
+	}
+
+});
+}
+
+function zoomed() {
+	container_graph.attr("transform", d3.event.transform);
+}
+
+function doubleclick (d) {
+window.open(d.url, '_blank');
+}
+
+function click (d) {
+console.log('clicked')
+}
+
+function drag_start(d) {
+if (!d3.event.active) simulation.alphaTarget(0.3).restart();
+d.fx = d.x;
+d.fy = d.y;
+}
+
+function dragged(d) {
+d.fx = d3.event.x;
+d.fy = d3.event.y;
+}
+
+function drag_end(d) {
+if (!d3.event.active) simulation.alphaTarget(0);
+d.fx = d.x;
+d.fy = d.y;
+}
+
+function mouseovered(d) {
+
+// tooltip
+var content;
+
+if(d.hash == true){
+	content = "<b><span id='tooltip-id-name'></span></b><br/>"+
+						"<br/>"+
+						"<i>First seen</i>: <span id='tooltip-id-first_seen'></span><br/>"+
+						"<i>Last seen</i>: <span id='tooltip-id-last_seen'></span><br/>"+
+						"<i>nb_seen</i>: <span id='tooltip-id-nb_seen'></span>";
+
+	div.transition()
+		 .duration(200)
+				.style("opacity", .9);
+	div.html(content)
+		 .style("left", (d3.event.pageX) + "px")
+		 .style("top", (d3.event.pageY - 28) + "px");
+
+	$("#tooltip-id-name").text(d.id);
+	$("#tooltip-id-first_seen").text(d.first_seen);
+	$("#tooltip-id-last_seen").text(d.last_seen);
+	$("#tooltip-id-nb_seen").text(d.nb_seen_in_paste);
+
+} else {
+	content = "<b><span id='tooltip-id-name'></span></b><br/>";
+
+	div.transition()
+		 .duration(200)
+				.style("opacity", .9);
+	div.html(content)
+		 .style("left", (d3.event.pageX) + "px")
+		 .style("top", (d3.event.pageY - 28) + "px");
+
+	$("#tooltip-id-name").text(d.id);
+
+}
+
+	//links
+	/*link.style("stroke-opacity", function(o) {
+			return o.source === d || o.target === d ? 1 : opacity;
+	});*/
+	link.style("stroke", function(o){
+			return o.source === d || o.target === d ? "#666" : "#ddd";
+	});
+}
+
+function mouseouted() {
+	div.transition()
+		.duration(500)
+		.style("opacity", 0);
+
+	link.style("stroke", "#666");
+}
+
+all_graph.onResize = function () {
+	var aspect = 1000 / 500, all_graph = $("#graph_div");
+	var targetWidth = all_graph.parent().width();
+	all_graph.attr("width", targetWidth);
+	all_graph.attr("height", targetWidth / aspect);
+}
+
+window.all_graph = all_graph;
+</script>
+
+<script>
+function create_line_chart(id, url){
+
+	var width = 900;
+	var height = Math.round(width / 4);
+
+	var margin = {top: 20, right: 55, bottom: 50, left: 40};
+
+	var x = d3.scaleTime().range([0, width]);
+	var y = d3.scaleLinear().rangeRound([height, 0]);
+
+	var xAxis = d3.axisBottom(x);
+	var yAxis = d3.axisLeft(y);
+
+	var parseTime = d3.timeParse("%Y-%m-%d");
+
+	var line = d3.line()
+							.x(function(d) {
+          			return x(d.date);
+        			}).y(function(d) {
+          			return y(d.value);
+        			});
+
+	var svg_line = d3.select('#'+id).append('svg')
+				.attr("id", "graph_div")
+				.attr("width", width + margin.left + margin.right)
+				.attr("height", height + margin.top + margin.bottom)
+				.append('g')
+						.attr('transform', "translate("+ margin.left +","+ margin.top +")");
+
+	var div = d3.select('body').append('div')
+				.attr('class', 'tooltip')
+				.style('opacity', 0);
+
+	//add div tooltip
+
+d3.json(url)
+	.then(function(data){
+
+		data.forEach(function(d) {
+			d.date_label = d.date;
+			d.date = parseTime(d.date);
+			d.value = +d.value;
+		});
+
+		// fit the data
+		x.domain(d3.extent(data, function(d) { return d.date; }));
+		//x.domain(data.map(function (d) { return d.date; })); //E
+		y.domain([0, d3.max(data, function(d){ return d.value ; })]);
+
+		//line
+		svg_line.append("path")
+				.data([data])
+				.attr("class", "line_graph")
+				.attr("d", line);
+
+		// add X axis
+		svg_line.append("g")
+		    .attr("transform", "translate(0," + height + ")")
+		    .call(d3.axisBottom(x))
+				.selectAll("text")
+					.style("text-anchor", "end")
+					.attr("transform", "rotate(-45)" );
+
+		// Add the Y Axis
+		svg_line.append("g")
+		    .call(d3.axisLeft(y));
+
+		//add a dot circle
+    svg_line.selectAll('dot')
+				.data(data).enter()
+				.append('circle')
+						.attr('r', 2)
+							.attr('cx', function(d) { return x(d.date); })
+							.attr('cy', function(d) { return y(d.value); })
+
+            	.on('mouseover', function(d) {
+	            	div.transition().style('opacity', .9);
+	            	div.html('' + d.date_label+ '<br/>' + d.value).style('left', (d3.event.pageX) + 'px')
+								.style("left", (d3.event.pageX) + "px")
+								.style("top", (d3.event.pageY - 28) + "px");
+          		})
+            	.on('mouseout', function(d)
+          			{
+            			div.transition().style('opacity', 0);
+          			});
+
+	});
+}
+</script>
+
+        </body>
+
+</html>
diff --git a/var/www/templates/decoded/menu_sidebar.html b/var/www/templates/decoded/menu_sidebar.html
index 3cb5868b..48fefd56 100644
--- a/var/www/templates/decoded/menu_sidebar.html
+++ b/var/www/templates/decoded/menu_sidebar.html
@@ -8,9 +8,6 @@
       	<nav class="navbar navbar-expand navbar-light bg-light flex-md-column flex-row align-items-start py-2" id="nav_menu">
       		<h5 class="d-flex text-muted w-100">
       		  <span>Items Decoded </span>
-      			<a class="ml-auto" href="{{url_for('hiddenServices.manual')}}">
-      				<i class="fas fa-plus-circle ml-auto"></i>
-      			</a>
       		</h5>
       	  <ul class="nav flex-md-column flex-row navbar-nav justify-content-between w-100"> <!--nav-pills-->
       	    <li class="nav-item">
@@ -19,10 +16,15 @@
       	        <span>Dashboard</span>
       	      </a>
       	    </li>
+          </ul>
+          <h5 class="d-flex text-muted w-100">
+      		  <span>PGP Dumps</span>
+      		</h5>
+      	  <ul class="nav flex-md-column flex-row navbar-nav justify-content-between w-100"> <!--nav-pills-->
       	    <li class="nav-item">
-      	      <a class="nav-link" href="{{url_for('hiddenServices.Crawler_Splash_last_by_type')}}?type=onion" id="nav_onion_crawler">
-      					<i class="fas fa-user-secret"></i>
-      	       	Onion Crawler
+      	      <a class="nav-link" href="{{url_for('hashDecoded.hashDecoded_page')}}" id="nav_dashboard_pgp">
+      	        <i class="fas fa-search"></i>
+      	        <span>PGP Dumps</span>
       	      </a>
       	    </li>
           </ul>