diff --git a/Kernel/Config/Files/QueueService.xml b/Kernel/Config/Files/QueueService.xml
index 81b334f..1f73a28 100644
--- a/Kernel/Config/Files/QueueService.xml
+++ b/Kernel/Config/Files/QueueService.xml
@@ -13,7 +13,7 @@
 				<Title Lang="pt_BR">Serviços por fila</Title>
 				<NavBarName>Admin</NavBarName>
 				<NavBarModule>
-					<Module>Kernel::Output::HTML::NavBarModuleAdmin</Module>
+					<Module>Kernel::Output::HTML::NavBar::ModuleAdmin</Module>
 					<Name Lang="en">Services per queue</Name>
 					<Name Lang="pt_BR">Serviços por fila</Name>
 					<Description Lang="en">Create and manages services per queue</Description>
diff --git a/Kernel/Output/HTML/Standard/QueueService.tt b/Kernel/Output/HTML/Standard/QueueService.tt
deleted file mode 100644
index 17cae1c..0000000
--- a/Kernel/Output/HTML/Standard/QueueService.tt
+++ /dev/null
@@ -1,86 +0,0 @@
-# --
-# Kernel/Output/HTML/Standard/QueueService.tt - overview
-# Copyright (C) (2014) SeTIC - UFSC - http://setic.ufsc.br/
-# Version 06/01/2015 - Adjusts for OTRS 4
-#
-# This software comes with ABSOLUTELY NO WARRANTY. For details, see
-# the enclosed file COPYING for license information (AGPL). If you
-# did not receive this file, see http://www.gnu.org/licenses/agpl.txt.
-# --
-<div class="MainBox ARIARoleMain LayoutFixedSidebar SidebarFirst">
-    <h1>[% Translate("Services per queue") | html %]</h1>
-
-    <div class="SidebarColumn">
-
-        <div class="WidgetSimple">
-            <div class="Header">
-                <h2>[% Translate("Actions") | html %]</h2>
-            </div>
-            <div class="Content">
-                <ul class="ActionList">
-                    <li>
-                        <a href="[% Env("Baselink") %]Action=[% Env("Action") %]" class="CallForAction"><span>[% Translate("Go to overview") | html %]</span></a>
-                    </li>
-                </ul>
-            </div>
-        </div>
-
-[% RenderBlockStart("serviceFilter") %]
-        <div class="WidgetSimple">
-            <div class="Header">
-                <h2><label for="FilterServices">[% Translate("Services") | html %]</label></h2>
-            </div>
-            <div class="Content">
-                <input type="text" id="FilterUsers" class="W50pc" name="FilterUser" value="" title="[% Translate("Service") | html %]" />
-            </div>
-        </div>
-[% RenderBlockEnd("serviceFilter") %]
-[% RenderBlockStart("queueFilter") %]
-        <div class="WidgetSimple">
-            <div class="Header">
-                <h2><label for="FilterQueues">[% Translate("Queues") | html %]</label></h2>
-            </div>
-            <div class="Content">
-                <input type="text" id="FilterGroups" class="W50pc" name="FilterGroups" value=""  title="[% Translate("Queue") | html %]"/>
-            </div>
-        </div>
-[% RenderBlockEnd("queueFilter") %]
-    </div>
-
-    <div class="ContentColumn">
-        <div class="WidgetSimple">
-
-            <div class="Header">
-                <h2>[% Translate("Overview") | html %]</h2>
-            </div>
-            <div class="Content LayoutGrid ColumnsWithSpacing">
-                <div class="Size1of2">
-                    <ul class="Tablelike" id="Services">
-                        <li class="Header">[% Translate("Services") | html %]</li>
-                        <li class="FilterMessage Hidden">[% Translate("No matches found.") | html %]</li>
-[% RenderBlockStart("ListService") %]
-                        <li><a href="[% Env("Baselink") %]Action=[% Env("Action") %];Subaction=ServiceEdit;ID=[% Data.ServiceID | uri %]" class="AsBlock">[% Data.ServiceName | html %]</a></li>
-[% RenderBlockEnd("ListService") %]
-                    </ul>
-                </div>
-                <div class="Size1of2">
-                    <ul class="Tablelike" id="Queues">
-                        <li class="Header">[% Translate("Queues") | html %]</li>
-                        <li class="FilterMessage Hidden">[% Translate("No matches found.") | html %]</li>
-[% RenderBlockStart("ListQueue") %]
-                        <li><a href="[% Env("Baselink") %]Action=[% Env("Action") %];Subaction=QueueEdit;ID=[% Data.QueueID | uri %]" class="AsBlock">[% Data.QueueName | html %]</a></li>
-[% RenderBlockEnd("ListQueue") %]
-                    </ul>
-                </div>
-                <div class="Clear"></div>
-            </div>
-
-
-[% WRAPPER JSOnDocumentComplete %]
-<script type="text/javascript">//<![CDATA[
-    Core.UI.Table.InitTableFilter($('#FilterServices'), $('#Services'));
-    Core.UI.Table.InitTableFilter($('#FilterQueues'), $('#Queues'));
-//]]></script>
-[% END %]
-
-	
\ No newline at end of file
diff --git a/Kernel/Output/HTML/Standard/QueueServiceChange.tt b/Kernel/Output/HTML/Standard/QueueServiceChange.tt
deleted file mode 100644
index 5bb48de..0000000
--- a/Kernel/Output/HTML/Standard/QueueServiceChange.tt
+++ /dev/null
@@ -1,103 +0,0 @@
-# --
-# Kernel/Output/HTML/Standard/QueueServiceChange.tt - edit
-# Copyright (C) (2014) SeTIC - UFSC - http://setic.ufsc.br/
-# Version 06/01/2015 - Adjusts for OTRS 4
-#
-# This software comes with ABSOLUTELY NO WARRANTY. For details, see
-# the enclosed file COPYING for license information (AGPL). If you
-# did not receive this file, see http://www.gnu.org/licenses/agpl.txt.
-# --
-<div class="MainBox ARIARoleMain LayoutFixedSidebar SidebarFirst">
-    <h1>[% Translate("Services and queues") | html %]</h1>
-    <div class="SidebarColumn">
-        <div class="WidgetSimple">
-            <div class="Header">
-                <h2>[% Translate("Actions") | html %]</h2>
-            </div>
-            <div class="Content">
-                <ul class="ActionList">
-                    <li>
-                        <a href="[% Env("Baselink") %]Action=[% Env("Action") %]" class="CallForAction"><span>[% Translate("Go to overview") | html %]</span></a>
-                    </li>
-                </ul>
-            </div>
-        </div>
-        <div class="WidgetSimple">
-            <div class="Header">
-                <h2>
-                    <label for="Filter">[% Translate("Filter") | html %]</label>
-                </h2>
-            </div>
-            <div class="Content">
-                <input type="text" id="Filter" class="W50pc" name="Filter" value="" title="[% Translate("Filter") | html %]" />
-            </div>
-        </div>
-    </div>
-
-    <div class="ContentColumn">
-        <div class="WidgetSimple">
-            <div class="Header">
-                <h2>
-[% RenderBlockStart("ChangeHeaderService") %]
-                    [% Translate("Select queues for the service") | html %]
-[% RenderBlockEnd("ChangeHeaderService") %]
-[% RenderBlockStart("ChangeHeaderQueue") %]
-                    [% Translate("Select services for the queue") | html %]
-[% RenderBlockEnd("ChangeHeaderQueue") %]
-                    [% Data.Name | html %]
-                </h2>
-            </div>
-            <div class="Content ">
-                <form action="[% Env("CGIHandle") %]" method="post" name="matrix">
-                    <input type="hidden" name="Action" value="[% Env("Action") %]"/>
-                    <input type="hidden" name="Subaction" value="Change[% Data.VisibleNeType | html %]"/>
-                    <input type="hidden" name="ID" value="[% Data.ID | html %]"/>
-                    <table class="DataTable VariableWidth" id="ServicesQueues">
-                        <thead>
-                            <tr>
-                                <th>[% Translate(Data.VisibleNeType) | html %]</th>
-[% RenderBlockStart("ChangeHeader") %]
-                                <th class="Center [% Data.Mark | html %]">
-                                    <input type="checkbox" name="[% Data.Type | html %]" id="SelectAll[% Data.Type | html %]" title="[% Translate("Toggle active state for all") | html %]" value="" />
-                                    [% Translate("Active") | html %]
-                                </th>
-[% WRAPPER JSOnDocumentComplete %]
-<script type="text/javascript">//<![CDATA[
-    Core.Form.InitSelectAllCheckboxes($('table td input:checkbox[name=[% Data.Type | html %]]'), $('#SelectAll[% Data.Type | html %]'));
-    $('input:checkbox[name=[% Data.Type | html %]]').bind('click', function () {
-        Core.Form.SelectAllCheckboxes($(this), $('#SelectAll[% Data.Type | html %]'));
-    });
-//]]></script>
-[% END %]
-[% RenderBlockEnd("ChangeHeader") %]
-                            </tr>
-                        </thead>
-                        <tbody>
-[% RenderBlockStart("ChangeRow") %]
-                            <tr>
-                                <td>[% Data.Name | html %]</td>
-                                <td class="[% Data.Mark | html %]">
-                                    <input type="checkbox" name="[% Data.Type | html %]" title="[% Translate("Toggle active state for %s", Data.Name) | html %]" value="[% Data.ID | html %]" [% Data.Selected %]/>
-                                </td>
-                            </tr>
-[% RenderBlockEnd("ChangeRow") %]
-                        </tbody>
-                    </table>
-                    <div class="Field SpacingTop">
-                        <button class="Primary" type="submit" value="[% Translate("Submit") | html %]">[% Translate("Submit") | html %]</button>
-                        [% Translate("or") | html %]
-                        <a href="[% Env("Baselink") %]Action=[% Env("Action") %]">[% Translate("Cancel") | html %]</a>
-                    </div>
-                    <div class="Clear"></div>
-                </form>
-            </div>
-        </div>
-    </div>
-    <div class="Clear"></div>
-</div>
-
-[% WRAPPER JSOnDocumentComplete %]
-<script type="text/javascript">//<![CDATA[
-    Core.UI.Table.InitTableFilter($('#Filter'), $('#ServicesQueues'));
-//]]></script>
-[% END %]
diff --git a/Kernel/Output/HTML/Templates/Standard/QueueService.tt b/Kernel/Output/HTML/Templates/Standard/QueueService.tt
new file mode 100644
index 0000000..17cae1c
--- /dev/null
+++ b/Kernel/Output/HTML/Templates/Standard/QueueService.tt
@@ -0,0 +1,86 @@
+# --
+# Kernel/Output/HTML/Standard/QueueService.tt - overview
+# Copyright (C) (2014) SeTIC - UFSC - http://setic.ufsc.br/
+# Version 06/01/2015 - Adjusts for OTRS 4
+#
+# This software comes with ABSOLUTELY NO WARRANTY. For details, see
+# the enclosed file COPYING for license information (AGPL). If you
+# did not receive this file, see http://www.gnu.org/licenses/agpl.txt.
+# --
+<div class="MainBox ARIARoleMain LayoutFixedSidebar SidebarFirst">
+    <h1>[% Translate("Services per queue") | html %]</h1>
+
+    <div class="SidebarColumn">
+
+        <div class="WidgetSimple">
+            <div class="Header">
+                <h2>[% Translate("Actions") | html %]</h2>
+            </div>
+            <div class="Content">
+                <ul class="ActionList">
+                    <li>
+                        <a href="[% Env("Baselink") %]Action=[% Env("Action") %]" class="CallForAction"><span>[% Translate("Go to overview") | html %]</span></a>
+                    </li>
+                </ul>
+            </div>
+        </div>
+
+[% RenderBlockStart("serviceFilter") %]
+        <div class="WidgetSimple">
+            <div class="Header">
+                <h2><label for="FilterServices">[% Translate("Services") | html %]</label></h2>
+            </div>
+            <div class="Content">
+                <input type="text" id="FilterUsers" class="W50pc" name="FilterUser" value="" title="[% Translate("Service") | html %]" />
+            </div>
+        </div>
+[% RenderBlockEnd("serviceFilter") %]
+[% RenderBlockStart("queueFilter") %]
+        <div class="WidgetSimple">
+            <div class="Header">
+                <h2><label for="FilterQueues">[% Translate("Queues") | html %]</label></h2>
+            </div>
+            <div class="Content">
+                <input type="text" id="FilterGroups" class="W50pc" name="FilterGroups" value=""  title="[% Translate("Queue") | html %]"/>
+            </div>
+        </div>
+[% RenderBlockEnd("queueFilter") %]
+    </div>
+
+    <div class="ContentColumn">
+        <div class="WidgetSimple">
+
+            <div class="Header">
+                <h2>[% Translate("Overview") | html %]</h2>
+            </div>
+            <div class="Content LayoutGrid ColumnsWithSpacing">
+                <div class="Size1of2">
+                    <ul class="Tablelike" id="Services">
+                        <li class="Header">[% Translate("Services") | html %]</li>
+                        <li class="FilterMessage Hidden">[% Translate("No matches found.") | html %]</li>
+[% RenderBlockStart("ListService") %]
+                        <li><a href="[% Env("Baselink") %]Action=[% Env("Action") %];Subaction=ServiceEdit;ID=[% Data.ServiceID | uri %]" class="AsBlock">[% Data.ServiceName | html %]</a></li>
+[% RenderBlockEnd("ListService") %]
+                    </ul>
+                </div>
+                <div class="Size1of2">
+                    <ul class="Tablelike" id="Queues">
+                        <li class="Header">[% Translate("Queues") | html %]</li>
+                        <li class="FilterMessage Hidden">[% Translate("No matches found.") | html %]</li>
+[% RenderBlockStart("ListQueue") %]
+                        <li><a href="[% Env("Baselink") %]Action=[% Env("Action") %];Subaction=QueueEdit;ID=[% Data.QueueID | uri %]" class="AsBlock">[% Data.QueueName | html %]</a></li>
+[% RenderBlockEnd("ListQueue") %]
+                    </ul>
+                </div>
+                <div class="Clear"></div>
+            </div>
+
+
+[% WRAPPER JSOnDocumentComplete %]
+<script type="text/javascript">//<![CDATA[
+    Core.UI.Table.InitTableFilter($('#FilterServices'), $('#Services'));
+    Core.UI.Table.InitTableFilter($('#FilterQueues'), $('#Queues'));
+//]]></script>
+[% END %]
+
+	
\ No newline at end of file
diff --git a/Kernel/Output/HTML/Templates/Standard/QueueServiceChange.tt b/Kernel/Output/HTML/Templates/Standard/QueueServiceChange.tt
new file mode 100644
index 0000000..5bb48de
--- /dev/null
+++ b/Kernel/Output/HTML/Templates/Standard/QueueServiceChange.tt
@@ -0,0 +1,103 @@
+# --
+# Kernel/Output/HTML/Standard/QueueServiceChange.tt - edit
+# Copyright (C) (2014) SeTIC - UFSC - http://setic.ufsc.br/
+# Version 06/01/2015 - Adjusts for OTRS 4
+#
+# This software comes with ABSOLUTELY NO WARRANTY. For details, see
+# the enclosed file COPYING for license information (AGPL). If you
+# did not receive this file, see http://www.gnu.org/licenses/agpl.txt.
+# --
+<div class="MainBox ARIARoleMain LayoutFixedSidebar SidebarFirst">
+    <h1>[% Translate("Services and queues") | html %]</h1>
+    <div class="SidebarColumn">
+        <div class="WidgetSimple">
+            <div class="Header">
+                <h2>[% Translate("Actions") | html %]</h2>
+            </div>
+            <div class="Content">
+                <ul class="ActionList">
+                    <li>
+                        <a href="[% Env("Baselink") %]Action=[% Env("Action") %]" class="CallForAction"><span>[% Translate("Go to overview") | html %]</span></a>
+                    </li>
+                </ul>
+            </div>
+        </div>
+        <div class="WidgetSimple">
+            <div class="Header">
+                <h2>
+                    <label for="Filter">[% Translate("Filter") | html %]</label>
+                </h2>
+            </div>
+            <div class="Content">
+                <input type="text" id="Filter" class="W50pc" name="Filter" value="" title="[% Translate("Filter") | html %]" />
+            </div>
+        </div>
+    </div>
+
+    <div class="ContentColumn">
+        <div class="WidgetSimple">
+            <div class="Header">
+                <h2>
+[% RenderBlockStart("ChangeHeaderService") %]
+                    [% Translate("Select queues for the service") | html %]
+[% RenderBlockEnd("ChangeHeaderService") %]
+[% RenderBlockStart("ChangeHeaderQueue") %]
+                    [% Translate("Select services for the queue") | html %]
+[% RenderBlockEnd("ChangeHeaderQueue") %]
+                    [% Data.Name | html %]
+                </h2>
+            </div>
+            <div class="Content ">
+                <form action="[% Env("CGIHandle") %]" method="post" name="matrix">
+                    <input type="hidden" name="Action" value="[% Env("Action") %]"/>
+                    <input type="hidden" name="Subaction" value="Change[% Data.VisibleNeType | html %]"/>
+                    <input type="hidden" name="ID" value="[% Data.ID | html %]"/>
+                    <table class="DataTable VariableWidth" id="ServicesQueues">
+                        <thead>
+                            <tr>
+                                <th>[% Translate(Data.VisibleNeType) | html %]</th>
+[% RenderBlockStart("ChangeHeader") %]
+                                <th class="Center [% Data.Mark | html %]">
+                                    <input type="checkbox" name="[% Data.Type | html %]" id="SelectAll[% Data.Type | html %]" title="[% Translate("Toggle active state for all") | html %]" value="" />
+                                    [% Translate("Active") | html %]
+                                </th>
+[% WRAPPER JSOnDocumentComplete %]
+<script type="text/javascript">//<![CDATA[
+    Core.Form.InitSelectAllCheckboxes($('table td input:checkbox[name=[% Data.Type | html %]]'), $('#SelectAll[% Data.Type | html %]'));
+    $('input:checkbox[name=[% Data.Type | html %]]').bind('click', function () {
+        Core.Form.SelectAllCheckboxes($(this), $('#SelectAll[% Data.Type | html %]'));
+    });
+//]]></script>
+[% END %]
+[% RenderBlockEnd("ChangeHeader") %]
+                            </tr>
+                        </thead>
+                        <tbody>
+[% RenderBlockStart("ChangeRow") %]
+                            <tr>
+                                <td>[% Data.Name | html %]</td>
+                                <td class="[% Data.Mark | html %]">
+                                    <input type="checkbox" name="[% Data.Type | html %]" title="[% Translate("Toggle active state for %s", Data.Name) | html %]" value="[% Data.ID | html %]" [% Data.Selected %]/>
+                                </td>
+                            </tr>
+[% RenderBlockEnd("ChangeRow") %]
+                        </tbody>
+                    </table>
+                    <div class="Field SpacingTop">
+                        <button class="Primary" type="submit" value="[% Translate("Submit") | html %]">[% Translate("Submit") | html %]</button>
+                        [% Translate("or") | html %]
+                        <a href="[% Env("Baselink") %]Action=[% Env("Action") %]">[% Translate("Cancel") | html %]</a>
+                    </div>
+                    <div class="Clear"></div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="Clear"></div>
+</div>
+
+[% WRAPPER JSOnDocumentComplete %]
+<script type="text/javascript">//<![CDATA[
+    Core.UI.Table.InitTableFilter($('#Filter'), $('#ServicesQueues'));
+//]]></script>
+[% END %]
diff --git a/QueueService.sopm b/QueueService.sopm
index ed39bd3..04c46a0 100755
--- a/QueueService.sopm
+++ b/QueueService.sopm
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <otrs_package version="1.0">
     <Name>QueueService</Name>
-    <Version>1.1.1</Version>
-    <Framework>4.0.x</Framework>
+    <Version>1.2.0</Version>
+    <Framework>5.0.x</Framework>
     <Vendor>SeTIC</Vendor>
     <URL>http://setic.ufsc.br</URL>
     <License>GPLv2</License>
     
     <ChangeLog Version="1.0.0" Date="2014-06-01">First Version</ChangeLog>    
     <ChangeLog Version="1.1.0" Date="2014-01-06">Support for OTRS 4</ChangeLog>
+    <ChangeLog Version="1.2.0" Date="2014-01-06">Support for OTRS 5.0.x</ChangeLog>
     
     <Description>Services per queue association</Description>
     
@@ -23,8 +24,8 @@
         <File Permission="644" Location="Kernel/Config/Files/QueueService.xml"></File>
         <File Permission="644" Location="Kernel/Language/pt_BR_QueueService.pm"></File>
         <File Permission="644" Location="Kernel/Modules/QueueService.pm"></File>        
-        <File Permission="644" Location="Kernel/Output/HTML/Standard/QueueService.tt"></File>        
-        <File Permission="644" Location="Kernel/Output/HTML/Standard/QueueServiceChange.tt"></File>        
+        <File Permission="644" Location="Kernel/Output/HTML/Templates/Standard/QueueService.tt"></File>        
+        <File Permission="644" Location="Kernel/Output/HTML/Templates/Standard/QueueServiceChange.tt"></File>        
         <File Permission="644" Location="Kernel/System/QueueService.pm"></File>        
     </Filelist>
     <DatabaseInstall>
--
libgit2 0.21.2