diff --git a/.travis.yml b/.travis.yml
index 8aed183..fbb8bbb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,9 +16,9 @@ matrix:
   include:
   - ghc: 8.2.2
   - ghc: 8.4.4
-  - ghc: 8.6.3
+  - ghc: 8.6.5
 
-  - ghc: 8.6.3
+  - ghc: 8.6.5
     env: STACK_YAML="$TRAVIS_BUILD_DIR/stack.yaml"
 
 install:
@@ -33,6 +33,8 @@ install:
     fi
 
 script:
+  # HLint check
+  - curl -sSL https://raw.github.com/ndmitchell/neil/master/misc/travis.sh | sh -s -- hlint .
   - |
     if [ -z "$STACK_YAML" ]; then
        cabal new-test
@@ -40,8 +42,5 @@ script:
       stack build --system-ghc --test --bench --no-run-benchmarks --no-terminal --ghc-options=-Werror
     fi
 
-  # HLint check
-  - curl -sSL https://raw.github.com/ndmitchell/neil/master/misc/travis.sh | sh -s -- hlint .
-
 notifications:
   email: false
diff --git a/README.md b/README.md
index 336bf4a..ddcfc89 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # shellmet
 
-[![Build status](https://secure.travis-ci.org/kowainik/shellmet.svg)](https://travis-ci.org/kowainik/shellmet)
-[![Hackage](https://img.shields.io/hackage/v/shellmet.svg)](https://hackage.haskell.org/package/shellmet)
+[![Build status](https://img.shields.io/travis/kowainik/shellmet.svg?logo=travis)](https://travis-ci.org/kowainik/shellmet)
+[![Hackage](https://img.shields.io/hackage/v/shellmet.svg?logo=haskell)](https://hackage.haskell.org/package/shellmet)
 [![MPL-2.0 license](https://img.shields.io/badge/license-MPL--2.0-blue.svg)](LICENSE)
 [![Stackage Lts](http://stackage.org/package/shellmet/badge/lts)](http://stackage.org/lts/package/shellmet)
 [![Stackage Nightly](http://stackage.org/package/shellmet/badge/nightly)](http://stackage.org/nightly/package/shellmet)
diff --git a/shellmet.cabal b/shellmet.cabal
index 3c13d9d..f185cdc 100644
--- a/shellmet.cabal
+++ b/shellmet.cabal
@@ -1,4 +1,4 @@
-cabal-version:       2.0
+cabal-version:       2.4
 name:                shellmet
 version:             0.0.1
 synopsis:            Out of the shell solution for scripting in Haskell
@@ -7,8 +7,8 @@ homepage:            https://github.com/kowainik/shellmet
 bug-reports:         https://github.com/kowainik/shellmet/issues
 license:             MPL-2.0
 license-file:        LICENSE
-author:              Kowainik
-maintainer:          xrom.xkov@gmail.com
+author:              Dmitrii Kovanikov
+maintainer:          Kowainik <xrom.xkov@gmail.com>
 copyright:           2019 Kowainik
 category:            Shell, Command Line
 build-type:          Simple
@@ -16,19 +16,14 @@ extra-doc-files:     README.md
                    , CHANGELOG.md
 tested-with:         GHC == 8.2.2
                      GHC == 8.4.4
-                     GHC == 8.6.3
+                     GHC == 8.6.5
 
 source-repository head
   type:                git
   location:            https://github.com/kowainik/shellmet.git
 
-library
-  hs-source-dirs:      src
-  exposed-modules:     Shellmet
-
+common common-options
   build-depends:       base >= 4.10.1.0 && < 4.13
-                     , process ^>= 1.6.3
-                     , text ^>= 1.2.3
 
   ghc-options:         -Wall
                        -Wincomplete-uni-patterns
@@ -53,6 +48,14 @@ library
                        TypeApplications
                        ViewPatterns
 
+library
+  import:              common-options
+  hs-source-dirs:      src
+  exposed-modules:     Shellmet
+
+  build-depends:       process ^>= 1.6.3
+                     , text ^>= 1.2.3
+
 executable readme
   main-is:             README.lhs
   build-depends:       base
@@ -64,36 +67,11 @@ executable readme
   default-language:    Haskell2010
 
 test-suite shellmet-test
+  import:              common-options
   type:                exitcode-stdio-1.0
   hs-source-dirs:      test
   main-is:             Spec.hs
 
-  build-depends:       base >= 4.10.1.0 && < 4.13
-                     , shellmet
+  build-depends:       shellmet
 
-
-  ghc-options:         -Wall
-                       -threaded
-                       -rtsopts
-                       -with-rtsopts=-N
-                       -Wincomplete-uni-patterns
-                       -Wincomplete-record-updates
-                       -Wcompat
-                       -Widentities
-                       -Wredundant-constraints
-                       -fhide-source-paths
-
-  default-language:    Haskell2010
-  default-extensions:  ConstraintKinds
-                       DeriveGeneric
-                       GeneralizedNewtypeDeriving
-                       InstanceSigs
-                       KindSignatures
-                       LambdaCase
-                       OverloadedStrings
-                       RecordWildCards
-                       ScopedTypeVariables
-                       StandaloneDeriving
-                       TupleSections
-                       TypeApplications
-                       ViewPatterns
+  ghc-options:         -threaded -rtsopts -with-rtsopts=-N
diff --git a/stack.yaml b/stack.yaml
index 7e96cdc..9993ab8 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,4 +1 @@
-resolver: lts-13.0
-
-ghc-options:
-  "$locals": -fhide-source-paths
+resolver: lts-13.21