Add client_credentials as grant_typeoauth-changes

Therefore, username and password are no longer needed

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Allow to have global clients, auth through direct token or auth code and bring scopes

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

fix review

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

remove redirect uri requirement on specific clients

add back password and depreciate it

enforce state

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Allow apps to register themselves

A handful of changes

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

change timeout values

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

set access_token lifetime to 1 year and double for refresh_token

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

27 files changed, 912 insertions, 695 deletions

diff --git a/src/Wallabag/ApiBundle/Controller/AnnotationRestController.php b/src/Wallabag/ApiBundle/Controller/AnnotationRestController.php
index 2dd26c07..c524a24c 100644
--- a/src/Wallabag/ApiBundle/Controller/AnnotationRestController.php
+++ b/src/Wallabag/ApiBundle/Controller/AnnotationRestController.php
@@ -4,6 +4,7 @@ namespace Wallabag\ApiBundle\Controller;
 
 use Nelmio\ApiDocBundle\Annotation\ApiDoc;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Wallabag\CoreBundle\Entity\Entry;
@@ -21,7 +22,7 @@ class AnnotationRestController extends WallabagRestController
      * )
      *
      * @param Entry $entry
-     *
+     * @Security("has_role('ROLE_READ')")
      * @return JsonResponse
      */
     public function getAnnotationsAction(Entry $entry)
@@ -46,7 +47,7 @@ class AnnotationRestController extends WallabagRestController
      *
      * @param Request $request
      * @param Entry   $entry
-     *
+     * @Security("has_role('ROLE_WRITE')")
      * @return JsonResponse
      */
     public function postAnnotationAction(Request $request, Entry $entry)
@@ -72,7 +73,7 @@ class AnnotationRestController extends WallabagRestController
      *
      * @param Annotation $annotation
      * @param Request    $request
-     *
+     * @Security("has_role('ROLE_WRITE')")
      * @return JsonResponse
      */
     public function putAnnotationAction(Annotation $annotation, Request $request)
@@ -97,7 +98,7 @@ class AnnotationRestController extends WallabagRestController
      * @ParamConverter("annotation", class="WallabagAnnotationBundle:Annotation")
      *
      * @param Annotation $annotation
-     *
+     * @Security("has_role('ROLE_WRITE')")
      * @return JsonResponse
      */
     public function deleteAnnotationAction(Annotation $annotation)
diff --git a/src/Wallabag/ApiBundle/Controller/AppsController.php b/src/Wallabag/ApiBundle/Controller/AppsController.php
new file mode 100644
index 00000000..6ef77667
--- /dev/null
+++ b/src/Wallabag/ApiBundle/Controller/AppsController.php
@@ -0,0 +1,189 @@
+<?php
+
+namespace Wallabag\ApiBundle\Controller;
+
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Symfony\Component\Finder\Exception\AccessDeniedException;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Wallabag\ApiBundle\Entity\AccessToken;
+use Wallabag\ApiBundle\Entity\Client;
+use Wallabag\ApiBundle\Form\Type\ClientType;
+
+class AppsController extends Controller
+{
+    /**
+     * List all clients and link to create a new one.
+     *
+     * @Route("/apps", name="apps")
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function indexAction()
+    {
+        $clients = $this->getDoctrine()->getRepository('WallabagApiBundle:Client')->findByUser($this->getUser()->getId());
+
+        $apps = $this->getDoctrine()->getRepository('WallabagApiBundle:AccessToken')->findAppsByUser($this->getUser()->getId());
+
+        return $this->render('@WallabagCore/themes/common/Developer/index.html.twig', [
+            'clients' => $clients,
+            'apps' => $apps,
+        ]);
+    }
+
+    /**
+     * Create a an app
+     *
+     * @param Request $request
+     *
+     * @Route("/api/apps", name="apps_create")
+     * @Method("POST")
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function createAppAction(Request $request)
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $clientName = $request->request->get('client_name');
+        $redirectURIs = $request->request->get('redirect_uris');
+        $logoURI = $request->request->get('logo_uri');
+        $description = $request->request->get('description');
+        $appURI = $request->request->get('app_uri');
+        $nextRedirect = $request->request->get('uri_redirect_after_creation');
+
+        if (!$clientName) {
+            return new JsonResponse([
+                'error' => 'invalid_client_name',
+                'error_description' => 'The client name cannot be empty',
+            ], 400);
+        }
+
+        if (!$redirectURIs) {
+            return new JsonResponse([
+                'error' => 'invalid_redirect_uri',
+                'error_description' => 'One or more redirect_uri values are invalid',
+            ], 400);
+        }
+
+        $redirectURIs = (array) $redirectURIs;
+
+        $client = new Client();
+
+        $client->setName($clientName);
+
+        $client->setDescription($description);
+
+        $client->setRedirectUris($redirectURIs);
+
+        $client->setImage($logoURI);
+        $client->setAppUrl($appURI);
+
+        $client->setAllowedGrantTypes(['token', 'refresh_token', 'authorization_code']);
+        $em->persist($client);
+        $em->flush();
+
+        return new JsonResponse([
+            'client_id' => $client->getPublicId(),
+            'client_secret' => $client->getSecret(),
+            'client_name' => $client->getName(),
+            'redirect_uri' => $client->getRedirectUris(),
+            'description' => $client->getDescription(),
+            'logo_uri' => $client->getImage(),
+            'app_uri' => $client->getAppUrl(),
+        ], 201);
+    }
+
+    /**
+     * Create a client (an app).
+     *
+     * @param Request $request
+     *
+     * @Route("/apps/client/create", name="apps_create_client")
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function createClientAction(Request $request)
+    {
+        $em = $this->getDoctrine()->getManager();
+        $client = new Client($this->getUser());
+        $clientForm = $this->createForm(ClientType::class, $client);
+        $clientForm->handleRequest($request);
+
+        if ($clientForm->isSubmitted() && $clientForm->isValid()) {
+            $client->setAllowedGrantTypes(['password', 'token', 'refresh_token', 'client_credentials']); // Password is depreciated
+            $em->persist($client);
+            $em->flush();
+
+            $this->get('session')->getFlashBag()->add(
+                'notice',
+                $this->get('translator')->trans('flashes.developer.notice.client_created', ['%name%' => $client->getName()])
+            );
+
+            return $this->render('@WallabagCore/themes/common/Developer/client_parameters.html.twig', [
+                'client_id' => $client->getPublicId(),
+                'client_secret' => $client->getSecret(),
+                'client_name' => $client->getName(),
+            ]);
+        }
+
+        return $this->render('@WallabagCore/themes/common/Developer/client.html.twig', [
+            'form' => $clientForm->createView(),
+        ]);
+    }
+
+    /**
+     * Revoke an access token
+     * @param $token
+     * @Route("/api/revoke/{token}", name="apps_revoke_access_token")
+     * @return JsonResponse
+     */
+    public function removeAccessTokenAction($token)
+    {
+        if (false === $this->get('security.authorization_checker')->isGranted('IS_AUTHENTICATED_FULLY')) {
+            throw new AccessDeniedException();
+        }
+
+        $em = $this->getDoctrine()->getManager();
+        $accessToken = $em->getRepository('WallabagApiBundle:AccessToken')->findOneBy([
+            'user' => $this->getUser()->getId(),
+            'token' => $token
+            ]);
+        if ($accessToken) {
+            $em->remove($accessToken);
+            $em->flush();
+
+            return new JsonResponse([], 204);
+        }
+        return new JsonResponse([], 404);
+    }
+
+    /**
+     * Remove a client.
+     *
+     * @param Client $client
+     *
+     * @Route("/apps/client/delete/{id}", requirements={"id" = "\d+"}, name="apps_delete_client")
+     *
+     * @return \Symfony\Component\HttpFoundation\RedirectResponse
+     */
+    public function deleteClientAction(Client $client)
+    {
+        if (null === $this->getUser() || $client->getUser()->getId() != $this->getUser()->getId()) {
+            throw $this->createAccessDeniedException('You can not access this client.');
+        }
+
+        $em = $this->getDoctrine()->getManager();
+        $em->remove($client);
+        $em->flush();
+
+        $this->get('session')->getFlashBag()->add(
+            'notice',
+            $this->get('translator')->trans('flashes.developer.notice.client_deleted', ['%name%' => $client->getName()])
+        );
+
+        return $this->redirect($this->generateUrl('apps'));
+    }
+}
diff --git a/src/Wallabag/ApiBundle/Controller/DeveloperController.php b/src/Wallabag/ApiBundle/Controller/DeveloperController.php
deleted file mode 100644
index 9cb1b626..00000000
--- a/src/Wallabag/ApiBundle/Controller/DeveloperController.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-
-namespace Wallabag\ApiBundle\Controller;
-
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Wallabag\ApiBundle\Entity\Client;
-use Wallabag\ApiBundle\Form\Type\ClientType;
-
-class DeveloperController extends Controller
-{
-    /**
-     * List all clients and link to create a new one.
-     *
-     * @Route("/developer", name="developer")
-     *
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    public function indexAction()
-    {
-        $clients = $this->getDoctrine()->getRepository('WallabagApiBundle:Client')->findByUser($this->getUser()->getId());
-
-        return $this->render('@WallabagCore/themes/common/Developer/index.html.twig', [
-            'clients' => $clients,
-        ]);
-    }
-
-    /**
-     * Create a client (an app).
-     *
-     * @param Request $request
-     *
-     * @Route("/developer/client/create", name="developer_create_client")
-     *
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    public function createClientAction(Request $request)
-    {
-        $em = $this->getDoctrine()->getManager();
-        $client = new Client($this->getUser());
-        $clientForm = $this->createForm(ClientType::class, $client);
-        $clientForm->handleRequest($request);
-
-        if ($clientForm->isSubmitted() && $clientForm->isValid()) {
-            $client->setAllowedGrantTypes(['token', 'authorization_code', 'password', 'refresh_token']);
-            $em->persist($client);
-            $em->flush();
-
-            $this->get('session')->getFlashBag()->add(
-                'notice',
-                $this->get('translator')->trans('flashes.developer.notice.client_created', ['%name%' => $client->getName()])
-            );
-
-            return $this->render('@WallabagCore/themes/common/Developer/client_parameters.html.twig', [
-                'client_id' => $client->getPublicId(),
-                'client_secret' => $client->getSecret(),
-                'client_name' => $client->getName(),
-            ]);
-        }
-
-        return $this->render('@WallabagCore/themes/common/Developer/client.html.twig', [
-            'form' => $clientForm->createView(),
-        ]);
-    }
-
-    /**
-     * Remove a client.
-     *
-     * @param Client $client
-     *
-     * @Route("/developer/client/delete/{id}", requirements={"id" = "\d+"}, name="developer_delete_client")
-     *
-     * @return \Symfony\Component\HttpFoundation\RedirectResponse
-     */
-    public function deleteClientAction(Client $client)
-    {
-        if (null === $this->getUser() || $client->getUser()->getId() != $this->getUser()->getId()) {
-            throw $this->createAccessDeniedException('You can not access this client.');
-        }
-
-        $em = $this->getDoctrine()->getManager();
-        $em->remove($client);
-        $em->flush();
-
-        $this->get('session')->getFlashBag()->add(
-            'notice',
-            $this->get('translator')->trans('flashes.developer.notice.client_deleted', ['%name%' => $client->getName()])
-        );
-
-        return $this->redirect($this->generateUrl('developer'));
-    }
-
-    /**
-     * Display developer how to use an existing app.
-     *
-     * @Route("/developer/howto/first-app", name="developer_howto_firstapp")
-     *
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    public function howtoFirstAppAction()
-    {
-        return $this->render('@WallabagCore/themes/common/Developer/howto_app.html.twig');
-    }
-}
diff --git a/src/Wallabag/ApiBundle/Controller/EntryRestController.php b/src/Wallabag/ApiBundle/Controller/EntryRestController.php
index 768c4fdc..93f1f461 100644
--- a/src/Wallabag/ApiBundle/Controller/EntryRestController.php
+++ b/src/Wallabag/ApiBundle/Controller/EntryRestController.php
@@ -5,6 +5,7 @@ namespace Wallabag\ApiBundle\Controller;
 use Hateoas\Configuration\Route;
 use Hateoas\Representation\Factory\PagerfantaFactory;
 use Nelmio\ApiDocBundle\Annotation\ApiDoc;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\JsonResponse;
@@ -25,7 +26,7 @@ class EntryRestController extends WallabagRestController
      *          {"name"="urls", "dataType"="string", "required"=false, "format"="An array of urls (?urls[]=http...&urls[]=http...)", "description"="Urls (as an array) to check if it exists"}
      *       }
      * )
-     *
+     * @Security("has_role('ROLE_READ')")
      * @return JsonResponse
      */
     public function getEntriesExistsAction(Request $request)
@@ -80,7 +81,7 @@ class EntryRestController extends WallabagRestController
      *          {"name"="public", "dataType"="integer", "required"=false, "format"="1 or 0, all entries by default", "description"="filter by entries with a public link"},
      *       }
      * )
-     *
+     * @Security("has_role('ROLE_READ')")
      * @return JsonResponse
      */
     public function getEntriesAction(Request $request)
@@ -143,7 +144,7 @@ class EntryRestController extends WallabagRestController
      *          {"name"="entry", "dataType"="integer", "requirement"="\w+", "description"="The entry ID"}
      *      }
      * )
-     *
+     * @Security("has_role('ROLE_READ')")
      * @return JsonResponse
      */
     public function getEntryAction(Entry $entry)
@@ -162,7 +163,7 @@ class EntryRestController extends WallabagRestController
      *          {"name"="entry", "dataType"="integer", "requirement"="\w+", "description"="The entry ID"}
      *      }
      * )
-     *
+     * @Security("has_role('ROLE_READ')")
      * @return Response
      */
     public function getEntryExportAction(Entry $entry, Request $request)
@@ -302,7 +303,7 @@ class EntryRestController extends WallabagRestController
      *          {"name"="public", "dataType"="integer", "required"=false, "format"="1 or 0", "description"="will generate a public link for the entry"},
      *       }
      * )
-     *
+     * @Security("has_role('ROLE_WRITE')")
      * @return JsonResponse
      */
     public function postEntriesAction(Request $request)
@@ -346,7 +347,7 @@ class EntryRestController extends WallabagRestController
      *          {"name"="public", "dataType"="integer", "required"=false, "format"="1 or 0", "description"="will generate a public link for the entry"},
      *      }
      * )
-     *
+     * @Security("has_role('ROLE_WRITE')")
      * @return JsonResponse
      */
     public function patchEntriesAction(Entry $entry, Request $request)
@@ -368,7 +369,7 @@ class EntryRestController extends WallabagRestController
      *          {"name"="entry", "dataType"="integer", "requirement"="\w+", "description"="The entry ID"}
      *      }
      * )
-     *
+     * @Security("has_role('ROLE_WRITE')")
      * @return JsonResponse
      */
     public function patchEntriesReloadAction(Entry $entry)
@@ -410,7 +411,7 @@ class EntryRestController extends WallabagRestController
      *          {"name"="entry", "dataType"="integer", "requirement"="\w+", "description"="The entry ID"}
      *      }
      * )
-     *
+     * @Security("has_role('ROLE_WRITE')")
      * @return JsonResponse
      */
     public function deleteEntriesAction(Entry $entry)
@@ -436,7 +437,7 @@ class EntryRestController extends WallabagRestController
      *          {"name"="entry", "dataType"="integer", "requirement"="\w+", "description"="The entry ID"}
      *      }
      * )
-     *
+     * @Security("has_role('ROLE_READ')")
      * @return JsonResponse
      */
     public function getEntriesTagsAction(Entry $entry)
@@ -458,7 +459,7 @@ class EntryRestController extends WallabagRestController
      *          {"name"="tags", "dataType"="string", "required"=false, "format"="tag1,tag2,tag3", "description"="a comma-separated list of tags."},
      *       }
      * )
-     *
+     * @Security("has_role('ROLE_WRITE')")
      * @return JsonResponse
      */
     public function postEntriesTagsAction(Request $request, Entry $entry)
@@ -487,7 +488,7 @@ class EntryRestController extends WallabagRestController
      *          {"name"="entry", "dataType"="integer", "requirement"="\w+", "description"="The entry ID"}
      *      }
      * )
-     *
+     * @Security("has_role('ROLE_WRITE')")
      * @return JsonResponse
      */
     public function deleteEntriesTagsAction(Entry $entry, Tag $tag)
diff --git a/src/Wallabag/ApiBundle/Controller/TagRestController.php b/src/Wallabag/ApiBundle/Controller/TagRestController.php
index 354187a0..6f460a2d 100644
--- a/src/Wallabag/ApiBundle/Controller/TagRestController.php
+++ b/src/Wallabag/ApiBundle/Controller/TagRestController.php
@@ -3,6 +3,7 @@
 namespace Wallabag\ApiBundle\Controller;
 
 use Nelmio\ApiDocBundle\Annotation\ApiDoc;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Wallabag\CoreBundle\Entity\Entry;
@@ -14,7 +15,7 @@ class TagRestController extends WallabagRestController
      * Retrieve all tags.
      *
      * @ApiDoc()
-     *
+     * @Security("has_role('ROLE_READ')")
      * @return JsonResponse
      */
     public function getTagsAction()
@@ -38,7 +39,7 @@ class TagRestController extends WallabagRestController
      *          {"name"="tag", "dataType"="string", "required"=true, "requirement"="\w+", "description"="Tag as a string"}
      *      }
      * )
-     *
+     * @Security("has_role('ROLE_WRITE')")
      * @return JsonResponse
      */
     public function deleteTagLabelAction(Request $request)
@@ -71,7 +72,7 @@ class TagRestController extends WallabagRestController
      *          {"name"="tags", "dataType"="string", "required"=true, "format"="tag1,tag2", "description"="Tags as strings (comma splitted)"}
      *      }
      * )
-     *
+     * @Security("has_role('ROLE_WRITE')")
      * @return JsonResponse
      */
     public function deleteTagsLabelAction(Request $request)
@@ -113,7 +114,7 @@ class TagRestController extends WallabagRestController
      *          {"name"="tag", "dataType"="integer", "requirement"="\w+", "description"="The tag"}
      *      }
      * )
-     *
+     * @Security("has_role('ROLE_WRITE')")
      * @return JsonResponse
      */
     public function deleteTagAction(Tag $tag)
@@ -133,7 +134,7 @@ class TagRestController extends WallabagRestController
 
     /**
      * Remove orphan tag in case no entries are associated to it.
-     *
+     * @Security("has_role('ROLE_WRITE')")
      * @param Tag|array $tags
      */
     private function cleanOrphanTag($tags)
diff --git a/src/Wallabag/ApiBundle/Entity/AccessToken.php b/src/Wallabag/ApiBundle/Entity/AccessToken.php
index c09a0c80..a8b46742 100644
--- a/src/Wallabag/ApiBundle/Entity/AccessToken.php
+++ b/src/Wallabag/ApiBundle/Entity/AccessToken.php
@@ -7,7 +7,7 @@ use FOS\OAuthServerBundle\Entity\AccessToken as BaseAccessToken;
 
 /**
  * @ORM\Table("oauth2_access_tokens")
- * @ORM\Entity
+ * @ORM\Entity(repositoryClass="Wallabag\ApiBundle\Repository\AccessTokenRepository")
  */
 class AccessToken extends BaseAccessToken
 {
diff --git a/src/Wallabag/ApiBundle/Entity/Client.php b/src/Wallabag/ApiBundle/Entity/Client.php
index c15fd3fa..24444c9f 100644
--- a/src/Wallabag/ApiBundle/Entity/Client.php
+++ b/src/Wallabag/ApiBundle/Entity/Client.php
@@ -8,6 +8,7 @@ use Wallabag\UserBundle\Entity\User;
 use JMS\Serializer\Annotation\Groups;
 use JMS\Serializer\Annotation\SerializedName;
 use JMS\Serializer\Annotation\VirtualProperty;
+use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * @ORM\Table("oauth2_clients")
@@ -51,13 +52,39 @@ class Client extends BaseClient
 
     /**
      * @ORM\ManyToOne(targetEntity="Wallabag\UserBundle\Entity\User", inversedBy="clients")
+     * @ORM\JoinColumn(name="user_id", referencedColumnName="id", nullable=true)
      */
     private $user;
 
-    public function __construct(User $user)
+    /**
+     * @ORM\Column(type="string", nullable=true)
+     */
+    private $image;
+
+    /**
+     * @ORM\Column(type="string", nullable=true)
+     */
+    private $description;
+
+    /**
+     * @ORM\Column(type="string", nullable=true)
+     */
+    private $appUrl;
+
+    /**
+     * @ORM\Column(type="datetime", nullable=true)
+     */
+    private $createdAt;
+
+    /**
+     * Client constructor.
+     * @param User|null $user
+     */
+    public function __construct(User $user = null)
     {
         parent::__construct();
         $this->user = $user;
+        $this->createdAt = new \DateTime();
     }
 
     /**
@@ -99,6 +126,62 @@ class Client extends BaseClient
      */
     public function getClientId()
     {
-        return $this->getId().'_'.$this->getRandomId();
+        return $this->getId() . '_' . $this->getRandomId();
+    }
+
+    /**
+     * @return string
+     */
+    public function getImage()
+    {
+        return $this->image;
+    }
+
+    /**
+     * @param string $image
+     */
+    public function setImage($image)
+    {
+        $this->image = $image;
+    }
+
+    /**
+     * @return string
+     */
+    public function getDescription()
+    {
+        return $this->description;
+    }
+
+    /**
+     * @param string $description
+     */
+    public function setDescription($description)
+    {
+        $this->description = $description;
+    }
+
+    /**
+     * @return string
+     */
+    public function getAppUrl()
+    {
+        return $this->appUrl;
+    }
+
+    /**
+     * @param string $appUrl
+     */
+    public function setAppUrl($appUrl)
+    {
+        $this->appUrl = $appUrl;
+    }
+
+    /**
+     * @return \DateTime
+     */
+    public function getCreatedAt()
+    {
+        return $this->createdAt;
     }
 }
diff --git a/src/Wallabag/ApiBundle/Form/Type/ClientType.php b/src/Wallabag/ApiBundle/Form/Type/ClientType.php
index eaea4feb..58602d22 100644
--- a/src/Wallabag/ApiBundle/Form/Type/ClientType.php
+++ b/src/Wallabag/ApiBundle/Form/Type/ClientType.php
@@ -15,24 +15,8 @@ class ClientType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('name', TextType::class, ['label' => 'developer.client.form.name_label'])
-            ->add('redirect_uris', UrlType::class, [
-                'required' => false,
-                'label' => 'developer.client.form.redirect_uris_label',
-                'property_path' => 'redirectUris',
-            ])
-            ->add('save', SubmitType::class, ['label' => 'developer.client.form.save_label'])
-        ;
-
-        $builder->get('redirect_uris')
-            ->addModelTransformer(new CallbackTransformer(
-                function ($originalUri) {
-                    return $originalUri;
-                },
-                function ($submittedUri) {
-                    return [$submittedUri];
-                }
-            ))
+            ->add('name', TextType::class, ['label' => 'apps.old_client.form.name_label'])
+            ->add('save', SubmitType::class, ['label' => 'apps.old_client.form.save_label'])
         ;
     }
 
diff --git a/src/Wallabag/ApiBundle/Repository/AccessTokenRepository.php b/src/Wallabag/ApiBundle/Repository/AccessTokenRepository.php
new file mode 100644
index 00000000..2b8d24df
--- /dev/null
+++ b/src/Wallabag/ApiBundle/Repository/AccessTokenRepository.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Wallabag\ApiBundle\Repository;
+
+use Doctrine\ORM\EntityRepository;
+
+
+class AccessTokenRepository extends EntityRepository
+{
+    public function findAppsByUser($userId)
+    {
+        $qb = $this->createQueryBuilder('a')
+            ->innerJoin('a.client', 'c')
+            ->addSelect('c')
+            ->where('a.user =:userId')->setParameter('userId', $userId);
+        return $qb->getQuery()->getResult();
+    }
+}
diff --git a/src/Wallabag/ApiBundle/Resources/config/services.yml b/src/Wallabag/ApiBundle/Resources/config/services.yml
new file mode 100644
index 00000000..1275107d
--- /dev/null
+++ b/src/Wallabag/ApiBundle/Resources/config/services.yml
@@ -0,0 +1,6 @@
+services:
+    wallabag_api.accesstoken_repository:
+        class: Wallabag\ApiBundle\Repository\AccessTokenRepository
+        factory: [ "@doctrine.orm.default_entity_manager", getRepository ]
+        arguments:
+            - WallabagApiBundle:AccessToken
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index 02dd04f2..adf896ee 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -156,6 +156,7 @@ config:
         #         and: 'One rule AND another'
         #         matches: 'Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>'
         #         notmatches: 'Tests that a <i>subject</i> is not matches a <i>search</i> (case-insensitive).<br />Example: <code>title notmatches "football"</code>'
+
 entry:
     page_titles:
         # unread: 'Unread entries'
@@ -442,55 +443,55 @@ import:
         # description: 'This importer will import all your Instapaper articles. On the backup (https://pinboard.in/settings/backup) page, click on "JSON" in the "Bookmarks" section. A JSON file will be downloaded (like "pinboard_export").'
         # how_to: 'Please select your Pinboard export and click on the below button to upload and import it.'
 
-developer:
-    # page_title: 'API clients management'
-    # welcome_message: 'Welcome to the wallabag API'
-    # documentation: 'Documentation'
-    # how_to_first_app: 'How to create my first application'
-    # full_documentation: 'View full API documentation'
-    # list_methods: 'List API methods'
-    # clients:
-    #     title: 'Clients'
-    #     create_new: 'Create a new client'
-    # existing_clients:
-    #     title: 'Existing clients'
-    #     field_id: 'Client ID'
-    #     field_secret: 'Client secret'
-    #     field_uris: 'Redirect URIs'
-    #     field_grant_types: 'Grant type allowed'
-    #     no_client: 'No client yet.'
-    # remove:
-    #     warn_message_1: 'You have the ability to remove this client. This action is IRREVERSIBLE !'
-    #     warn_message_2: "If you remove it, every app configured with that client won't be able to auth on your wallabag."
-    #     action: 'Remove this client'
-    # client:
-    #     page_title: 'API clients management > New client'
-    #     page_description: 'You are about to create a new client. Please fill the field below for the redirect URI of your application.'
-    #     form:
-    #         name_label: 'Name of the client'
-    #         redirect_uris_label: 'Redirect URIs'
-    #         save_label: 'Create a new client'
-    #     action_back: 'Back'
-    # client_parameter:
-    #     page_title: 'API clients management > Client parameters'
-    #     page_description: 'Here are your client parameters.'
-    #     field_name: 'Client name'
-    #     field_id: 'Client ID'
-    #     field_secret: 'Client secret'
-    #     back: 'Back'
-    #     read_howto: 'Read the howto "Create my first application"'
-    # howto:
-    #     page_title: 'Developer > How to create my first application'
-    #     description:
-    #         paragraph_1: 'The following commands make use of the <a href="https://github.com/jkbrzt/httpie">HTTPie library</a>. Make sure it is installed on your system before using it.'
-    #         paragraph_2: 'You need a token to communicate between your 3rd application and wallabag API.'
-    #         paragraph_3: 'To create this token, you need <a href="%link%">to create a new client</a>.'
-    #         paragraph_4: 'Now, create your token (replace client_id, client_secret, username and password with the good values):'
-    #         paragraph_5: 'The API will return a response like this:'
-    #         paragraph_6: 'The access_token is useful to do a call to the API endpoint. For example:'
-    #         paragraph_7: 'This call will return all the entries for your user.'
-    #         paragraph_8: 'If you want to see all the API endpoints, you can have a look <a href="%link%">to our API documentation</a>.'
-    #     back: 'Back'
+apps:
+    # page_title: 'Apps'
+    # allow:
+    #    title: 'A new application would like to connect to your account'
+    #    permissions:
+    #        read:
+    #            label: 'Read your data'
+    #            desc: '%name% will be able to access the list and contents of your entries, tags and annotations.'
+    #        write:
+    #            label: 'Edit your data'
+    #            desc: '%name% will be able to edit and manage (including deleting) your entries, tags and annotations.'
+    #        user:
+    #            label: 'Edit your user settings'
+    #            desc: '%name% will be able to manage your user account.'
+    #featured:
+    #    title: 'Featured apps'
+    #list:
+    #    title: 'Authorized apps'
+    #old_clients:
+    #    create_new: 'Create a new client'
+    #    title: 'Old clients (depreciated)'
+    #    list: 'Old clients list'
+    #    field_id: 'Client ID'
+    #    field_secret: 'Client secret'
+    #    no_client: 'No client yet.'
+    #remove:
+    #    warn_message_1: 'You have the ability to remove the client %name%. This action is IRREVERSIBLE !'
+    #    warn_message_2: "If you remove it, every app configured with that client won't be able to auth on your wallabag."
+    #    action: 'Remove the client %name%'
+    #old_client:
+    #    page_title: 'Apps > New client'
+    #    page_description: 'You are about to create a new client. Please fill the field below for the redirect URI of your application.'
+    #    form:
+    #        name_label: 'Name of the client'
+    #        save_label: 'Create a new client'
+    #    action_back: 'Back'
+    #    parameters:
+    #        page_title: 'Apps > Client parameters'
+    #        page_description: 'Here are your client parameters.'
+    #        field_name: 'Client name'
+    #        field_id: 'Client ID'
+    #        field_secret: 'Client secret'
+    #        back: 'Back'
+    # app:
+    #    created_at: 'Created at: %date%'
+    # documentation:
+    #    title: 'Documentation'
+    #    full_documentation: 'Full documentation'
+    #    list_methods: 'List API methods'
 
 user:
     # page_title: Users management
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index f6ccdae0..17b8297f 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@ -443,55 +443,55 @@ import:
         description: 'Dieser Import wird all deine Pinboard Artikel importieren. Auf der Seite Backup (https://pinboard.in/settings/backup) klickst du auf "JSON" in dem Abschnitt "Lesezeichen". Eine JSON Datei wird dann heruntergeladen (z.B. "pinboard_export").'
         how_to: 'Bitte wähle deinen Pinboard Export aus und klicke den nachfolgenden Button zum Importieren.'
 
-developer:
+apps:
     page_title: 'API-Client-Verwaltung'
-    welcome_message: 'Willkomen zur wallabag API'
-    documentation: 'Dokumentation'
-    how_to_first_app: 'Wie erstelle ich meine erste Anwendung'
-    full_documentation: 'Komplette API-Dokumentation einsehen'
-    list_methods: 'Liste der API-Methoden'
-    clients:
-        title: 'Clients'
+    # allow:
+    #    title: 'A new application would like to connect to your account'
+    #    permissions:
+    #        read:
+    #            label: 'Read your data'
+    #            desc: '%name% will be able to access the list and contents of your entries, tags and annotations.'
+    #        write:
+    #            label: 'Edit your data'
+    #            desc: '%name% will be able to edit and manage (including deleting) your entries, tags and annotations.'
+    #        user:
+    #            label: 'Edit your user settings'
+    #            desc: '%name% will be able to manage your user account.'
+    featured:
+        # title: 'Featured apps'
+    list:
+        # title: 'Authorized apps'
+    old_clients:
         create_new: 'Neuen Client erstellen'
-    existing_clients:
         title: 'Bestehende Clients'
+        list: 'Clients'
         field_id: 'Client-ID'
         field_secret: 'Client-Secret'
-        field_uris: 'Weiterleitungs-URIs'
-        field_grant_types: "Erlaubte grant_types"
         no_client: 'Bisher kein Client.'
     remove:
         warn_message_1: 'Du hast die Möglichkeit, diesen Client zu entfernen. DIESE AKTION IST NICHT WIDERRUFBAR!'
         warn_message_2: "Wenn du ihn entfernst, hat keine der damit konfigurierten Anwendungen mehr die Möglichkeit, sich in deinen wallabag-Konto anzumelden."
         action: 'Client entfernen'
-    client:
+    old_client:
         page_title: 'API-Client-Verwaltung > Neuer Client'
         page_description: 'Du bist dabei, einen neuen Client zu erstellen. Fülle das nachfolgende Feld für die Weiterleitungs-URIs deiner Anwendung aus.'
         form:
             name_label: 'Name des Clients'
-            redirect_uris_label: 'Weiterleitungs-URIs'
             save_label: 'Neuen Client erstellen'
         action_back: 'Zurück'
-    client_parameter:
-        page_title: 'API-Client-Verwaltung > Client-Parameter'
-        page_description: 'Dies sind deine Client-Parameter.'
-        field_name: 'Client Name'
-        field_id: 'Client-ID'
-        field_secret: 'Client-Secret'
-        back: 'Zurück'
-        read_howto: 'Lese des How-To zu "Wie erstelle ich meine erste Anwendung"'
-    howto:
-        page_title: 'API-Client-Verwaltung > Wie erstelle ich meine erste Anwendung'
-        description:
-            paragraph_1: 'Die folgenden Befehle machen Gebrauch von der <a href="https://github.com/jkbrzt/httpie">HTTPie-Bibliothek</a>. Stelle sicher, dass sie auf deinem System installiert ist, bevor du fortfährst.'
-            paragraph_2: 'Du benötigst einen Token, damit deine Anwendung mit der wallabag-API kommunizieren kann.'
-            paragraph_3: 'Um diesen Token zu erstellen, muss <a href="%link%">ein neuer Client erstellt werden</a>.'
-            paragraph_4: 'Nun erstelle deinen Token (ersetze client_id, client_secret, username und password mit deinen Werten):'
-            paragraph_5: 'Die API wird eine Antwort der folgenden Art zurückgeben:'
-            paragraph_6: 'Der access_token ist nützlich, um die API aufzurufen. Beispiel:'
-            paragraph_7: 'Dieser Aufruf wird alle Einträge für den Nutzer zurückgeben.'
-            paragraph_8: 'Wenn du alle API-Endpunkte sehen willst, werfe einen Blick auf die <a href="%link%">API-Dokumentation</a>.'
-        back: 'Zurück'
+        parameters:
+            page_title: 'API-Client-Verwaltung > Client-Parameter'
+            page_description: 'Dies sind deine Client-Parameter.'
+            field_name: 'Client Name'
+            field_id: 'Client-ID'
+            field_secret: 'Client-Secret'
+            back: 'Zurück'
+    app:
+        # created_at: 'Created at: %date%'
+    documentation:
+        title: 'Dokumentation'
+        full_documentation: 'Komplette API-Dokumentation einsehen'
+        list_methods: 'Liste der API-Methoden'
 
 user:
     page_title: Benutzerverwaltung
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index 902c3046..c78228e0 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -25,7 +25,7 @@ menu:
         internal_settings: 'Internal Settings'
         import: 'Import'
         howto: 'How to'
-        developer: 'API clients management'
+        apps: 'Apps'
         logout: 'Logout'
         about: 'About'
         search: 'Search'
@@ -443,55 +443,55 @@ import:
         description: 'This importer will import all your Pinboard articles. On the backup (https://pinboard.in/settings/backup) page, click on "JSON" in the "Bookmarks" section. A JSON file will be downloaded (like "pinboard_export").'
         how_to: 'Please select your Pinboard export and click on the below button to upload and import it.'
 
-developer:
-    page_title: 'API clients management'
-    welcome_message: 'Welcome to the wallabag API'
-    documentation: 'Documentation'
-    how_to_first_app: 'How to create my first application'
-    full_documentation: 'View full API documentation'
-    list_methods: 'List API methods'
-    clients:
-        title: 'Clients'
+apps:
+    page_title: 'Apps'
+    allow:
+        title: 'A new application would like to connect to your account'
+        permissions:
+            read:
+                label: 'Read your data'
+                desc: '%name% will be able to access the list and contents of your entries, tags and annotations.'
+            write:
+                label: 'Edit your data'
+                desc: '%name% will be able to edit and manage (including deleting) your entries, tags and annotations.'
+            user:
+                label: 'Edit your user settings'
+                desc: '%name% will be able to manage your user account.'
+    featured:
+        title: 'Featured apps'
+    list:
+        title: 'Authorized apps'
+    old_clients:
         create_new: 'Create a new client'
-    existing_clients:
-        title: 'Existing clients'
+        title: 'Old clients (depreciated)'
+        list: 'Old clients list'
         field_id: 'Client ID'
         field_secret: 'Client secret'
-        field_uris: 'Redirect URIs'
-        field_grant_types: 'Grant type allowed'
         no_client: 'No client yet.'
     remove:
         warn_message_1: 'You have the ability to remove the client %name%. This action is IRREVERSIBLE !'
         warn_message_2: "If you remove it, every app configured with that client won't be able to auth on your wallabag."
         action: 'Remove the client %name%'
-    client:
-        page_title: 'API clients management > New client'
+    old_client:
+        page_title: 'Apps > New client'
         page_description: 'You are about to create a new client. Please fill the field below for the redirect URI of your application.'
         form:
             name_label: 'Name of the client'
-            redirect_uris_label: 'Redirect URIs (optional)'
             save_label: 'Create a new client'
         action_back: 'Back'
-    client_parameter:
-        page_title: 'API clients management > Client parameters'
-        page_description: 'Here are your client parameters.'
-        field_name: 'Client name'
-        field_id: 'Client ID'
-        field_secret: 'Client secret'
-        back: 'Back'
-        read_howto: 'Read the howto "Create my first application"'
-    howto:
-        page_title: 'API clients management > How to create my first application'
-        description:
-            paragraph_1: 'The following commands make use of the <a href="https://github.com/jkbrzt/httpie">HTTPie library</a>. Make sure it is installed on your system before using it.'
-            paragraph_2: 'You need a token to communicate between your 3rd application and wallabag API.'
-            paragraph_3: 'To create this token, you need <a href="%link%">to create a new client</a>.'
-            paragraph_4: 'Now, create your token (replace client_id, client_secret, username and password with the good values):'
-            paragraph_5: 'The API will return a response like this:'
-            paragraph_6: 'The access_token is useful to do a call to the API endpoint. For example:'
-            paragraph_7: 'This call will return all the entries for your user.'
-            paragraph_8: 'If you want to see all the API endpoints, you can have a look <a href="%link%">to our API documentation</a>.'
-        back: 'Back'
+        parameters:
+            page_title: 'Apps > Client parameters'
+            page_description: 'Here are your client parameters.'
+            field_name: 'Client name'
+            field_id: 'Client ID'
+            field_secret: 'Client secret'
+            back: 'Back'
+    app:
+        created_at: 'Created at: %date%'
+    documentation:
+        title: 'Documentation'
+        full_documentation: 'Full documentation'
+        list_methods: 'List API methods'
 
 user:
     page_title: Users management
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
index afd6a7b1..36dd6016 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@@ -443,55 +443,55 @@ import:
         description: 'Importa todos tus artículos de Pinboard. En la página de backup (https://pinboard.in/settings/backup), haz clic en "JSON" en la sección "Marcadores". Obtendrás un archivo JSON llamado "pinboard_export".'
         how_to: 'Seleccione el archivo exportado de Pinboard y haga clic en el botón para subirlo e importarlo.'
 
-developer:
+apps:
     page_title: 'Gestión de clientes API'
-    welcome_message: 'Bienvenido al API de wallabag'
-    documentation: 'Documentación'
-    how_to_first_app: 'Cómo crear mi primera aplicación'
-    full_documentation: 'Ver documentación completa del API'
-    list_methods: 'Lista con los métodos del API'
-    clients:
-        title: 'Clientes'
+    # allow:
+    #    title: 'A new application would like to connect to your account'
+    #    permissions:
+    #        read:
+    #            label: 'Read your data'
+    #            desc: '%name% will be able to access the list and contents of your entries, tags and annotations.'
+    #        write:
+    #            label: 'Edit your data'
+    #            desc: '%name% will be able to edit and manage (including deleting) your entries, tags and annotations.'
+    #        user:
+    #            label: 'Edit your user settings'
+    #            desc: '%name% will be able to manage your user account.'
+    featured:
+        # title: 'Featured apps'
+    list:
+        # title: 'Authorized apps'
+    old_clients:
         create_new: 'Crear un nuevo cliente'
-    existing_clients:
         title: 'Clientes existentes'
+        list: 'Clientes'
         field_id: 'Identificador del cliente'
         field_secret: 'Secreto del cliente'
-        field_uris: 'URIs de redirección'
-        field_grant_types: 'Permisos concedidos'
         no_client: 'Todavía no hay clientes.'
     remove:
         warn_message_1: 'Tienes permiso para eliminar el cliente %name%. ¡Está acción es IRREVERSIBLE!'
         warn_message_2: "Si lo eliminas, cada aplicación configurada con ese cliente no podrá autenticarse en wallabag."
         action: 'Eliminar el cliente %name%'
-    client:
+    old_client:
         page_title: 'Gestión de clientes API > Nuevo cliente'
         page_description: 'Está a punto de crear un nuevo cliente. Por favor, rellene el campo de abajo con la URI de redirección de su aplicación.'
         form:
             name_label: 'Nombre del cliente'
-            redirect_uris_label: 'URIs de redirección'
             save_label: 'Crear un nuevo cliente'
         action_back: 'Volver'
-    client_parameter:
-        page_title: 'Gestión de clientes API > Parámetros del cliente'
-        page_description: 'Aquí están los parámetros del cliente.'
-        field_name: 'Nombre del cliente'
-        field_id: 'Identificador del cliente'
-        field_secret: 'Secreto del cliente'
-        back: 'Volver'
-        read_howto: 'Lea la guía "Crear mi primera aplicación"'
-    howto:
-        page_title: 'Gestión de clientes API > Cómo crear mi primera aplicación'
-        description:
-            paragraph_1: 'Los siguientes comandos hacen uso de la <a href="https://github.com/jkbrzt/httpie">biblioteca HTTPie</a>. Compruebe que está instalada en su sistema antes de usarla.'
-            paragraph_2: 'Necesitas un token para establecer la comunicación entre una aplicación de terceros y la API de wallabag.'
-            paragraph_3: 'Para crear este token, necesitas <a href="%link%">crear un nuevo cliente</a>.'
-            paragraph_4: 'Ahora crea tu token (reemplace client_id, client_secret, username y password con los valores generados):'
-            paragraph_5: 'Este API devolverá una respuesta como esta:'
-            paragraph_6: 'El access_token es útil para llamar a los métodos del API. Por ejemplo:'
-            paragraph_7: 'Esta llamada devolverá todos los artículos de tu usuario.'
-            paragraph_8: 'Si quiere ver todos los métodos del API, puede verlos en <a href="%link%">nuestra documentación del API</a>.'
-        back: 'Volver'
+        parameters:
+            page_title: 'Gestión de clientes API > Parámetros del cliente'
+            page_description: 'Aquí están los parámetros del cliente.'
+            field_name: 'Nombre del cliente'
+            field_id: 'Identificador del cliente'
+            field_secret: 'Secreto del cliente'
+            back: 'Volver'
+    app:
+        # created_at: 'Created at: %date%'
+    documentation:
+        title: 'Documentación'
+        full_documentation: 'Ver documentación completa del API'
+        list_methods: 'Lista con los métodos del API'
 
 user:
     page_title: Gestión de usuarios
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index 545514b3..e399c199 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -443,55 +443,55 @@ import:
         # description: 'This importer will import all your Instapaper articles. On the backup (https://pinboard.in/settings/backup) page, click on "JSON" in the "Bookmarks" section. A JSON file will be downloaded (like "pinboard_export").'
         # how_to: 'Please select your Pinboard export and click on the below button to upload and import it.'
 
-developer:
-    # page_title: 'API clients management'
-    # welcome_message: 'Welcome to the wallabag API'
-    # documentation: 'Documentation'
-    # how_to_first_app: 'How to create my first application'
-    # full_documentation: 'View full API documentation'
-    # list_methods: 'List API methods'
-    # clients:
-    #     title: 'Clients'
-    #     create_new: 'Create a new client'
-    # existing_clients:
-    #     title: 'Existing clients'
-    #     field_id: 'Client ID'
-    #     field_secret: 'Client secret'
-    #     field_uris: 'Redirect URIs'
-    #     field_grant_types: 'Grant type allowed'
-    #     no_client: 'No client yet.'
-    # remove:
-    #     warn_message_1: 'You have the ability to remove this client. This action is IRREVERSIBLE !'
-    #     warn_message_2: "If you remove it, every app configured with that client won't be able to auth on your wallabag."
-    #     action: 'Remove this client'
-    # client:
-    #     page_title: 'API clients management > New client'
-    #     page_description: 'You are about to create a new client. Please fill the field below for the redirect URI of your application.'
-    #     form:
-    #         name_label: 'Name of the client'
-    #         redirect_uris_label: 'Redirect URIs'
-    #         save_label: 'Create a new client'
-    #     action_back: 'بازگشت'
-    # client_parameter:
-    #     page_title: 'API clients management > Client parameters'
-    #     page_description: 'Here are your client parameters.'
-    #     field_name: 'Client name'
-    #     field_id: 'Client ID'
-    #     field_secret: 'Client secret'
-    #     back: 'بازگشت'
-    #     read_howto: 'Read the howto "Create my first application"'
-    # howto:
-    #     page_title: 'API clients management > How to create my first application'
-    #     description:
-    #         paragraph_1: 'The following commands make use of the <a href="https://github.com/jkbrzt/httpie">HTTPie library</a>. Make sure it is installed on your system before using it.'
-    #         paragraph_2: 'You need a token to communicate between your 3rd application and wallabag API.'
-    #         paragraph_3: 'To create this token, you need <a href="%link%">to create a new client</a>.'
-    #         paragraph_4: 'Now, create your token (replace client_id, client_secret, username and password with the good values):'
-    #         paragraph_5: 'The API will return a response like this:'
-    #         paragraph_6: 'The access_token is useful to do a call to the API endpoint. For example:'
-    #         paragraph_7: 'This call will return all the entries for your user.'
-    #         paragraph_8: 'If you want to see all the API endpoints, you can have a look <a href="%link%">to our API documentation</a>.'
-    #     back: 'بازگشت'
+apps:
+    # page_title: 'Apps'
+    # allow:
+    #    title: 'A new application would like to connect to your account'
+    #    permissions:
+    #        read:
+    #            label: 'Read your data'
+    #            desc: '%name% will be able to access the list and contents of your entries, tags and annotations.'
+    #        write:
+    #            label: 'Edit your data'
+    #            desc: '%name% will be able to edit and manage (including deleting) your entries, tags and annotations.'
+    #        user:
+    #            label: 'Edit your user settings'
+    #            desc: '%name% will be able to manage your user account.'
+    #featured:
+    #    title: 'Featured apps'
+    #list:
+    #    title: 'Authorized apps'
+    #old_clients:
+    #    create_new: 'Create a new client'
+    #    title: 'Old clients (depreciated)'
+    #    list: 'Old clients list'
+    #    field_id: 'Client ID'
+    #    field_secret: 'Client secret'
+    #    no_client: 'No client yet.'
+    #remove:
+    #    warn_message_1: 'You have the ability to remove the client %name%. This action is IRREVERSIBLE !'
+    #    warn_message_2: "If you remove it, every app configured with that client won't be able to auth on your wallabag."
+    #    action: 'Remove the client %name%'
+    #old_client:
+    #    page_title: 'Apps > New client'
+    #    page_description: 'You are about to create a new client. Please fill the field below for the redirect URI of your application.'
+    #    form:
+    #        name_label: 'Name of the client'
+    #        save_label: 'Create a new client'
+    #    action_back: 'Back'
+    #    parameters:
+    #        page_title: 'Apps > Client parameters'
+    #        page_description: 'Here are your client parameters.'
+    #        field_name: 'Client name'
+    #        field_id: 'Client ID'
+    #        field_secret: 'Client secret'
+    #        back: 'Back'
+    # app:
+    #    created_at: 'Created at: %date%'
+    # documentation:
+    #    title: 'Documentation'
+    #    full_documentation: 'Full documentation'
+    #    list_methods: 'List API methods'
 
 user:
     # page_title: Users management
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index e9e79c67..e3967960 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -443,55 +443,55 @@ import:
         description: "Sur la page « Backup » (https://pinboard.in/settings/backup), cliquez sur « JSON » dans la section « Bookmarks ». Un fichier json (sans extension) sera téléchargé (« pinboard_export »)."
         how_to: "Choisissez le fichier de votre export Pinboard et cliquez sur le bouton ci-dessous pour l’importer."
 
-developer:
+apps:
     page_title: "Gestion des clients API"
-    welcome_message: "Bienvenue sur l’API de wallabag"
-    documentation: "Documentation"
-    how_to_first_app: "Comment créer votre première application"
-    full_documentation: "Voir la documentation complète de l’API"
-    list_methods: "Lister toutes les méthodes de l’API"
-    clients:
-        title: "Clients"
+    allow:
+        title: 'Une nouvelle application voudrait accéder à votre compte'
+        permissions:
+            read:
+                label: 'Lire vos données'
+                desc: '%name% pourra accéder à la liste et au contenu de vos articles, tags et annotations.'
+            write:
+                label: 'Modifier vos données'
+                desc: '%name% pourra modifier et gérer (y compris supprimer) vos articles, tags et annotations.'
+            user:
+                label: 'Modifier votre compte utilisateur'
+                desc: '%name% pourra modifier les détails de votre compte utilisateur.'
+    featured:
+        title: 'Applications mises en avant'
+    list:
+        title: 'Applications autorisées'
+    old_clients:
         create_new: "Créer un nouveau client"
-    existing_clients:
-        title: "Les clients existants"
+        title: "Clients existants (déprécié)"
+        list: "Liste des clients"
         field_id: "ID Client"
         field_secret: "Clé secrète"
-        field_uris: "Adresse de redirection"
-        field_grant_types: "Type de privilège accordé"
         no_client: "Aucun client pour le moment"
     remove:
         warn_message_1: "Vous avez la possibilité de supprimer le client %name%. Cette action est IRRÉVERSIBLE !"
         warn_message_2: "Si vous supprimez le client %name%, toutes les applications qui l’utilisaient ne fonctionneront plus avec votre compte wallabag."
         action: "Supprimer le client %name%"
-    client:
+    old_client:
         page_title: "Gestion des clients API > Nouveau client"
         page_description: "Vous allez créer un nouveau client. Merci de remplir l’adresse de redirection vers votre application."
         form:
             name_label: "Nom du client"
-            redirect_uris_label: "Adresses de redirection (optionnel)"
             save_label: "Créer un nouveau client"
         action_back: "Retour"
-    client_parameter:
-        page_title: "Gestion des clients API > Les paramètres de votre client"
-        page_description: "Voilà les paramètres de votre client"
-        field_name: "Nom du client"
-        field_id: "ID client"
-        field_secret: "Clé secrète"
-        back: "Retour"
-        read_howto: "Lire « comment créer ma première application »"
-    howto:
-        page_title: "Gestion des clients API > Comment créer votre première application"
-        description:
-            paragraph_1: "Les commandes suivantes utilisent la <a href=\"https://github.com/jkbrzt/httpie\">librarie HTTPie</a>. Assurez-vous qu’elle soit installée avant de l’utiliser."
-            paragraph_2: "Vous avez besoin d’un token pour échanger entre votre application et l’API de wallabag."
-            paragraph_3: "Pour créer un token, vous devez <a href=\"%link%\">créer un nouveau client</a>."
-            paragraph_4: "Maintenant créez votre token (remplacer client_id, client_secret, username et password avec les bonnes valeurs):"
-            paragraph_5: "L’API vous retournera une réponse comme ça :"
-            paragraph_6: "L’access_token doit être utilisé pour faire un appel à l’API. Par exemple :"
-            paragraph_7: "Cet appel va retourner tous les articles de l’utilisateur."
-            paragraph_8: "Si vous voulez toutes les méthodes de l’API, jetez un oeil <a href=\"%link%\">à la documentation de l’API</a>."
-        back: "Retour"
+        parameters:
+            page_title: "Gestion des clients API > Les paramètres de votre client"
+            page_description: "Voilà les paramètres de votre client"
+            field_name: "Nom du client"
+            field_id: "ID client"
+            field_secret: "Clé secrète"
+            back: "Retour"
+    app:
+        created_at: 'Créé le : %date%'
+    documentation:
+        title: "Documentation"
+        full_documentation: "Voir la documentation complète de l’API"
+        list_methods: "Lister toutes les méthodes de l’API"
 
 user:
     page_title: "Gestion des utilisateurs"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index 0597d3e3..504f990f 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -443,18 +443,28 @@ import:
         # description: 'This importer will import all your Instapaper articles. On the backup (https://pinboard.in/settings/backup) page, click on "JSON" in the "Bookmarks" section. A JSON file will be downloaded (like "pinboard_export").'
         # how_to: 'Please select your Pinboard export and click on the below button to upload and import it.'
 
-developer:
+apps:
     # page_title: 'API clients management'
-    welcome_message: 'Benvenuto nelle API di wallabag'
-    documentation: 'Documentazione'
-    how_to_first_app: 'Come creare la mia prima applicazione'
-    full_documentation: 'Consulta la documentazione API completa'
-    list_methods: 'Elenco dei metodi API'
-    clients:
-        title: 'Client'
+    # allow:
+    #    title: 'A new application would like to connect to your account'
+    #    permissions:
+    #        read:
+    #            label: 'Read your data'
+    #            desc: '%name% will be able to access the list and contents of your entries, tags and annotations.'
+    #        write:
+    #            label: 'Edit your data'
+    #            desc: '%name% will be able to edit and manage (including deleting) your entries, tags and annotations.'
+    #        user:
+    #            label: 'Edit your user settings'
+    #            desc: '%name% will be able to manage your user account.'
+    #featured:
+    #    title: 'Featured apps'
+    #list:
+    #    title: 'Authorized apps'
+    old_clients:
         create_new: 'Crea un nuovo client'
-    existing_clients:
         title: 'Client esistenti'
+        list: 'Client'
         field_id: 'Client ID'
         field_secret: 'Client secret'
         field_uris: 'URI di reindirizzamento'
@@ -464,34 +474,26 @@ developer:
         warn_message_1: "Hai la possibilità di rimuovere questo client. L'operazione è IRREVERSIBILE!"
         warn_message_2: "Se lo rimuovi, ogni app configurata con questo client non sarà più in grado di autenticarsi."
         action: 'Rimuovi questo client'
-    client:
+    old_client:
         # page_title: 'API clients management > Nuovo client'
         page_description: 'Stai per creare un nuovo client. Compila i campi sottostanti per lo URI di reindirizzamento della tua applicazione.'
         form:
             # name_label: 'Name of the client'
-            redirect_uris_label: 'URI di reindirizzamento'
             save_label: 'Crea un nuovo client'
         action_back: 'Indietro'
-    client_parameter:
-        # page_title: 'API clients management > parametri Client'
-        page_description: 'Questi sono i tuoi parametri del client.'
-        # field_name: 'Client name'
-        field_id: 'Client ID'
-        field_secret: 'Client secret'
-        back: 'Indietro'
-        read_howto: 'Leggi "Come creare la mia prima applicazione"'
-    howto:
-        # page_title: 'API clients management > Come creare la mia prima applicazione'
-        description:
-            paragraph_1: 'I seguenti comandi fanno uso della <a href="https://github.com/jkbrzt/httpie">libreria HTTPie</a>. Verifica che sia installata sul tuo sistema prima di utilizzarli.'
-            paragraph_2: 'Hai bisogno di un token per far comunicare la tua applicazione di terze parti e le API di wallabag.'
-            paragraph_3: 'Per creare questo token, hai bisogno di <a href="%link%">creare un nuovo client</a>.'
-            paragraph_4: 'Ora, crea il tuo token (sostituisci client_id, client_secret, username e password con valori reali):'
-            paragraph_5: 'Le API ritorneranno una risposta di questo tipo:'
-            paragraph_6: "L'access_token è utile per chiamare un API endpoint. Per esempio:"
-            paragraph_7: 'Questa chiamata ritornerà tutti i contenuti per il tuo utente.'
-            paragraph_8: 'Se vuoi visualizzare tutti gli API endpoints, dai una occhiata alla <a href="%link%">documentazione delle API</a>.'
-        back: 'Indietro'
+        parameters:
+            # page_title: 'API clients management > parametri Client'
+            page_description: 'Questi sono i tuoi parametri del client.'
+            # field_name: 'Client name'
+            field_id: 'Client ID'
+            field_secret: 'Client secret'
+            back: 'Indietro'
+    # app:
+    #    created_at: 'Created at: %date%'
+    documentation:
+        title: 'Documentazione'
+        full_documentation: 'Consulta la documentazione API completa'
+        list_methods: 'Elenco dei metodi API'
 
 user:
     # page_title: Users management
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
index c172a0f6..ea05fc4c 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@ -445,31 +445,38 @@ import:
 
 developer:
     page_title: 'Gestion dels clients API'
-    welcome_message: "Benvenguda sus l'API de wallabag"
-    documentation: 'Documentacion'
-    how_to_first_app: 'Cossí crear vòstra primièra aplicacion'
-    full_documentation: "Veire la documentacion completa de l'API"
-    list_methods: "Lista dels metòdes de l'API"
-    clients:
-        title: 'Clients'
+    # allow:
+    #    title: 'A new application would like to connect to your account'
+    #    permissions:
+    #        read:
+    #            label: 'Read your data'
+    #            desc: '%name% will be able to access the list and contents of your entries, tags and annotations.'
+    #        write:
+    #            label: 'Edit your data'
+    #            desc: '%name% will be able to edit and manage (including deleting) your entries, tags and annotations.'
+    #        user:
+    #            label: 'Edit your user settings'
+    #            desc: '%name% will be able to manage your user account.'
+    #featured:
+    #    title: 'Featured apps'
+    #list:
+    #    title: 'Authorized apps'
+    old_clients:
         create_new: 'Crear un novèl client'
-    existing_clients:
         title: 'Los clients existents'
+        list: 'Clients'
         field_id: 'ID Client'
         field_secret: 'Clé secreta'
-        field_uris: 'URLs de redireccion'
-        field_grant_types: 'Tipe de privilègi acordat'
         no_client: 'Pas cap de client pel moment.'
     remove:
         warn_message_1: 'Avètz la possibilitat de supriimr un client. Aquesta accion es IRREVERSIBLA !'
         warn_message_2: "Se suprimissètz un client, totas las aplicacions que l'emplegan foncionaràn pas mai amb vòstre compte wallabag."
         action: 'Suprimir aqueste client'
-    client:
+    old_client:
         page_title: 'Gestion dels clients API > Novèl client'
         page_description: "Anatz crear un novèl client. Mercés de garnir l'url de redireccion cap a vòstra aplicacion."
         form:
             name_label: "Nom del client"
-            redirect_uris_label: 'URLs de redireccion'
             save_label: 'Crear un novèl client'
         action_back: 'Retorn'
     client_parameter:
@@ -492,6 +499,19 @@ developer:
             paragraph_7: "Aquesta requèsta tornarà totes los articles de l'utilizaire."
             paragraph_8: "Se volètz totas las adreças d'accès de l'API, donatz un còp d’uèlh <a href=\"%link%\">a la documentacion de l'API</a>."
         back: 'Retorn'
+        parameters:
+            page_title: 'Gestion dels clients API > Los paramètres de vòstre client'
+            page_description: 'Vaquí los paramètres de vòstre client.'
+            field_name: 'Nom del client'
+            field_id: 'ID Client'
+            field_secret: 'Clau secreta'
+            back: 'Retour'
+    # app:
+    #    created_at: 'Created at: %date%'
+    documentation:
+        title: 'Documentacion'
+        full_documentation: "Veire la documentacion completa de l'API"
+        list_methods: "Lista dels metòdes de l'API"
 
 user:
     page_title: 'Gestion dels utilizaires'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
index 82d16767..d2e5c1d5 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@ -443,55 +443,55 @@ import:
         description: 'Ten importer, zaimportuje wszystkie twoje artykuły z Pinboard. W ustawieniach kopii zapasowej (https://pinboard.in/settings/backup), kliknij na "JSON" w sekcji "Bookmarks". Otrzymasz plik "pinboard_export".'
         how_to: 'Wybierz swój plik eksportu z Pinboard i kliknij poniższy przycisk, aby go załadować.'
 
-developer:
+apps:
     page_title: 'Zarządzanie klientami API'
-    welcome_message: 'Witaj w API wallabag'
-    documentation: 'Dokumentacja'
-    how_to_first_app: 'Jak stworzyć moją pierwszą aplikację'
-    full_documentation: 'Pokaż pełne API'
-    list_methods: 'Lista metod API'
-    clients:
-        title: 'Klienci'
+    # allow:
+    #    title: 'A new application would like to connect to your account'
+    #    permissions:
+    #        read:
+    #            label: 'Read your data'
+    #            desc: '%name% will be able to access the list and contents of your entries, tags and annotations.'
+    #        write:
+    #            label: 'Edit your data'
+    #            desc: '%name% will be able to edit and manage (including deleting) your entries, tags and annotations.'
+    #        user:
+    #            label: 'Edit your user settings'
+    #            desc: '%name% will be able to manage your user account.'
+    #featured:
+    #    title: 'Featured apps'
+    #list:
+    #    title: 'Authorized apps'
+    old_clients:
         create_new: 'Utwórz nowego klienta'
-    existing_clients:
         title: 'Istniejący klienci'
+        list: 'Klienci'
         field_id: 'ID klienta'
         field_secret: 'Client secret'
-        field_uris: 'Przekieruj URIs'
-        field_grant_types: 'Przyznaj pozwolenie'
         no_client: 'Nie ma jeszcze klienta.'
     remove:
         warn_message_1: 'Masz możliwość usunięcia tego klienta. Ta akcja jest NIEODWRACALNA !'
         warn_message_2: "Jeżeli go usuniesz, aplikacje skonfigurowane z tym klientem nię będa w stanie autoryzować twojego wallabag."
         action: 'Usuń tego klienta'
-    client:
+    old_client:
         page_title: 'Zarządzanie klientami API > Nowy klient'
         page_description: 'Tworzysz nowego klienta. Wypełnij poniższe pole w celu przekierowania URI twojej aplikacji.'
         form:
             name_label: 'Nazwa klienta'
-            redirect_uris_label: 'Przekieruj adresy URI'
             save_label: 'Stwórz nowego klienta'
         action_back: 'Cofnij'
-    client_parameter:
-        page_title: 'Zarządzanie klientami API > Parametry klienta'
-        page_description: 'Tutaj znajdują się parametry klienta.'
-        field_name: 'Nazwa klienta'
-        field_id: 'Client ID'
-        field_secret: 'Client secret'
-        back: 'Cofnij'
-        read_howto: 'Przeczytaj jak "Stworzyć moją pierwszą aplikację"'
-    howto:
-        page_title: 'Zarządzanie klientami API > Jak stworzyć moją pierwszą aplikację'
-        description:
-            paragraph_1: 'Następujące komendy korzystają <a href="https://github.com/jkbrzt/httpie">Biblioteka HTTPie</a>. Upewnij się, czy zainstalowałeś ją w swoim systemie zanim z niej skorzystasz'
-            paragraph_2: 'Potrzebujesz tokena w celu nawiązania komunikacji między swoją aplikacją a API wallabag.'
-            paragraph_3: 'W celu stworzenia tokena musisz <a href="%link%">stwórz nowego klienta</a>.'
-            paragraph_4: 'Teraz, utwórz tokena (zmień client_id, client_secret, username i password z poprawnymi wartościami):'
-            paragraph_5: 'API powinno zwrócić taką informację:'
-            paragraph_6: 'access_token jest użyteczny do wywołania API endpoint. Na przykład:'
-            paragraph_7: 'To wywołanie zwróci wszystkie twoje wpisy.'
-            paragraph_8: 'Jeżeli chcesz wyświetlić wszystkie punkty końcowe API, zobacz <a href="%link%">Dokumentacja naszego API</a>.'
-        back: 'Cofnij'
+        parameters:
+            page_title: 'Zarządzanie klientami API > Parametry klienta'
+            page_description: 'Tutaj znajdują się parametry klienta.'
+            field_name: 'Nazwa klienta'
+            field_id: 'Client ID'
+            field_secret: 'Client secret'
+            back: 'Cofnij'
+    # app:
+    #    created_at: 'Created at: %date%'
+    documentation:
+        title: 'Dokumentacja'
+        full_documentation: 'Pokaż pełne API'
+        list_methods: 'Lista metod API'
 
 user:
     page_title: Zarządzanie użytkownikami
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
index b75567d6..0533ddba 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
@@ -445,53 +445,53 @@ import:
 
 developer:
     # page_title: 'API clients management'
-    welcome_message: 'Bem-vindo a API do wallabag'
-    documentation: 'Documentação'
-    how_to_first_app: 'Como criar minha primeira aplicação'
-    full_documentation: 'Ver a documentação completa da API'
-    list_methods: 'Lista de métodos da API'
-    clients:
-        title: 'Clientes'
+    # allow:
+    #    title: 'A new application would like to connect to your account'
+    #    permissions:
+    #        read:
+    #            label: 'Read your data'
+    #            desc: '%name% will be able to access the list and contents of your entries, tags and annotations.'
+    #        write:
+    #            label: 'Edit your data'
+    #            desc: '%name% will be able to edit and manage (including deleting) your entries, tags and annotations.'
+    #        user:
+    #            label: 'Edit your user settings'
+    #            desc: '%name% will be able to manage your user account.'
+    #featured:
+    #    title: 'Featured apps'
+    #list:
+    #    title: 'Authorized apps'
+    old_clients:
         create_new: 'Criar um novo cliente'
-    existing_clients:
         title: 'Clientes existentes'
+        list: 'Clientes'
         field_id: 'ID do cliente'
         field_secret: 'Chave do cliente'
-        field_uris: 'URIs de redirecionamento'
-        field_grant_types: 'Tipo permitido'
         no_client: 'Nenhum cliente até agora.'
     remove:
         warn_message_1: 'Você tem permissão pare remover este cliente. Esta ação é IRREVERSÍVEL !'
         warn_message_2: 'Se você remover isso, todo o aplicativo configurado com este cliente não poderá se autenticar no seu wallabag.'
         action: 'Remover este cliente'
-    client:
+    old_client:
         # page_title: 'API clients management > Novo cliente'
         page_description: 'Você está prestes a criar um novo cliente. Por favor preencha o campo abaixo para a URI de redirecionamento de sua aplicação.'
         form:
             name_label: 'Nome do cliente'
-            redirect_uris_label: 'URIs de redirecionamento'
             save_label: 'Criar um novo cliente'
         action_back: 'Voltar'
-    client_parameter:
-        # page_title: 'API clients management > Parâmetros de clientes'
-        page_description: 'Aqui estão os parâmetros de seus clientes.'
-        field_name: 'Nome do cliente'
-        field_id: 'ID do cliente'
-        field_secret: 'Chave do cliente'
-        back: 'Voltar'
-        read_howto: 'Leia o how-to "Criar minha primeira aplicação"'
-    howto:
-        # page_title: 'API clients management > Criar minha primeira aplicação'
-        description:
-            paragraph_1: 'Os seguintes comandos fazem uso da <a href="https://github.com/jkbrzt/httpie">biblioteca HTTPie</a>. Tenha certeza que ela está instalada em seu servidor antes de usá-la.'
-            paragraph_2: 'Você precisa de um token para a comunicação entre sua aplicação terceira e a API do wallabag.'
-            paragraph_3: 'Para criar este token, você precisa <a href="%link%">criar um novo cliente</a>.'
-            paragraph_4: 'Agora, crie seu token (altere client_id, client_secret, username e password com os valores corretos):'
-            paragraph_5: 'A API pode retornar uma resposta como essa:'
-            paragraph_6: 'O access_token é utilizável para fazer uma chamada para o endpoint da API. Por exemplo:'
-            paragraph_7: 'Esta chamada pode retornar todas as entradas de seu usuário.'
-            paragraph_8: 'Se você deseja ver todos os endpoints da API, dê uma olhada <a href="%link%">em nossa documentação da API</a>.'
-        back: 'Voltar'
+        parameters:
+            # page_title: 'API clients management > Parâmetros de clientes'
+            page_description: 'Aqui estão os parâmetros de seus clientes.'
+            field_name: 'Nome do cliente'
+            field_id: 'ID do cliente'
+            field_secret: 'Chave do cliente'
+            back: 'Voltar'
+    # app:
+    #    created_at: 'Created at: %date%'
+    documentation:
+        title: 'Documentação'
+        full_documentation: 'Ver a documentação completa da API'
+        list_methods: 'Lista de métodos da API'
 
 user:
     page_title: 'Gerenciamento de Usuários'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index 95df573d..3cea2900 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -443,55 +443,55 @@ import:
         # description: 'This importer will import all your Instapaper articles. On the backup (https://pinboard.in/settings/backup) page, click on "JSON" in the "Bookmarks" section. A JSON file will be downloaded (like "pinboard_export").'
         # how_to: 'Please select your Pinboard export and click on the below button to upload and import it.'
 
-developer:
-    # page_title: 'API clients management'
-    # welcome_message: 'Welcome to the wallabag API'
-    # documentation: 'Documentation'
-    # how_to_first_app: 'How to create my first application'
-    # full_documentation: 'View full API documentation'
-    # list_methods: 'List API methods'
-    # clients:
-    #     title: 'Clients'
-    #     create_new: 'Create a new client'
-    # existing_clients:
-    #     title: 'Existing clients'
-    #     field_id: 'Client ID'
-    #     field_secret: 'Client secret'
-    #     field_uris: 'Redirect URIs'
-    #     field_grant_types: 'Grant type allowed'
-    #     no_client: 'No client yet.'
-    # remove:
-    #     warn_message_1: 'You have the ability to remove this client. This action is IRREVERSIBLE !'
-    #     warn_message_2: "If you remove it, every app configured with that client won't be able to auth on your wallabag."
-    #     action: 'Remove this client'
-    # client:
-    #     page_title: 'API clients management > New client'
-    #     page_description: 'You are about to create a new client. Please fill the field below for the redirect URI of your application.'
-    #     form:
-    #         name_label: 'Name of the client'
-    #         redirect_uris_label: 'Redirect URIs'
-    #         save_label: 'Create a new client'
-    #     action_back: 'Back'
-    # client_parameter:
-    #     page_title: 'API clients management > Client parameters'
-    #     page_description: 'Here are your client parameters.'
-    #     field_name: 'Client name'
-    #     field_id: 'Client ID'
-    #     field_secret: 'Client secret'
-    #     back: 'Back'
-    #     read_howto: 'Read the howto "Create my first application"'
-    # howto:
-    #     page_title: 'API clients management > How to create my first application'
-    #     description:
-    #         paragraph_1: 'The following commands make use of the <a href="https://github.com/jkbrzt/httpie">HTTPie library</a>. Make sure it is installed on your system before using it.'
-    #         paragraph_2: 'You need a token to communicate between your 3rd application and wallabag API.'
-    #         paragraph_3: 'To create this token, you need <a href="%link%">to create a new client</a>.'
-    #         paragraph_4: 'Now, create your token (replace client_id, client_secret, username and password with the good values):'
-    #         paragraph_5: 'The API will return a response like this:'
-    #         paragraph_6: 'The access_token is useful to do a call to the API endpoint. For example:'
-    #         paragraph_7: 'This call will return all the entries for your user.'
-    #         paragraph_8: 'If you want to see all the API endpoints, you can have a look <a href="%link%">to our API documentation</a>.'
-    #     back: 'Back'
+apps:
+    # page_title: 'Apps'
+    # allow:
+    #    title: 'A new application would like to connect to your account'
+    #    permissions:
+    #        read:
+    #            label: 'Read your data'
+    #            desc: '%name% will be able to access the list and contents of your entries, tags and annotations.'
+    #        write:
+    #            label: 'Edit your data'
+    #            desc: '%name% will be able to edit and manage (including deleting) your entries, tags and annotations.'
+    #        user:
+    #            label: 'Edit your user settings'
+    #            desc: '%name% will be able to manage your user account.'
+    #featured:
+    #    title: 'Featured apps'
+    #list:
+    #    title: 'Authorized apps'
+    #old_clients:
+    #    create_new: 'Create a new client'
+    #    title: 'Old clients (depreciated)'
+    #    list: 'Old clients list'
+    #    field_id: 'Client ID'
+    #    field_secret: 'Client secret'
+    #    no_client: 'No client yet.'
+    #remove:
+    #    warn_message_1: 'You have the ability to remove the client %name%. This action is IRREVERSIBLE !'
+    #    warn_message_2: "If you remove it, every app configured with that client won't be able to auth on your wallabag."
+    #    action: 'Remove the client %name%'
+    #old_client:
+    #    page_title: 'Apps > New client'
+    #    page_description: 'You are about to create a new client. Please fill the field below for the redirect URI of your application.'
+    #    form:
+    #        name_label: 'Name of the client'
+    #        save_label: 'Create a new client'
+    #    action_back: 'Back'
+    #    parameters:
+    #        page_title: 'Apps > Client parameters'
+    #        page_description: 'Here are your client parameters.'
+    #        field_name: 'Client name'
+    #        field_id: 'Client ID'
+    #        field_secret: 'Client secret'
+    #        back: 'Back'
+    # app:
+    #    created_at: 'Created at: %date%'
+    # documentation:
+    #    title: 'Documentation'
+    #    full_documentation: 'Full documentation'
+    #    list_methods: 'List API methods'
 
 user:
     # page_title: Users management
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index 61e1a1ea..7c2edba0 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -441,55 +441,55 @@ import:
         # description: 'This importer will import all your Instapaper articles. On the backup (https://pinboard.in/settings/backup) page, click on "JSON" in the "Bookmarks" section. A JSON file will be downloaded (like "pinboard_export").'
         # how_to: 'Please select your Pinboard export and click on the below button to upload and import it.'
 
-developer:
-    # page_title: 'API clients management'
-    # welcome_message: 'Welcome to the wallabag API'
-    # documentation: 'Documentation'
-    # how_to_first_app: 'How to create my first application'
-    # full_documentation: 'View full API documentation'
-    # list_methods: 'List API methods'
-    # clients:
-    #     title: 'Clients'
-    #     create_new: 'Create a new client'
-    # existing_clients:
-    #     title: 'Existing clients'
-    #     field_id: 'Client ID'
-    #     field_secret: 'Client secret'
-    #     field_uris: 'Redirect URIs'
-    #     field_grant_types: 'Grant type allowed'
-    #     no_client: 'No client yet.'
-    # remove:
-    #     warn_message_1: 'You have the ability to remove this client. This action is IRREVERSIBLE !'
-    #     warn_message_2: "If you remove it, every app configured with that client won't be able to auth on your wallabag."
-    #     action: 'Remove this client'
-    # client:
-    #     page_title: 'API clients management > New client'
-    #     page_description: 'You are about to create a new client. Please fill the field below for the redirect URI of your application.'
-    #     form:
+apps:
+    # page_title: 'Apps'
+    # allow:
+    #    title: 'A new application would like to connect to your account'
+    #    permissions:
+    #        read:
+    #            label: 'Read your data'
+    #            desc: '%name% will be able to access the list and contents of your entries, tags and annotations.'
+    #        write:
+    #            label: 'Edit your data'
+    #            desc: '%name% will be able to edit and manage (including deleting) your entries, tags and annotations.'
+    #        user:
+    #            label: 'Edit your user settings'
+    #            desc: '%name% will be able to manage your user account.'
+    #featured:
+    #    title: 'Featured apps'
+    #list:
+    #    title: 'Authorized apps'
+    #old_clients:
+    #    create_new: 'Create a new client'
+    #    title: 'Old clients (depreciated)'
+    #    list: 'Old clients list'
+    #    field_id: 'Client ID'
+    #    field_secret: 'Client secret'
+    #    no_client: 'No client yet.'
+    #remove:
+    #    warn_message_1: 'You have the ability to remove the client %name%. This action is IRREVERSIBLE !'
+    #    warn_message_2: "If you remove it, every app configured with that client won't be able to auth on your wallabag."
+    #    action: 'Remove the client %name%'
+    #old_client:
+    #    page_title: 'Apps > New client'
+    #    page_description: 'You are about to create a new client. Please fill the field below for the redirect URI of your application.'
+    #    form:
     #        name_label: 'Name of the client'
-    #         redirect_uris_label: 'Redirect URIs'
-    #         save_label: 'Create a new client'
-    #     action_back: 'Back'
-    # client_parameter:
-    #     page_title: 'API clients management > Client parameters'
-    #     page_description: 'Here are your client parameters.'
-    #     field_name: 'Client name'
-    #     field_id: 'Client ID'
-    #     field_secret: 'Client secret'
-    #     back: 'Back'
-    #     read_howto: 'Read the howto "Create my first application"'
-    # howto:
-    #     page_title: 'API clients management > How to create my first application'
-    #     description:
-    #         paragraph_1: 'The following commands make use of the <a href="https://github.com/jkbrzt/httpie">HTTPie library</a>. Make sure it is installed on your system before using it.'
-    #         paragraph_2: 'You need a token to communicate between your 3rd application and wallabag API.'
-    #         paragraph_3: 'To create this token, you need <a href="%link%">to create a new client</a>.'
-    #         paragraph_4: 'Now, create your token (replace client_id, client_secret, username and password with the good values):'
-    #         paragraph_5: 'The API will return a response like this:'
-    #         paragraph_6: 'The access_token is useful to do a call to the API endpoint. For example:'
-    #         paragraph_7: 'This call will return all the entries for your user.'
-    #         paragraph_8: 'If you want to see all the API endpoints, you can have a look <a href="%link%">to our API documentation</a>.'
-    #     back: 'Back'
+    #        save_label: 'Create a new client'
+    #    action_back: 'Back'
+    #    parameters:
+    #        page_title: 'Apps > Client parameters'
+    #        page_description: 'Here are your client parameters.'
+    #        field_name: 'Client name'
+    #        field_id: 'Client ID'
+    #        field_secret: 'Client secret'
+    #        back: 'Back'
+    # app:
+    #    created_at: 'Created at: %date%'
+    # documentation:
+    #    title: 'Documentation'
+    #    full_documentation: 'Full documentation'
+    #    list_methods: 'List API methods'
 
 user:
     # page_title: Users management
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client.html.twig
index 8a5da71a..09e138ed 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client.html.twig
@@ -1,6 +1,6 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
 
-{% block title %}{{ 'developer.client.page_title'|trans }}{% endblock %}
+{% block title %}{{ 'apps.old_client.page_title'|trans }}{% endblock %}
 
 {% block content %}
 <div class="row">
@@ -8,7 +8,7 @@
         <div class="card-panel settings">
 
             <div class="row">
-                <p>{{ 'developer.client.page_description'|trans }}</p>
+                <p>{{ 'apps.old_client.page_description'|trans }}</p>
                 {{ form_start(form) }}
                 {{ form_errors(form) }}
 
@@ -18,13 +18,7 @@
                     {{ form_widget(form.name) }}
                 </div>
 
-                <div class="input-field col s12">
-                    {{ form_label(form.redirect_uris) }}
-                    {{ form_errors(form.redirect_uris) }}
-                    {{ form_widget(form.redirect_uris) }}
-                </div>
-
-                <a href="{{ path('developer') }}" class="waves-effect waves-light grey btn">{{ 'developer.client.action_back'|trans }}</a>
+                <a href="{{ path('apps') }}" class="waves-effect waves-light grey btn">{{ 'apps.old_client.action_back'|trans }}</a>
                 {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
 
                 {{ form_rest(form) }}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client_parameters.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client_parameters.html.twig
index b498cceb..30b90252 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client_parameters.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client_parameters.html.twig
@@ -1,21 +1,20 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
 
-{% block title %}{{ 'developer.client_parameter.page_title'|trans }}{% endblock %}
+{% block title %}{{ 'apps.old_client.parameters.page_title'|trans }}{% endblock %}
 
 {% block content %}
 <div class="row">
     <div class="col s12">
         <div class="card-panel settings">
             <div class="row">
-                <p>{{ 'developer.client_parameter.page_description'|trans }}</p>
+                <p>{{ 'apps.old_client.parameters.page_description'|trans }}</p>
                 <ul>
-                    <li>{{ 'developer.client_parameter.field_name'|trans }}: <strong><pre>{{ client_name }}</pre></strong></li>
-                    <li>{{ 'developer.client_parameter.field_id'|trans }}: <strong><pre>{{ client_id }}</pre></strong></li>
-                    <li>{{ 'developer.client_parameter.field_secret'|trans }}: <strong><pre>{{ client_secret }}</pre></strong></li>
+                    <li>{{ 'apps.old_client.parameters.field_name'|trans }}: <strong><pre>{{ client_name }}</pre></strong></li>
+                    <li>{{ 'apps.old_client.parameters.field_id'|trans }}: <strong><pre>{{ client_id }}</pre></strong></li>
+                    <li>{{ 'apps.old_client.parameters.field_secret'|trans }}: <strong><pre>{{ client_secret }}</pre></strong></li>
                 </ul>
 
-                <a href="{{ path('developer') }}" class="waves-effect waves-light grey btn">{{ 'developer.client_parameter.back'|trans }}</a>
-                <a href="{{ path('developer_howto_firstapp') }}" class="btn waves-effect waves-light">{{ 'developer.client_parameter.read_howto'|trans }}</a>
+                <a href="{{ path('apps') }}" class="waves-effect waves-light grey btn">{{ 'apps.old_client.parameters.back'|trans }}</a>
             </div>
         </div>
     </div>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/howto_app.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/howto_app.html.twig
deleted file mode 100644
index acbc2c88..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/howto_app.html.twig
+++ /dev/null
@@ -1,63 +0,0 @@
-{% extends "WallabagCoreBundle::layout.html.twig" %}
-
-{% block title %}{{ 'developer.howto.page_title'|trans }}{% endblock %}
-
-{% block css %}
-    {{ parent() }}
-    <link rel="stylesheet" href="{{ asset('https://cdnjs.cloudflare.com/ajax/libs/prism/1.4.1/themes/prism-dark.min.css') }}">
-{% endblock %}
-
-{% block content %}
-<div class="row">
-    <div class="col s12">
-        <div class="card-panel settings">
-
-            <div class="row">
-                <p>{{ 'developer.howto.description.paragraph_1'|trans|raw }}</p>
-                <p>{{ 'developer.howto.description.paragraph_2'|trans }}</p>
-                <p>{{ 'developer.howto.description.paragraph_3'|trans({'%link%': path('developer_create_client')})|raw }}</p>
-                <p>{{ 'developer.howto.description.paragraph_4'|trans }}</p>
-                <p>
-                    <pre><code class="language-bash">http POST http://v2.wallabag.org/oauth/v2/token \
-    grant_type=password \
-    client_id=12_5um6nz50ceg4088c0840wwc0kgg44g00kk84og044ggkscso0k \
-    client_secret=3qd12zpeaxes8cwg8c0404g888co4wo8kc4gcw0occww8cgw4k \
-    username=yourUsername \
-    password=yourPassw0rd</code></pre>
-                </p>
-                <p>{{ 'developer.howto.description.paragraph_5'|trans }}</p>
-                <p>
-                    <pre><code class="language-bash">HTTP/1.1 200 OK
-Cache-Control: no-store, private
-Connection: close
-Content-Type: application/json
-Date: Tue, 06 Oct 2015 18:24:03 GMT
-Host: localhost:8000
-Pragma: no-cache
-X-Debug-Token: be00a1
-X-Debug-Token-Link: /profiler/be00a1
-X-Powered-By: PHP/5.5.9-1ubuntu4.13
-{
-    "access_token": "ZWFjNjA3ZWMwYWVmYzRkYTBlMmQ3NTllYmVhOGJiZDE0ZTg1NjE4MjczOTVlNzM0ZTRlMWQ0MmRlMmYwNTk5Mw",
-    "expires_in": 3600,
-    "refresh_token": "ODBjODU1NWUwNmUzZTBkNDQ5YWVlZTVlMjQ2Y2I0OWM2NTM1ZGM2M2Y3MDhjMTViM2U2MzYxYzRkMDk5ODRlZg",
-    "scope": null,
-    "token_type": "bearer"
-}</code></pre>
-                </p>
-                <p>{{ 'developer.howto.description.paragraph_6'|trans }}</p>
-                <p>
-                    <pre><code class="language-bash">http GET http://v2.wallabag.org/api/entries.json \
-    "Authorization:Bearer ZWFjNjA3ZWMwYWVmYzRkYTBlMmQ3NTllYmVhOGJiZDE0ZTg1NjE4MjczOTVlNzM0ZTRlMWQ0MmRlMmYwNTk5Mw"</code></pre>
-                </p>
-                <p>{{ 'developer.howto.description.paragraph_7'|trans }}</p>
-                <p>{{ 'developer.howto.description.paragraph_8'|trans({'%link%': path('nelmio_api_doc_index')})|raw }}</p>
-                <p><a href="{{ path('developer') }}" class="waves-effect waves-light grey btn">{{ 'developer.howto.back'|trans }}</a></p>
-            </div>
-
-        </div>
-    </div>
-</div>
-<script src="{{ asset('https://cdnjs.cloudflare.com/ajax/libs/prism/1.4.1/prism.min.js') }}"></script>
-<script src="{{ asset('https://cdnjs.cloudflare.com/ajax/libs/prism/1.4.1/components/prism-bash.min.js') }}"></script>
-{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig
index 528b055c..a41e64f7 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig
@@ -1,67 +1,153 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
 
-{% block title %}{{ 'developer.page_title'|trans }}{% endblock %}
+{% block title %}{{ 'apps.page_title'|trans }}{% endblock %}
 
 {% block content %}
 <div class="row">
     <div class="col s12">
         <div class="card-panel settings">
-
             <div class="row">
-                <h3>{{ 'developer.welcome_message'|trans }}</h3>
+                <h4>{{ 'apps.featured.title'|trans }}</h4>
+
+                <div class="slider">
+                    <ul class="slides">
+                        <li>
+                            <img src="{{ asset('assets/appicons/android_full.png') }}">
+                            <div class="caption right-align">
+                                <h3>Android</h3>
+                                <h5 class="light grey-text text-lighten-3">For all Android 4.4+ devices</h5>
+                                <p>
+                                    <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche">
+                                        <img class="icon" alt="Get it on Google Play"
+                                             height="80"
+                                             src="{{ asset('assets/appicons/google_play.png') }}" />
+                                    </a>
+                                    <a href="https://f-droid.org/app/fr.gaulupeau.apps.InThePoche">
+                                        <img class="icon" alt="Get it on F-Droid"
+                                             height="80"
+                                             src="{{ asset('assets/appicons/fdroid.png') }}" />
+                                    </a>
+                                </p>
+                            </div>
+                        </li>
+                        <li>
+                            <img style="background-position: right" src="{{ asset('assets/appicons/iOS_full.png') }}">
+                            <div class="caption left-align">
+                                <h3>iOS</h3>
+                                <h5 class="light grey-text text-lighten-3">For your iPhones and iPads</h5>
+                                <p>
+                                    <a href="https://itunes.apple.com/app/wallabag-2/id1170800946?mt=8">
+                                        <img class="icon" alt="Get it on the AppStore"
+                                             height="80"
+                                             src="{{ asset('assets/appicons/appstore.svg') }}" />
+                                    </a>
+                                </p>
+                            </div>
+                        </li>
+                        <li>
+                            <img src="{{ asset('assets/appicons/windows.jpeg') }}">
+                            <div class="caption right-align">
+                                <h3>Windows</h3>
+                                <h5 class="light grey-text text-lighten-3">Available on Windows Phones and Windows 10</h5>
+                                <p>
+                                    <a href="https://www.microsoft.com/en-us/store/p/wallabag/9nblggh5x3p6">
+                                        <img class="icon" alt="Get it on the Windows Store"
+                                             height="80"
+                                             src="{{ asset('assets/appicons/windowsstore.png') }}" />
+                                    </a>
+                                </p>
+                            </div>
+                        </li>
+                        <li>
+                            <img style="background-position: right" src="{{ asset('assets/appicons/browser.png') }}">
+                            <div class="caption left-align">
+                                <h3>Browser Extension</h3>
+                                <h5 class="light grey-text text-lighten-3">Available on Firefox, Chrome and Opera</h5>
+                                <p>
+                                    <a href="https://addons.mozilla.org/en/firefox/addon/wallabagger/">
+                                        <img class="icon browser" alt="Get it on the Firefox Addons Website"
+                                             height="80"
+                                             src="{{ asset('assets/appicons/Firefox-logo.svg') }}" />
+                                    </a>
+                                    <a href="https://chrome.google.com/webstore/detail/wallabagger/gbmgphmejlcoihgedabhgjdkcahacjlj">
+                                        <img class="icon browser" alt="Get it on the Firefox Addons Website"
+                                             height="80"
+                                             src="{{ asset('assets/appicons/Logo_Google_Chrome.svg') }}" />
+                                    </a>
+                                    <a href="https://addons.opera.com/fr/extensions/details/wallabagger/">
+                                        <img class="icon browser" alt="Get it on the Firefox Addons Website"
+                                             height="80"
+                                             src="{{ asset('assets/appicons/opera-for-computers_icon_128x128.png') }}" />
+                                    </a>
+                                </p>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
 
-                <h4>{{ 'developer.documentation'|trans }}</h4>
+                <h4>{{ 'apps.list.title'|trans }}</h4>
 
-                <ul>
-                    <li><a href="{{ path('developer_howto_firstapp') }}">{{ 'developer.how_to_first_app'|trans }}</a></li>
-                    <li><a href="https://doc.wallabag.org/en/developer/api/readme.html">{{ 'developer.full_documentation'|trans }}</a></li>
-                    <li><a href="{{ path('nelmio_api_doc_index') }}">{{ 'developer.list_methods'|trans }}</a></li>
+                <ul class="collection">
+                    {% for app in apps %}
+                        <li class="collection-item avatar">
+                            {% if app.client.image %}
+                                <img src="{{ app.client.image }}" alt="" class="circle">
+                            {% endif %}
+                            <span class="title"><a href="{{ app.client.appUrl }}">{{ app.client.name }}</a></span>
+                            <p>{{ app.client.description }}</p>
+                            <div class="scopes">
+                                {% for scope in app.scope | split(' ') %}
+                                    <div class="chip">{{ scope }}</div>
+                                {% endfor %}
+                            </div>
+                            <p>{{ 'apps.app.created_at' | trans({'%date%': app.client.createdAt}) }}</p>
+                            <a href="#!" class="secondary-content"><i class="material-icons">grade</i></a>
+                        </li>
+                    {% endfor %}
                 </ul>
 
-                <h4>{{ 'developer.clients.title'|trans }}</h4>
+                <h4>{{ 'apps.old_clients.title'|trans }}</h4>
                 <ul>
-                    <li><a href="{{ path('developer_create_client') }}">{{ 'developer.clients.create_new'|trans }}</a></li>
+                    <li><a href="{{ path('apps_create_client') }}">{{ 'apps.old_clients.create_new'|trans }}</a></li>
                 </ul>
 
-                <h4>{{ 'developer.existing_clients.title'|trans }}</h4>
+                <h5>{{ 'apps.old_clients.list'|trans }}</h5>
                 {% if clients %}
                     <ul class="collapsible" data-collapsible="expandable">
                         {% for client in clients %}
                             <li>
-                                <div class="collapsible-header">{{ client.name }} - #{{ client.id }}</div>
+                                <div class="collapsible-header">{{ client.name }}</div>
                                 <div class="collapsible-body">
                                     <table class="striped">
                                         <tr>
-                                            <td>{{ 'developer.existing_clients.field_id'|trans }}</td>
-                                            <td><strong><code>{{ client.clientId }}</code></strong></td>
+                                            <td>{{ 'apps.old_clients.field_id'|trans }}</td>
+                                            <td><strong><code>{{ client.id }}_{{ client.randomId }}</code></strong></td>
                                         </tr>
                                         <tr>
-                                            <td>{{ 'developer.existing_clients.field_secret'|trans }}</td>
+                                            <td>{{ 'apps.old_clients.field_secret'|trans }}</td>
                                             <td><strong><code>{{ client.secret }}</code></strong></td>
                                         </tr>
-                                        <tr>
-                                            <td>{{ 'developer.existing_clients.field_uris'|trans }}</td>
-                                            <td><strong><code>{{ client.redirectUris|json_encode() }}</code></strong></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{{ 'developer.existing_clients.field_grant_types'|trans }}</td>
-                                            <td><strong><code>{{ client.allowedGrantTypes|json_encode() }}</code></strong></td>
-                                        </tr>
                                     </table>
                                     <p>
-                                        {{ 'developer.remove.warn_message_1'|trans({'%name%': client.name }) }}<br/>
-                                        {{ 'developer.remove.warn_message_2'|trans({'%name%': client.name }) }}<br/>
-                                        <a class="waves-effect waves-light red btn" href="{{ path('developer_delete_client', {'id': client.id}) }}">{{ 'developer.remove.action'|trans({'%name%': client.name }) }}</a>
+                                        {{ 'apps.remove.warn_message_1'|trans({'%name%': client.name }) }}<br/>
+                                        {{ 'apps.remove.warn_message_2'|trans({'%name%': client.name }) }}<br/>
+                                        <a class="waves-effect waves-light red btn" href="{{ path('apps_delete_client', {'id': client.id}) }}">{{ 'apps.remove.action'|trans({'%name%': client.name }) }}</a>
                                     </p>
+
                                 </div>
                             </li>
                         {% endfor %}
                     </ul>
                 {% else %}
-                    {{ 'developer.existing_clients.no_client'|trans }}
+                    {{ 'apps.old_clients.no_client'|trans }}
                 {% endif %}
-            </div>
+                <h4>{{ 'apps.documentation.title'|trans }}</h4>
 
+                <ul>
+                    <li><a href="http://doc.wallabag.org/en/master/developer/api.html">{{ 'apps.documentation.full_documentation'|trans }}</a></li>
+                    <li><a href="{{ path('nelmio_api_doc_index') }}">{{ 'apps.documentation.list_methods'|trans }}</a></li>
+                </ul>
+            </div>
         </div>
     </div>
 </div>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
index 2dab1c18..6bee628d 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@ -78,8 +78,8 @@
             <li class="bold {% if currentRoute == 'import' %}active{% endif %}">
                 <a class="waves-effect" href="{{ path('import') }}">{{ 'menu.left.import'|trans }}</a>
             </li>
-            <li class="bold {% if currentRoute == 'developer' %}active{% endif %}">
-                <a class="waves-effect" href="{{ path('developer') }}">{{ 'menu.left.developer'|trans }}</a>
+            <li class="bold {% if currentRoute == 'apps' %}active{% endif %}">
+                <a class="waves-effect" href="{{ path('apps') }}">{{ 'menu.left.apps'|trans }}</a>
             </li>
             <li class="bold {% if currentRoute == 'howto' %}active{% endif %}">
                 <a class="waves-effect" href="{{ path('howto') }}">{{ 'menu.left.howto'|trans }}</a>