diff --git a/.all-contributorsrc b/.all-contributorsrc
index 4fb03ef20..31eb7ea9a 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -684,6 +684,15 @@
       "contributions": [
         "code"
       ]
-    }
+    },
+    {
+      "login": "apoeco",
+      "name": "Apostolis Economou",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/7470681?v=4",
+      "profile": "https://github.com/apoeco",
+      "contributions": [
+        "code"
+      ]
+    },
   ]
 }
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index c53c36447..9b0300f12 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -3,7 +3,7 @@
 Thank you to all the people who have already contributed to GitPoint!
 
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
-| [<img src="https://avatars0.githubusercontent.com/u/12476932?v=3" width="100px;"/><br /><sub><b>Houssein Djirdeh</b></sub>](https://houssein.me)<br />[💬](#question-housseindjirdeh "Answering Questions") [💻](https://github.com/gitpoint/git-point/commits?author=housseindjirdeh "Code") [🎨](#design-housseindjirdeh "Design") [📖](https://github.com/gitpoint/git-point/commits?author=housseindjirdeh "Documentation") [👀](#review-housseindjirdeh "Reviewed Pull Requests") | [<img src="https://avatars0.githubusercontent.com/u/6994514?s=460&v=4" width="100px;"/><br /><sub><b>George Jose</b></sub>](https://github.com/g2jose)<br />[💻](https://github.com/gitpoint/git-point/commits?author=g2jose "Code") | [<img src="https://avatars3.githubusercontent.com/u/14151327?v=3" width="100px;"/><br /><sub><b>rmevans9</b></sub>](https://github.com/rmevans9)<br />[💻](https://github.com/gitpoint/git-point/commits?author=rmevans9 "Code") | [<img src="https://avatars1.githubusercontent.com/u/4408379?v=3" width="100px;"/><br /><sub><b>Alexey Pyltsyn</b></sub>](http://lex111.ru)<br />[💻](https://github.com/gitpoint/git-point/commits?author=lex111 "Code") [🐛](https://github.com/gitpoint/git-point/issues?q=author%3Alex111 "Bug reports") [🌍](#translation-lex111 "Translation") | [<img src="https://avatars2.githubusercontent.com/u/10660468?v=3" width="100px;"/><br /><sub><b>Jason Etcovitch</b></sub>](https://jasonet.co)<br />[💻](https://github.com/gitpoint/git-point/commits?author=JasonEtco "Code") | [<img src="https://avatars1.githubusercontent.com/u/1166143?v=3" width="100px;"/><br /><sub><b>Hosmel Quintana</b></sub>](http://hosmelq.com)<br />[💻](https://github.com/gitpoint/git-point/commits?author=hosmelq "Code") |
+| [<img src="https://avatars0.githubusercontent.com/u/12476932?v=3" width="100px;"/><br /><sub>Houssein Djirdeh</sub>](https://houssein.me)<br />[💬](#question-housseindjirdeh "Answering Questions") [💻](https://github.com/gitpoint/git-point/commits?author=housseindjirdeh "Code") [🎨](#design-housseindjirdeh "Design") [📖](https://github.com/gitpoint/git-point/commits?author=housseindjirdeh "Documentation") [👀](#review-housseindjirdeh "Reviewed Pull Requests") | [<img src="https://avatars0.githubusercontent.com/u/6994514?s=460&v=4" width="100px;"/><br /><sub>George Jose</sub>](https://github.com/g2jose)<br />[💻](https://github.com/gitpoint/git-point/commits?author=g2jose "Code") | [<img src="https://avatars3.githubusercontent.com/u/14151327?v=3" width="100px;"/><br /><sub>rmevans9</sub>](https://github.com/rmevans9)<br />[💻](https://github.com/gitpoint/git-point/commits?author=rmevans9 "Code") | [<img src="https://avatars1.githubusercontent.com/u/4408379?v=3" width="100px;"/><br /><sub>Alexey Pyltsyn</sub>](http://lex111.ru)<br />[💻](https://github.com/gitpoint/git-point/commits?author=lex111 "Code") [🐛](https://github.com/gitpoint/git-point/issues?q=author%3Alex111 "Bug reports") [🌍](#translation-lex111 "Translation") | [<img src="https://avatars2.githubusercontent.com/u/10660468?v=3" width="100px;"/><br /><sub>Jason Etcovitch</sub>](https://jasonet.co)<br />[💻](https://github.com/gitpoint/git-point/commits?author=JasonEtco "Code") | [<img src="https://avatars1.githubusercontent.com/u/1166143?v=3" width="100px;"/><br /><sub>Hosmel Quintana</sub>](http://hosmelq.com)<br />[💻](https://github.com/gitpoint/git-point/commits?author=hosmelq "Code") |
 | :---: | :---: | :---: | :---: | :---: | :---: |
 | [<img src="https://avatars0.githubusercontent.com/u/464978?v=3" width="100px;"/><br /><sub><b>Alejandro Ñáñez Ortiz</b></sub>](http://co.linkedin.com/in/alejandronanez/)<br />[💻](https://github.com/gitpoint/git-point/commits?author=alejandronanez "Code") [👀](#review-alejandronanez "Reviewed Pull Requests") | [<img src="https://avatars3.githubusercontent.com/u/3055294?v=3" width="100px;"/><br /><sub><b>Patrick Wang</b></sub>](https://patw.me)<br />[💻](https://github.com/gitpoint/git-point/commits?author=patw0929 "Code") [🐛](https://github.com/gitpoint/git-point/issues?q=author%3Apatw0929 "Bug reports") [🌍](#translation-patw0929 "Translation") | [<img src="https://avatars5.githubusercontent.com/u/627794?v=4" width="100px;"/><br /><sub><b>Mike Kavouras</b></sub>](https://github.com/mikekavouras)<br />[💻](https://github.com/gitpoint/git-point/commits?author=mikekavouras "Code") [🐛](https://github.com/gitpoint/git-point/issues?q=author%3Amikekavouras "Bug reports") | [<img src="https://avatars4.githubusercontent.com/u/4848554?v=4" width="100px;"/><br /><sub><b>Peter Lazar</b></sub>](https://github.com/peterlazar1993)<br />[💻](https://github.com/gitpoint/git-point/commits?author=peterlazar1993 "Code") | [<img src="https://avatars6.githubusercontent.com/u/5106887?v=4" width="100px;"/><br /><sub><b>June Domingo</b></sub>](https://github.com/junedomingo)<br />[💻](https://github.com/gitpoint/git-point/commits?author=junedomingo "Code") [🐛](https://github.com/gitpoint/git-point/issues?q=author%3Ajunedomingo "Bug reports") | [<img src="https://avatars7.githubusercontent.com/u/9287184?v=4" width="100px;"/><br /><sub><b>Antoine Boisadam</b></sub>](https://github.com/Antoine38660)<br />[💻](https://github.com/gitpoint/git-point/commits?author=Antoine38660 "Code") [🐛](https://github.com/gitpoint/git-point/issues?q=author%3AAntoine38660 "Bug reports") |
 | [<img src="https://avatars6.githubusercontent.com/u/13142418?v=4" width="100px;"/><br /><sub><b>Wang Shidong</b></sub>](https://wsdjeg.github.io)<br />[📖](https://github.com/gitpoint/git-point/commits?author=wsdjeg "Documentation") | [<img src="https://avatars4.githubusercontent.com/u/2190589?v=4" width="100px;"/><br /><sub><b>Swapnil Joshi</b></sub>](http://swapnilmj.users.sourceforge.net/)<br />[📖](https://github.com/gitpoint/git-point/commits?author=swapnilmj "Documentation") | [<img src="https://avatars5.githubusercontent.com/u/408959?v=4" width="100px;"/><br /><sub><b>Rolf Koenders</b></sub>](https://github.com/RolfKoenders)<br />[💻](https://github.com/gitpoint/git-point/commits?author=RolfKoenders "Code") [🐛](https://github.com/gitpoint/git-point/issues?q=author%3ARolfKoenders "Bug reports") [🌍](#translation-RolfKoenders "Translation") | [<img src="https://avatars1.githubusercontent.com/u/10191084?v=4" width="100px;"/><br /><sub><b>Andrew Dassonville</b></sub>](https://andrewda.me)<br />[💻](https://github.com/gitpoint/git-point/commits?author=andrewda "Code") [💬](#question-andrewda "Answering Questions") [🐛](https://github.com/gitpoint/git-point/issues?q=author%3Aandrewda "Bug reports") [👀](#review-andrewda "Reviewed Pull Requests") [⚠️](https://github.com/gitpoint/git-point/commits?author=andrewda "Tests") | [<img src="https://avatars0.githubusercontent.com/u/2076088?v=4" width="100px;"/><br /><sub><b>Anton</b></sub>](https://medium.com/@antondomashnev)<br />[💻](https://github.com/gitpoint/git-point/commits?author=Antondomashnev "Code") | [<img src="https://avatars0.githubusercontent.com/u/14795799?v=4" width="100px;"/><br /><sub><b>Xuezheng Ma</b></sub>](https://github.com/xuezhma)<br />[💻](https://github.com/gitpoint/git-point/commits?author=xuezhma "Code") |
@@ -15,5 +15,5 @@ Thank you to all the people who have already contributed to GitPoint!
 | [<img src="https://avatars3.githubusercontent.com/u/14539?v=4" width="100px;"/><br /><sub><b>Peter Blazejewicz</b></sub>](http://www.linkedin.com/in/peterblazejewicz)<br />[🌍](#translation-peterblazejewicz "Translation") | [<img src="https://avatars0.githubusercontent.com/u/6516758?v=4" width="100px;"/><br /><sub><b>Eric Adamski</b></sub>](https://github.com/ericadamski)<br />[🐛](https://github.com/gitpoint/git-point/issues?q=author%3Aericadamski "Bug reports") | [<img src="https://avatars2.githubusercontent.com/u/1559013?v=4" width="100px;"/><br /><sub><b>Jouderian Nobre Junior</b></sub>](https://github.com/jouderianjr)<br />[💻](https://github.com/gitpoint/git-point/commits?author=jouderianjr "Code") | [<img src="https://avatars2.githubusercontent.com/u/5158502?v=4" width="100px;"/><br /><sub><b>Phi Dong</b></sub>](http://www.phidong.com)<br />[💻](https://github.com/gitpoint/git-point/commits?author=pdong "Code") | [<img src="https://avatars2.githubusercontent.com/u/17956698?v=4" width="100px;"/><br /><sub><b>John Patrick Salcedo</b></sub>](https://github.com/jpls93)<br />[💻](https://github.com/gitpoint/git-point/commits?author=jpls93 "Code") | [<img src="https://avatars2.githubusercontent.com/u/11599942?v=4" width="100px;"/><br /><sub><b>Óscar Carretero</b></sub>](https://github.com/ocarreterom)<br />[💻](https://github.com/gitpoint/git-point/commits?author=ocarreterom "Code") |
 | [<img src="https://avatars3.githubusercontent.com/u/5528931?v=4" width="100px;"/><br /><sub><b>Dyesse YUMBA</b></sub>](https://github.com/dyesseyumba)<br />[🔧](#tool-dyesseyumba "Tools") | [<img src="https://avatars0.githubusercontent.com/u/20456165?v=4" width="100px;"/><br /><sub><b>Bink</b></sub>](https://binkpitch.me/)<br />[💻](https://github.com/gitpoint/git-point/commits?author=binkpitch "Code") | [<img src="https://avatars2.githubusercontent.com/u/10085841?v=4" width="100px;"/><br /><sub><b>khvilaboa</b></sub>](https://github.com/khvilaboa)<br />[🌍](#translation-khvilaboa "Translation") | [<img src="https://avatars1.githubusercontent.com/u/40802?v=4" width="100px;"/><br /><sub><b>James Glover</b></sub>](http://jamesmglover.com)<br />[💻](https://github.com/gitpoint/git-point/commits?author=jglover "Code") [⚠️](https://github.com/gitpoint/git-point/commits?author=jglover "Tests") | [<img src="https://avatars2.githubusercontent.com/u/3025600?v=4" width="100px;"/><br /><sub><b>Jose Luis Naranjo</b></sub>](https://co.linkedin.com/in/josenaranjo/en)<br />[💻](https://github.com/gitpoint/git-point/commits?author=josenaranjo "Code") | [<img src="https://avatars0.githubusercontent.com/u/1285032?v=4" width="100px;"/><br /><sub><b>Tobias Lohse</b></sub>](http://MrLoh.se)<br />[💻](https://github.com/gitpoint/git-point/commits?author=MrLoh "Code") |
 | [<img src="https://avatars3.githubusercontent.com/u/5467717?v=4" width="100px;"/><br /><sub><b>Serhii Baraniuk</b></sub>](https://www.facebook.com/serhii.baraniuk)<br />[⚠️](https://github.com/gitpoint/git-point/commits?author=kenitive "Tests") | [<img src="https://avatars2.githubusercontent.com/u/57701?v=4" width="100px;"/><br /><sub><b>Ben Snider</b></sub>](http://www.bensnider.com/)<br />[⚠️](https://github.com/gitpoint/git-point/commits?author=stupergenius "Tests") | [<img src="https://avatars1.githubusercontent.com/u/23706543?v=4" width="100px;"/><br /><sub><b>Simon Hoyos</b></sub>](https://www.linkedin.com/in/simonhoyos/)<br />[💻](https://github.com/gitpoint/git-point/commits?author=shmesa22 "Code") [🎨](#design-shmesa22 "Design") | [<img src="https://avatars3.githubusercontent.com/u/10438692?v=4" width="100px;"/><br /><sub><b>Damien Leroy</b></sub>](https://github.com/ShiiFu)<br />[🌍](#translation-ShiiFu "Translation") | [<img src="https://avatars1.githubusercontent.com/u/686676?v=4" width="100px;"/><br /><sub><b>botbotbot</b></sub>](http://dev.im-bot.com)<br />[⚠️](https://github.com/gitpoint/git-point/commits?author=ibotdotout "Tests") | [<img src="https://avatars1.githubusercontent.com/u/8254906?v=4" width="100px;"/><br /><sub><b>Dmytro Kytsmen</b></sub>](https://github.com/Kietzmann)<br />[🌍](#translation-Kietzmann "Translation") |
-| [<img src="https://avatars0.githubusercontent.com/u/3683673?v=4" width="100px;"/><br /><sub><b>TheCodeTalker</b></sub>](https://thecodetalker.github.io/)<br />[💻](https://github.com/gitpoint/git-point/commits?author=TheCodeTalker "Code") | [<img src="https://avatars0.githubusercontent.com/u/2670744?v=4" width="100px;"/><br /><sub><b>Leonardo</b></sub>](https://github.com/LeoCp)<br />[💻](https://github.com/gitpoint/git-point/commits?author=LeoCp "Code") | [<img src="https://avatars2.githubusercontent.com/u/13105865?v=4" width="100px;"/><br /><sub><b>Stephen</b></sub>](https://github.com/coderste)<br />[📖](https://github.com/gitpoint/git-point/commits?author=coderste "Documentation") | [<img src="https://avatars0.githubusercontent.com/u/5565340?v=4" width="100px;"/><br /><sub><b>Zahra Traboulsi</b></sub>](http://www.zahra.tech)<br />[💻](https://github.com/gitpoint/git-point/commits?author=ZahraTee "Code") [⚠️](https://github.com/gitpoint/git-point/commits?author=ZahraTee "Tests") | [<img src="https://avatars3.githubusercontent.com/u/13391685?v=4" width="100px;"/><br /><sub><b>Joseba Carral</b></sub>](http://codevs.es)<br />[🌍](#translation-jcarral "Translation") | [<img src="https://avatars2.githubusercontent.com/u/5800039?v=4" width="100px;"/><br /><sub><b>CTownsdin</b></sub>](https://github.com/CTownsdin)<br />[💻](https://github.com/gitpoint/git-point/commits?author=CTownsdin "Code") |
+| [<img src="https://avatars0.githubusercontent.com/u/3683673?v=4" width="100px;"/><br /><sub><b>TheCodeTalker</b></sub>](https://thecodetalker.github.io/)<br />[💻](https://github.com/gitpoint/git-point/commits?author=TheCodeTalker "Code") | [<img src="https://avatars0.githubusercontent.com/u/2670744?v=4" width="100px;"/><br /><sub><b>Leonardo</b></sub>](https://github.com/LeoCp)<br />[💻](https://github.com/gitpoint/git-point/commits?author=LeoCp "Code") | [<img src="https://avatars2.githubusercontent.com/u/13105865?v=4" width="100px;"/><br /><sub><b>Stephen</b></sub>](https://github.com/coderste)<br />[📖](https://github.com/gitpoint/git-point/commits?author=coderste "Documentation") | [<img src="https://avatars0.githubusercontent.com/u/5565340?v=4" width="100px;"/><br /><sub><b>Zahra Traboulsi</b></sub>](http://www.zahra.tech)<br />[💻](https://github.com/gitpoint/git-point/commits?author=ZahraTee "Code") [⚠️](https://github.com/gitpoint/git-point/commits?author=ZahraTee "Tests") | [<img src="https://avatars3.githubusercontent.com/u/13391685?v=4" width="100px;"/><br /><sub><b>Joseba Carral</b></sub>](http://codevs.es)<br />[🌍](#translation-jcarral "Translation") | [<img src="https://avatars2.githubusercontent.com/u/5800039?v=4" width="100px;"/><br /><sub><b>CTownsdin</b></sub>](https://github.com/CTownsdin)<br />[💻](https://github.com/gitpoint/git-point/commits?author=CTownsdin "Code") | [<img src="https://avatars0.githubusercontent.com/u/7470681?v=4" width="100px;"/><br /><sub>Apostolis Economou</sub>](https://github.com/apoeco)<br />[💻](https://github.com/gitpoint/git-point/commits?author=apoeco "Code") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->
diff --git a/README.md b/README.md
index 21ac03967..5dc2a7c70 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@
 
 [![Build Status](https://img.shields.io/travis/gitpoint/git-point.svg?style=flat-square)](https://travis-ci.org/gitpoint/git-point)
 [![Coveralls](https://img.shields.io/coveralls/github/gitpoint/git-point.svg?style=flat-square)](https://coveralls.io/github/gitpoint/git-point)
-[![All Contributors](https://img.shields.io/badge/all_contributors-72-orange.svg?style=flat-square)](#contributors)
+[![All Contributors](https://img.shields.io/badge/all_contributors-73-orange.svg?style=flat-square)](#contributors)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com)
 [![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg?style=flat-square)](http://commitizen.github.io/cz-cli/)
 [![Gitter chat](https://img.shields.io/badge/chat-on_gitter-008080.svg?style=flat-square)](https://gitter.im/git-point)
diff --git a/src/components/repository-list-item.component.js b/src/components/repository-list-item.component.js
index f32ba27dd..f7fba86d7 100644
--- a/src/components/repository-list-item.component.js
+++ b/src/components/repository-list-item.component.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { StyleSheet, Text, View } from 'react-native';
+import styled from 'styled-components/native';
 import { ListItem, Icon } from 'react-native-elements';
 
 import { emojifyText, abbreviateNumber } from 'utils';
@@ -11,129 +11,134 @@ type Props = {
   navigation: Object,
 };
 
-const styles = StyleSheet.create({
-  wrapper: {
-    marginTop: 5,
-    marginBottom: 5,
-    marginLeft: 5,
-  },
-  titleWrapper: {
-    flexDirection: 'row',
-    alignItems: 'center',
-  },
-  title: {
-    color: colors.primaryDark,
-    ...fonts.fontPrimarySemiBold,
-  },
-  privateIconContainer: {
-    marginLeft: 6,
-  },
-  description: {
-    color: colors.primaryDark,
-    ...fonts.fontPrimaryLight,
-  },
-  extraInfo: {
-    flexDirection: 'row',
-    flex: 1,
-    paddingTop: 5,
-  },
-  extraInfoSubject: {
-    color: colors.greyDark,
-    paddingLeft: 3,
-    paddingTop: 2,
-    marginRight: 15,
-    fontSize: normalize(10),
-    ...fonts.fontPrimary,
-  },
-  repositoryContainer: {
-    justifyContent: 'center',
-    flex: 1,
-  },
-  container: {
-    borderBottomColor: colors.greyLight,
-    borderBottomWidth: 1,
-  },
-});
+const ListItemWrapper = styled.View`
+  margin-top: 5;
+  margin-bottom: 5;
+  margin-left: 5;
+`;
+
+const RepoContainer = styled.View`
+  justify-content: center;
+  flex: 1;
+`;
+
+const TitleWrapper = styled.View`
+  flex-direction: row;
+  align-items: center;
+`;
+
+const ColoredText = styled.Text`
+  color: ${colors.primaryDark};
+`;
+
+const TitleText = ColoredText.extend`
+  ${fonts.fontPrimarySemiBold};
+`;
+
+const PrivateIconContainer = styled.View`
+  margin-left: 6;
+`;
+
+const DescriptionText = ColoredText.extend`
+  ${fonts.fontPrimaryLight};
+`;
+
+const ExtraInfoWrapper = styled.View`
+  flex-direction: row;
+  flex: 1;
+  padding-top: 5;
+`;
+
+const ExtraInfoText = styled.Text`
+  color: ${colors.greyDark};
+  padding-left: 3;
+  padding-top: 2;
+  margin-right: 15;
+  ${fonts.fontPrimary};
+  font-size: ${normalize(10)};
+`;
+
+const ExtraInfoForksText = ExtraInfoText.extend`
+  padding-left: 0;
+  margin-right: 13;
+`;
 
 const renderTitle = (repository, showFullName) => (
-  <View style={styles.wrapper}>
-    <View style={styles.repositoryContainer}>
-      <View style={styles.titleWrapper}>
-        <Text style={styles.title}>
+  <ListItemWrapper>
+    <RepoContainer>
+      <TitleWrapper>
+        <TitleText>
           {showFullName ? repository.full_name : repository.name}
-        </Text>
+        </TitleText>
         {repository.private && (
-          <View style={styles.privateIconContainer}>
+          <PrivateIconContainer>
             <Icon
               size={16}
               name="lock"
               type="octicon"
               color={colors.greyDarkest}
             />
-          </View>
+          </PrivateIconContainer>
         )}
-      </View>
-      <Text style={styles.description}>
-        {emojifyText(repository.description)}
-      </Text>
-    </View>
-    <View style={styles.extraInfo}>
-      <Icon
-        containerStyle={styles.extraInfoIcon}
-        name="star"
-        type="octicon"
-        size={15}
-        color={colors.greyDark}
-      />
+      </TitleWrapper>
+      <DescriptionText>{emojifyText(repository.description)}</DescriptionText>
+    </RepoContainer>
+    <ExtraInfoWrapper>
+      <Icon name="star" type="octicon" size={15} color={colors.greyDark} />
 
-      <Text style={styles.extraInfoSubject}>
+      <ExtraInfoText>
         {abbreviateNumber(repository.stargazers_count)}
-      </Text>
+      </ExtraInfoText>
 
       <Icon
-        containerStyle={styles.extraInfoIcon}
         name="repo-forked"
         type="octicon"
         size={15}
         color={colors.greyDark}
       />
 
-      <Text
-        style={[styles.extraInfoSubject, { paddingLeft: 0, marginRight: 13 }]}
-      >
+      <ExtraInfoForksText>
         {abbreviateNumber(repository.forks_count)}
-      </Text>
+      </ExtraInfoForksText>
 
       {repository.language !== null && (
         <Icon
-          containerStyle={styles.extraInfoIcon}
           name="fiber-manual-record"
           size={15}
           color={languageColors[repository.language]}
         />
       )}
 
-      <Text style={styles.extraInfoSubject}>{repository.language}</Text>
-    </View>
-  </View>
+      <ExtraInfoText>{repository.language}</ExtraInfoText>
+    </ExtraInfoWrapper>
+  </ListItemWrapper>
 );
 
+const Repository = styled(ListItem).attrs({
+  titleStyle: {
+    color: colors.primaryDark,
+    fontFamily: fonts.fontPrimarySemiBold.fontFamily,
+  },
+  underlayColor: colors.greyLight,
+  containerStyle: {
+    borderBottomColor: colors.greyLight,
+    borderBottomWidth: 1,
+  },
+})``;
+
 export const RepositoryListItem = ({
   repository,
   showFullName,
   navigation,
 }: Props) => (
-  <ListItem
+  <Repository
     key={repository.id}
     title={renderTitle(repository, showFullName)}
-    titleStyle={styles.title}
     rightIcon={{
       name: repository.fork ? 'repo-forked' : 'repo',
       color: colors.grey,
       type: 'octicon',
     }}
-    containerStyle={styles.container}
-    underlayColor={colors.greyLight}
     onPress={() => navigation.navigate('Repository', { repository })}
   />
 );